feat(python): support packagename/__init__.py without pyproject.toml (g…

…oogleapis#1026) * feat: support packagename/__init__.py without pyproject.toml * test: update tests Co-authored-by: Benjamin E. Coe <bencoe@google.com>
mdvorak · Sep 9, 2021 · f461ff7 · f461ff7
1 parent d37311c
commit f461ff7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/src/releasers/python.ts b/src/releasers/python.ts
@@ -89,6 +89,7 @@ export class Python extends ReleasePR {
 
     const parsedPyProject = await this.getPyProject();
     const pyProject = parsedPyProject?.project || parsedPyProject?.tool?.poetry;
+    let projectName = packageName.name;
     if (pyProject) {
       updates.push(
         new PyProjectToml({
@@ -98,25 +99,22 @@ export class Python extends ReleasePR {
           packageName: packageName.name,
         })
       );
-
-      if (pyProject.name) {
-        updates.push(
-          new PythonFileWithVersion({
-            path: this.addPath(`${pyProject.name}/__init__.py`),
-            changelogEntry,
-            version: candidate.version,
-            packageName: packageName.name,
-          })
-        );
-      }
+      projectName = pyProject.name;
     } else {
       logger.warn(
         parsedPyProject
           ? 'invalid pyproject.toml'
           : `file ${chalk.green('pyproject.toml')} did not exist`
       );
     }
-
+    updates.push(
+      new PythonFileWithVersion({
+        path: this.addPath(`${projectName}/__init__.py`),
+        changelogEntry,
+        version: candidate.version,
+        packageName: packageName.name,
+      })
+    );
     // There should be only one version.py, but foreach in case that is incorrect
     const versionPyFilesSearch = this.gh.findFilesByFilename(
       'version.py',

diff --git a/test/manifest.ts b/test/manifest.ts
@@ -151,6 +151,7 @@ describe('Manifest', () => {
         'python/CHANGELOG.md',
         'python/HISTORY.md',
         'package-lock.json',
+        'python/foolib/__init__.py',
         'npm-shrinkwrap.json',
         'samples/package.json',
         'CHANGELOG.md',

diff --git a/test/releasers/python.ts b/test/releasers/python.ts
@@ -128,6 +128,12 @@ describe('Python', () => {
             version: expectedVersion,
             packageName: pkgName,
           }),
+          new PythonFileWithVersion({
+            path: `${pkgName}/__init__.py`,
+            changelogEntry: perUpdateChangelog,
+            version: expectedVersion,
+            packageName: pkgName,
+          }),
           new PythonFileWithVersion({
             path: 'src/version.py',
             changelogEntry: perUpdateChangelog,
@@ -183,6 +189,12 @@ describe('Python', () => {
             version: expectedVersion,
             packageName: pkgName,
           }),
+          new PythonFileWithVersion({
+            path: `${pkgName}/__init__.py`,
+            changelogEntry: perUpdateChangelog,
+            version: expectedVersion,
+            packageName: pkgName,
+          }),
           new PythonFileWithVersion({
             path: 'src/version.py',
             changelogEntry: perUpdateChangelog,