From b805501ee2a7bff57bc944baa1e0f443423b047f Mon Sep 17 00:00:00 2001 From: Yuval Saraf Date: Wed, 21 Sep 2022 04:20:42 +0300 Subject: [PATCH 1/3] Fix publish not only cwd --- lib/verify.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/verify.js b/lib/verify.js index a74879b..b5edfab 100644 --- a/lib/verify.js +++ b/lib/verify.js @@ -142,11 +142,14 @@ async function verifyPoetry(pluginConfig, logger) { * @param root0 * @param root0.logger */ -async function verify(pluginConfig, { logger }) { - if (fs.existsSync('./setup.cfg')) { - await verifySetupCfg(pluginConfig, logger) - } else if (fs.existsSync('./pyproject.toml')) { - await verifyPoetry(pluginConfig, logger) + async function verify(pluginConfig, { logger }) { + const setupPy = getOption(pluginConfig, 'setupPy'); + if (fs.existsSync(setupPy)) { + if (path.basename(setupPy) === "setup.cfg") { + await verifySetupCfg(pluginConfig, logger) + } else if (path.basename(setupPy) === "pyproject.toml") { + await verifyPoetry(pluginConfig, logger) + } } else { const pypiPublish = getOption(pluginConfig, 'pypiPublish') if (pypiPublish !== false) { From 8a00be0c9aa57b27a30b6418dee0527cfaebec93 Mon Sep 17 00:00:00 2001 From: Yuval Saraf Date: Wed, 21 Sep 2022 04:34:40 +0300 Subject: [PATCH 2/3] Fix prepare --- lib/prepare.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/prepare.js b/lib/prepare.js index 9c4f19b..55c06f8 100644 --- a/lib/prepare.js +++ b/lib/prepare.js @@ -88,11 +88,14 @@ async function preparePoetry(pluginConfig, nextRelease, logger) { * @param root0.nextRelease * @param root0.logger */ -async function prepare(pluginConfig, { nextRelease, logger }) { - if (fs.existsSync('./setup.cfg')) { - await prepareSetupCfg(pluginConfig, nextRelease, logger) - } else if (fs.existsSync('./pyproject.toml')) { - await preparePoetry(pluginConfig, nextRelease, logger) + async function prepare(pluginConfig, { logger }) { + const setupPy = getOption(pluginConfig, 'setupPy'); + if (fs.existsSync(setupPy)) { + if (path.basename(setupPy) === "setup.cfg") { + await verifySetupCfg(pluginConfig, logger) + } else if (path.basename(setupPy) === "pyproject.toml") { + await verifyPoetry(pluginConfig, logger) + } } else { const pypiPublish = getOption(pluginConfig, 'pypiPublish') if (pypiPublish !== false) { From b3c7c7136a5a28d40f127318eca7731c624014da Mon Sep 17 00:00:00 2001 From: Yuval Saraf Date: Wed, 21 Sep 2022 05:05:59 +0300 Subject: [PATCH 3/3] Fix publish and prepare steps --- lib/prepare.js | 6 +++--- lib/publish.js | 13 ++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/lib/prepare.js b/lib/prepare.js index 55c06f8..69cffb8 100644 --- a/lib/prepare.js +++ b/lib/prepare.js @@ -88,13 +88,13 @@ async function preparePoetry(pluginConfig, nextRelease, logger) { * @param root0.nextRelease * @param root0.logger */ - async function prepare(pluginConfig, { logger }) { + async function prepare(pluginConfig, { nextRelease, logger }) { const setupPy = getOption(pluginConfig, 'setupPy'); if (fs.existsSync(setupPy)) { if (path.basename(setupPy) === "setup.cfg") { - await verifySetupCfg(pluginConfig, logger) + await prepareSetupCfg(pluginConfig, nextRelease, logger) } else if (path.basename(setupPy) === "pyproject.toml") { - await verifyPoetry(pluginConfig, logger) + await preparePoetry(pluginConfig, nextRelease, logger) } } else { const pypiPublish = getOption(pluginConfig, 'pypiPublish') diff --git a/lib/publish.js b/lib/publish.js index 87e2064..dc87fe2 100644 --- a/lib/publish.js +++ b/lib/publish.js @@ -112,11 +112,14 @@ async function publishPoetry(pluginConfig, logger) { * @param root0.stdout * @param root0.stderr */ -async function publish(pluginConfig, { logger, stdout, stderr }) { - if (fs.existsSync('./setup.cfg')) { - await publishSetupCfg(pluginConfig, logger, stdout, stderr) - } else if (fs.existsSync('./pyproject.toml')) { - await publishPoetry(pluginConfig, logger) + async function publish(pluginConfig, { logger, stdout, stderr }) { + const setupPy = getOption(pluginConfig, 'setupPy'); + if (fs.existsSync(setupPy)) { + if (path.basename(setupPy) === "setup.cfg") { + await publishSetupCfg(pluginConfig, logger, stdout, stderr) + } else if (path.basename(setupPy) === "pyproject.toml") { + await publishPoetry(pluginConfig, logger) + } } else { const pypiPublish = getOption(pluginConfig, 'pypiPublish') if (pypiPublish !== false) {