feat(config): allow reading repository configurations from file

Author: Volgaa

lib/default-options.ts

@@ -28,6 +28,14 @@ export class DefaultConfig {
     return this.config.repoUrl ?? 'https://upload.pypi.org/legacy/';
   }
 
+  public get repoUsername() {
+    return this.config.repoUsername ?? '__token__';
+  }
+
+  public get repoToken() {
+    return this.config.repoToken ?? '';
+  }
+
   public get pypiPublish() {
     return this.config.pypiPublish ?? true;
   }

lib/publish.ts

@@ -9,6 +9,8 @@ function publishPackage(
   srcDir: string,
   distDir: string,
   repoUrl: string,
+  repoUsername: string,
+  repoToken: string,
   gpgSign: boolean,
   gpgIdentity?: string,
   options?: Options,
@@ -37,10 +39,8 @@ function publishPackage(
       cwd: srcDir,
       env: {
         ...options?.env,
-        TWINE_USERNAME: process.env['PYPI_USERNAME']
-          ? process.env['PYPI_USERNAME']
-          : '__token__',
-        TWINE_PASSWORD: process.env['PYPI_TOKEN'],
+        TWINE_USERNAME: repoUsername,
+        TWINE_PASSWORD: repoToken,
       },
     },
   );
@@ -55,6 +55,8 @@ async function publish(pluginConfig: PluginConfig, context: Context) {
     gpgSign,
     gpgIdentity,
     repoUrl,
+    repoUsername,
+    repoToken,
     envDir,
   } = new DefaultConfig(pluginConfig);
 
@@ -65,10 +67,17 @@ async function publish(pluginConfig: PluginConfig, context: Context) {
 
   if (pypiPublish !== false) {
     logger.log(`Publishing package to ${repoUrl}`);
+    if (process.env['PYPI_TOKEN'] === undefined && repoToken === '') {
+      logger.error(
+        'Token is not set. Either set PYPI_TOKEN environment variable or repoToken in plugin configuration',
+      );
+    }
     const result = publishPackage(
       srcDir,
       distDir,
       process.env['PYPI_REPO_URL'] ?? repoUrl,
+      process.env['PYPI_USERNAME'] ?? repoUsername,
+      process.env['PYPI_TOKEN'] ?? repoToken,
       gpgSign,
       gpgIdentity,
       options,

lib/types.ts

@@ -2,6 +2,8 @@ export interface PluginConfig {
   srcDir?: string;
   distDir?: string;
   repoUrl?: string;
+  repoUsername?: string;
+  repoToken?: string;
   pypiPublish?: boolean;
   gpgSign?: boolean;
   gpgIdentity?: string;

lib/verify.ts

@@ -90,22 +90,31 @@ function assertVersionCmd(pyproject: any, versionCmd?: string) {
 
 async function verify(pluginConfig: PluginConfig, context: Context) {
   const { logger } = context;
-  const { srcDir, setupPath, pypiPublish, repoUrl, versionCmd } =
-    new DefaultConfig(pluginConfig);
+  const {
+    srcDir,
+    setupPath,
+    pypiPublish,
+    repoUrl,
+    repoUsername,
+    repoToken,
+    versionCmd,
+  } = new DefaultConfig(pluginConfig);
 
   const execaOptions: Options = pipe(context);
 
   if (pypiPublish !== false) {
-    const username = process.env['PYPI_USERNAME']
-      ? process.env['PYPI_USERNAME']
-      : '__token__';
-    const token = process.env['PYPI_TOKEN'];
     const repo = process.env['PYPI_REPO_URL'] ?? repoUrl;
+    const username = process.env['PYPI_USERNAME'] ?? repoUsername;
+    const token = process.env['PYPI_TOKEN'] ?? repoToken;
 
-    assertEnvVar('PYPI_TOKEN');
+    if (token === '') {
+      throw new Error(
+        `Token is not set. Either set PYPI_TOKEN environment variable or repoToken in plugin configuration`,
+      );
+    }
 
     logger.log(`Verify authentication for ${username}@${repo}`);
-    await verifyAuth(repo, username, token!);
+    await verifyAuth(repo, username, token);
   }
 
   if (isLegacyBuildInterface(srcDir)) {

test/util.test.ts

@@ -7,6 +7,8 @@ test('test DefaultConfig', async () => {
   expect(new DefaultConfig({}).srcDir).toBe('.');
   expect(new DefaultConfig({}).setupPath).toBe('setup.py');
   expect(new DefaultConfig({}).repoUrl).toBe('https://upload.pypi.org/legacy/');
+  expect(new DefaultConfig({}).repoUsername).toBe('__token__');
+  expect(new DefaultConfig({}).repoToken).toBe('');
   expect(new DefaultConfig({ distDir: 'mydist' }).distDir).toBe('mydist');
 });
 

test/util.ts

@@ -129,6 +129,8 @@ function genPluginArgs(config: PluginConfig) {
     distDir: config.distDir ?? `.tmp/${packageName}/dist`,
     envDir: config.envDir ?? `.tmp/${packageName}/.venv`,
     repoUrl: config.repoUrl ?? 'https://test.pypi.org/legacy/',
+    repoUsername: config.repoUsername ?? '__token__',
+    repoToken: config.repoToken ?? '',
   };
 
   const context: Context = {