From 3e1d4286ae0d780f720fc25b53017b25360f802a Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Tue, 22 Dec 2020 06:48:59 +0100 Subject: [PATCH 01/24] Bumpt to 0.2.7.dev0 --- autorelease-travis.yml | 10 +++++----- devtools/conda-recipe/meta.yaml | 2 +- setup.cfg | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/autorelease-travis.yml b/autorelease-travis.yml index e788623..fe85857 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -1,4 +1,4 @@ -# AUTORELEASE v0.2.6 +# AUTORELEASE v0.2.7.dev0 # for nonrelease, use @master # for release, use v${VERSION}, e.g., v1.0.0 stages: @@ -9,7 +9,7 @@ stages: - deploy pypi import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.2.6 - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.2.6 - - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.2.6 - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.2.6 + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@master + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@master + - dwhswenson/autorelease:travis_stages/cut_release.yml@master + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@master diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 8e62cd6..20bb453 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: autorelease # add ".dev0" for unreleased versions - version: "0.2.6" + version: "0.2.7.dev0" source: path: ../../ diff --git a/setup.cfg b/setup.cfg index f80d624..1ce2d17 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = autorelease -version = 0.2.6 +version = 0.2.7.dev0 # version should end in .dev0 if this isn't to be released short_description = Tools to keep the release process clean. description = Tools to keep the release process clean. From 97d7b6211e5dc2393072793420a1230ecc5d6af5 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Wed, 23 Dec 2020 09:02:48 +0100 Subject: [PATCH 02/24] see https://travis-ci.community/t/10494/ --- travis_stages/deploy_testpypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/travis_stages/deploy_testpypi.yml b/travis_stages/deploy_testpypi.yml index deeb25b..5327022 100644 --- a/travis_stages/deploy_testpypi.yml +++ b/travis_stages/deploy_testpypi.yml @@ -8,6 +8,7 @@ jobs: install: - pip install twine - pip install autorelease + - python -m pip install --upgrade --upgrade-strategy eager twine #- pip install git+https://github.com/dwhswenson/autorelease@ops_fixes # this is for debugging anything in autorelease used here (change # the branch tag to whatever is needed) From e7e5987794a9f8381404cfbb6652faeafa713b92 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Wed, 23 Dec 2020 09:42:40 +0100 Subject: [PATCH 03/24] stages uses local for the problem stage --- autorelease-travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorelease-travis.yml b/autorelease-travis.yml index bbd4d90..a8593bf 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -9,7 +9,7 @@ stages: - deploy pypi import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@master + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@travis-deploy - dwhswenson/autorelease:travis_stages/test_testpypi.yml@master - dwhswenson/autorelease:travis_stages/cut_release.yml@master - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@master From 88aca2a16fa9c0f36a5570bbf90f356ea032de3c Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Wed, 23 Dec 2020 10:24:36 +0100 Subject: [PATCH 04/24] test-testpypi should stay in directory This allows it to use a local pytest.ini --- script_stages/test-testpypi | 1 - travis_stages/test_testpypi.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index 7b48618..3a82665 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -24,7 +24,6 @@ if [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then eval $AUTORELEASE_TEST_TESTPYPI || exit 1 else python -m pip install pytest - cd ~ python -c "import $PACKAGE_IMPORT_NAME" || exit 1 py.test --pyargs $PACKAGE_IMPORT_NAME || exit 1 fi diff --git a/travis_stages/test_testpypi.yml b/travis_stages/test_testpypi.yml index 2f89ead..ce5dcc2 100644 --- a/travis_stages/test_testpypi.yml +++ b/travis_stages/test_testpypi.yml @@ -29,7 +29,6 @@ jobs: if [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then eval $AUTORELEASE_TEST_TESTPYPI else - cd ~ python -c "import $PACKAGE_IMPORT_NAME" py.test --pyargs $PACKAGE_IMPORT_NAME fi From fd8922ee4b510ac63da1af949e9a8bb2a03f3509 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Wed, 23 Dec 2020 11:01:13 +0100 Subject: [PATCH 05/24] move everything to travis-deploy! --- autorelease-travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/autorelease-travis.yml b/autorelease-travis.yml index a8593bf..2278d23 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -10,6 +10,6 @@ stages: import: - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@travis-deploy - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@master - - dwhswenson/autorelease:travis_stages/cut_release.yml@master - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@master + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@travis-deploy + - dwhswenson/autorelease:travis_stages/cut_release.yml@travis-deploy + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@travis-deploy From c245dbd1d858ddfcfa465c4c1b95fe09bec4cf49 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sun, 27 Dec 2020 18:50:58 +0100 Subject: [PATCH 06/24] Add autorelease check subcommand --- autorelease/check_runners.py | 17 +++++++++----- autorelease/scripts/check.py | 42 +++++++++++++++++++++++++++++++++++ autorelease/scripts/cli.py | 7 ++++++ autorelease/utils.py | 11 +++++++++ autorelease/version_checks.py | 25 +++++++++++++++++++++ 5 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 autorelease/scripts/check.py diff --git a/autorelease/check_runners.py b/autorelease/check_runners.py index 656f150..4c7b1a8 100644 --- a/autorelease/check_runners.py +++ b/autorelease/check_runners.py @@ -51,7 +51,8 @@ def __init__(self, versions, setup, repo_path='.', output=None): self.git_repo_checks = autorelease.GitReleaseChecks( repo_path=repo_path ) - self.desired_version = vers.Version(versions['setup.py']) + version_0 = list(versions.values())[0] + self.desired_version = vers.Version(version_0) super(DefaultCheckRunner, self).__init__(output=output) self.consistency_test = ( self.version_checks.consistency, [], @@ -119,11 +120,7 @@ def select_tests_from_sysargs(self): return self.select_tests_from_branch_event(branch, opts.event, opts.allow_patch_skip) - def select_test_from_github_env(self): - parser = argparse.ArgumentParser() - parser.add_argument('--allow-patch-skip', action='store_true', - default=False) - opts = parser.parse_args() + def get_branch_event_from_github_env(self): event = os.environ.get("GITHUB_EVENT_NAME", None) ref = os.environ.get("GITHUB_REF", None) pr_ref = os.environ.get("GITHUB_BASE_REF", None) @@ -136,6 +133,14 @@ def select_test_from_github_env(self): else: raise RuntimeError("PR without branch?") branch = self._get_branch_name(branch) + return branch, event + + def select_test_from_github_env(self): + parser = argparse.ArgumentParser() + parser.add_argument('--allow-patch-skip', action='store_true', + default=False) + opts = parser.parse_args() + branch, event = self.get_branch_event_from_github_env() print(branch, event) return self.select_tests_from_branch_event(branch, event, opts.allow_patch_skip) diff --git a/autorelease/scripts/check.py b/autorelease/scripts/check.py new file mode 100644 index 0000000..79b6f97 --- /dev/null +++ b/autorelease/scripts/check.py @@ -0,0 +1,42 @@ +import yaml + +from packaging.version import Version + +from autorelease.version_checks import parse_versions +from autorelease.utils import import_setup +from autorelease import DefaultCheckRunner + +def checker_from_yaml_dict(release_check): + repo_path = release_check.get('repo_path', '.') + release_branches = release_check.get('release-branches', []) + release_tag_format = release_check.get('release-tag', "v{BASE_VERSION}") + versions = parse_versions(release_check['versions']) + base_version = Version(list(versions.values())[0]).base_version + release_tag = release_tag_format.format(BASE_VERSION=base_version) + setup = import_setup(directory=repo_path) + + checker = DefaultCheckRunner( + versions=versions, + setup=setup, + repo_path=repo_path + ) + checker.release_branches = release_branches + [release_tag] + return checker + + +def run_checks(yml, branch=None, event=None, allow_patch_skip=False): + dct = yaml.load(yml, Loader=yaml.FullLoader) + release_check = dct['release-check'] + checker = checker_from_yaml_dict(release_check) + if branch is None and event is None: + branch, event = checker.get_branch_event_from_github_env() + + tests = checker.select_tests_from_branch_event(branch, event, + allow_patch_skip) + checker.run_as_test(tests) + + +if __name__ == "__main__": + with open("autorelease.yml", 'r') as f: + run_checks(f) + diff --git a/autorelease/scripts/cli.py b/autorelease/scripts/cli.py index 624d90b..133ed5a 100644 --- a/autorelease/scripts/cli.py +++ b/autorelease/scripts/cli.py @@ -1,11 +1,18 @@ import click from autorelease.scripts.vendor import vendor_actions +from autorelease.scripts.check import run_checks @click.group() def cli(): pass +@cli.command() +@click.option('--conf', type=click.File('r'), default='autorelease.yml') +@click.option('--branch', default=None) +@click.option('--event', default=None) +def check(conf, branch, event): + run_checks(conf, branch, event) @click.group() def vendor(): diff --git a/autorelease/utils.py b/autorelease/utils.py index aee9614..367a88a 100644 --- a/autorelease/utils.py +++ b/autorelease/utils.py @@ -1,5 +1,7 @@ import yaml import re +import os +import importlib.util def conda_recipe_version(recipe_file): with open(recipe_file) as f: @@ -10,3 +12,12 @@ def github_url_to_owner_repo(url): pattern = ".*github.com[\:\/]([^\/]+)\/(.*)\.git" match = re.match(pattern, url) return match.groups() + +def import_setup(directory='.'): + """Return the imported setup.py from the given directory""" + spec = importlib.util.spec_from_file_location( + 'setup', os.path.join(directory, 'setup.py') + ) + setup = importlib.util.module_from_spec(spec) + spec.loader.exec_module(setup) + return setup diff --git a/autorelease/version_checks.py b/autorelease/version_checks.py index f7ff1cc..c20cceb 100644 --- a/autorelease/version_checks.py +++ b/autorelease/version_checks.py @@ -3,6 +3,31 @@ import re import packaging.version as vers +from autorelease.version import get_setup_version # reuse the vendored +from autorelease.utils import conda_recipe_version + +version_getters = { + 'setup-cfg': lambda path: get_setup_version(None, path), + 'conda': conda_recipe_version, +} + +default_args = { + 'setup-cfg': ['.'] +} + +def parse_versions(versions_list): + versions = {} + for version_type in versions_list: + if isinstance(version_type, dict): + version_type, arg = list(version_type.items())[0] + args = [arg] + else: + args = default_args.get(version_type, []) + + versions[version_type] = version_getters[version_type](*args) + return versions + + class VersionReleaseChecks(object): def __init__(self, versions, strictness='strict'): self.versions = versions From fd19efa9dd2de5b2c019efa428b8c81fdb684930 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 28 Dec 2020 10:02:57 +0100 Subject: [PATCH 07/24] import setup in py27, too --- autorelease/utils.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/autorelease/utils.py b/autorelease/utils.py index 367a88a..f1c5211 100644 --- a/autorelease/utils.py +++ b/autorelease/utils.py @@ -1,7 +1,7 @@ import yaml import re import os -import importlib.util +import sys def conda_recipe_version(recipe_file): with open(recipe_file) as f: @@ -13,8 +13,22 @@ def github_url_to_owner_repo(url): match = re.match(pattern, url) return match.groups() + def import_setup(directory='.'): """Return the imported setup.py from the given directory""" + if sys.version_info > (3, ): + return _import_setup_py3(directory) + else: + return _import_setup_py2(directory) + + +def _import_setup_py2(directory): + import imp + return imp.load_source('setup', os.path.join(directory, 'setup.py')) + + +def _import_setup_py3(directory): + import importlib.util spec = importlib.util.spec_from_file_location( 'setup', os.path.join(directory, 'setup.py') ) From 8e9ac38d37f4d48617703adc12713626546d0e18 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sun, 3 Jan 2021 23:25:34 +0100 Subject: [PATCH 08/24] return naming to master --- autorelease-travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autorelease-travis.yml b/autorelease-travis.yml index 2278d23..bbd4d90 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -9,7 +9,7 @@ stages: - deploy pypi import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@travis-deploy - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@travis-deploy - - dwhswenson/autorelease:travis_stages/cut_release.yml@travis-deploy - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@travis-deploy + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@master + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@master + - dwhswenson/autorelease:travis_stages/cut_release.yml@master + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@master From 13bdbf93f21641a6c101261badc6aa150697a9a5 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sun, 3 Jan 2021 23:28:32 +0100 Subject: [PATCH 09/24] Separating install-testpypi & test-testpypi --- .github/workflows/autorelease-default-env.sh | 7 +++--- .github/workflows/autorelease-deploy.yml | 6 +++-- .github/workflows/autorelease-gh-rel.yml | 4 +++- .github/workflows/autorelease-prep.yml | 22 ++++++++++++++++--- .../gh_actions_stages/autorelease-prep.yml | 20 +++++++++++++---- script_stages/install-testpypi | 21 ++++++++++++++++++ script_stages/test-testpypi | 22 ------------------- setup.cfg | 1 + 8 files changed, 68 insertions(+), 35 deletions(-) create mode 100644 script_stages/install-testpypi diff --git a/.github/workflows/autorelease-default-env.sh b/.github/workflows/autorelease-default-env.sh index 5609e9b..f1da159 100644 --- a/.github/workflows/autorelease-default-env.sh +++ b/.github/workflows/autorelease-default-env.sh @@ -1,4 +1,5 @@ -INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.3" -DIR=`dirname $0` -source autorelease-env.sh +INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.6" +if [ -f autorelease-env.sh ]; then + source autorelease-env.sh +fi diff --git a/.github/workflows/autorelease-deploy.yml b/.github/workflows/autorelease-deploy.yml index 89aaeac..9a8f03b 100644 --- a/.github/workflows/autorelease-deploy.yml +++ b/.github/workflows/autorelease-deploy.yml @@ -14,7 +14,9 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - cat autorelease-env.sh >> $GITHUB_ENV + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - run: | @@ -27,5 +29,5 @@ jobs: - uses: pypa/gh-action-pypi-publish@master with: password: ${{ secrets.pypi_password }} - name: "Deploy to testpypi" + name: "Deploy to pypi" diff --git a/.github/workflows/autorelease-gh-rel.yml b/.github/workflows/autorelease-gh-rel.yml index f9e294e..bb5cd27 100644 --- a/.github/workflows/autorelease-gh-rel.yml +++ b/.github/workflows/autorelease-gh-rel.yml @@ -15,7 +15,9 @@ jobs: python-version: "3.7" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - cat autorelease-env.sh >> $GITHUB_ENV + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - run: | diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index 48c82ba..ba24669 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -1,3 +1,5 @@ +# File vencdored from Autorelease; specific version information should be in +# the INSTALL_AUTORELEASE variable in autorelease-default-env.sh name: "Autorelease" on: pull_request: @@ -19,7 +21,9 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - cat autorelease-env.sh >> $GITHUB_ENV + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - run: | @@ -49,8 +53,20 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - cat autorelease-env.sh >> $GITHUB_ENV + if [ -f "./.autorelease/test-testpypi.sh" ]; then + source ./.autorelease/test-testpypi.sh eval $INSTALL_AUTORELEASE name: "Install autorelease" - - run: test-testpypi + - name: "Install testpypi version" + run: install-testpypi + - run: | + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + if [ -f "./.autorelease/test-testpypi.sh"]; then + source ./.autorelease/test-testpypi.sh + else + test-testpypi + fi + name: "Test testpypi version" diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 4967413..ba24669 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -1,3 +1,5 @@ +# File vencdored from Autorelease; specific version information should be in +# the INSTALL_AUTORELEASE variable in autorelease-default-env.sh name: "Autorelease" on: pull_request: @@ -51,10 +53,20 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - if [ -f "autorelease-env.sh" ]; then - cat autorelease-env.sh >> $GITHUB_ENV - fi + if [ -f "./.autorelease/test-testpypi.sh" ]; then + source ./.autorelease/test-testpypi.sh eval $INSTALL_AUTORELEASE name: "Install autorelease" - - run: test-testpypi + - name: "Install testpypi version" + run: install-testpypi + - run: | + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + if [ -f "./.autorelease/test-testpypi.sh"]; then + source ./.autorelease/test-testpypi.sh + else + test-testpypi + fi + name: "Test testpypi version" diff --git a/script_stages/install-testpypi b/script_stages/install-testpypi new file mode 100644 index 0000000..ba4b11f --- /dev/null +++ b/script_stages/install-testpypi @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ -z "$DRY" ]; then + wait-for-testpypi +fi + +export PROJECT=`python setup.py --name` +export VERSION=`pypi-max-version $PROJECT` +echo "Installing ${PROJECT}==${VERSION} (allowing pre-releases)" +if [ -z "$DRY" ]; then + python -m pip install --pre --force-reinstall \ + --index-url https://test.pypi.org/simple/ \ + --extra-index-url https://pypi.org/simple ${PROJECT}==${VERSION} +fi + +if [ -z "$PACKAGE_IMPORT_NAME" ]; then + export PACKAGE_IMPORT_NAME=$PROJECT +fi +echo "PROJECT: $PROJECT" +echo "PACKAGE_IMPORT_NAME: $PACKAGE_IMPORT_NAME" +echo "AUTORELEASE_TEST_TESTPYPI: $AUTORELEASE_TEST_TESTPYPI" diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index 7b48618..e769411 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,25 +1,3 @@ -#!/bin/bash - -if [ -z "$DRY" ]; then - wait-for-testpypi -fi - -export PROJECT=`python setup.py --name` -export VERSION=`pypi-max-version $PROJECT` -echo "Installing ${PROJECT}==${VERSION} (allowing pre-releases)" -if [ -z "$DRY" ]; then - python -m pip install --pre --force-reinstall \ - --index-url https://test.pypi.org/simple/ \ - --extra-index-url https://pypi.org/simple ${PROJECT}==${VERSION} -fi - -if [ -z "$PACKAGE_IMPORT_NAME" ]; then - export PACKAGE_IMPORT_NAME=$PROJECT -fi -echo "PROJECT: $PROJECT" -echo "PACKAGE_IMPORT_NAME: $PACKAGE_IMPORT_NAME" -echo "AUTORELEASE_TEST_TESTPYPI: $AUTORELEASE_TEST_TESTPYPI" - if [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then eval $AUTORELEASE_TEST_TESTPYPI || exit 1 else diff --git a/setup.cfg b/setup.cfg index 1ce2d17..079ab86 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,6 +39,7 @@ install_requires = packages = find: scripts = script_stages/deploy-pypi + script_stages/install-testpypi script_stages/test-testpypi [options.package_data] From b590a580e8735796e9424f7b02368128abcf4638 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:13:46 +0100 Subject: [PATCH 10/24] fix indents --- .../gh_actions_stages/autorelease-prep.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index ba24669..dee0986 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -60,13 +60,13 @@ jobs: - name: "Install testpypi version" run: install-testpypi - run: | - if [ -f "autorelease-env.sh" ]; then - cat autorelease-env.sh >> $GITHUB_ENV - fi - if [ -f "./.autorelease/test-testpypi.sh"]; then - source ./.autorelease/test-testpypi.sh - else - test-testpypi - fi + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + if [ -f "./.autorelease/test-testpypi.sh"]; then + source ./.autorelease/test-testpypi.sh + else + test-testpypi + fi name: "Test testpypi version" From d21bc0e5194608410e18ddd0dae8345e01bc24e0 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:17:38 +0100 Subject: [PATCH 11/24] fix space? --- autorelease/gh_actions_stages/autorelease-prep.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index dee0986..8a5007d 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -63,7 +63,7 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi.sh"]; then + if [ -f "./.autorelease/test-testpypi.sh" ]; then source ./.autorelease/test-testpypi.sh else test-testpypi From d7683e58130dd139c5802036a65c1d3708feddea Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:21:02 +0100 Subject: [PATCH 12/24] try disabling this for now? --- autorelease/gh_actions_stages/autorelease-prep.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 8a5007d..4cff78c 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -63,10 +63,10 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh - else + #if [ -f "./.autorelease/test-testpypi.sh" ]; then + #source ./.autorelease/test-testpypi.sh + #else test-testpypi - fi + #fi name: "Test testpypi version" From 8650a312ffd55e79ba8078d8d99143ed2749d2fc Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:22:47 +0100 Subject: [PATCH 13/24] missing fi earlier? --- autorelease/gh_actions_stages/autorelease-prep.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 4cff78c..06693b5 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -55,6 +55,7 @@ jobs: source ./.github/workflows/autorelease-default-env.sh if [ -f "./.autorelease/test-testpypi.sh" ]; then source ./.autorelease/test-testpypi.sh + fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - name: "Install testpypi version" @@ -63,10 +64,10 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - #if [ -f "./.autorelease/test-testpypi.sh" ]; then - #source ./.autorelease/test-testpypi.sh - #else + if [ -f "./.autorelease/test-testpypi.sh" ]; then + source ./.autorelease/test-testpypi.sh + else test-testpypi - #fi + fi name: "Test testpypi version" From 967431fb352dee9bd133f983ca7b6f58971e05a7 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:28:11 +0100 Subject: [PATCH 14/24] more debugging claim of bad yaml --- .../gh_actions_stages/autorelease-prep.yml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 06693b5..140f4a4 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -53,21 +53,21 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - name: "Install testpypi version" run: install-testpypi - - run: | - if [ -f "autorelease-env.sh" ]; then - cat autorelease-env.sh >> $GITHUB_ENV - fi - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh - else - test-testpypi - fi - name: "Test testpypi version" - + - name: "Test testpypi version" + run: | + echo "testing" + #if [ -f "autorelease-env.sh" ]; then + #cat autorelease-env.sh >> $GITHUB_ENV + #fi + #if [ -f "./.autorelease/test-testpypi.sh" ]; then + #source ./.autorelease/test-testpypi.sh + #else + #test-testpypi + #fi From 5eb8cec5a57e881cd49aebe61afc4def4f4046fa Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Mon, 4 Jan 2021 14:31:06 +0100 Subject: [PATCH 15/24] helps if you update the vendored version --- .github/workflows/autorelease-prep.yml | 26 +++++++++---------- .../gh_actions_stages/autorelease-prep.yml | 17 ++++++------ 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index ba24669..1846a6e 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -53,20 +53,20 @@ jobs: python-version: "3.x" - run: | # TODO: move this to an action source ./.github/workflows/autorelease-default-env.sh - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi eval $INSTALL_AUTORELEASE name: "Install autorelease" - name: "Install testpypi version" run: install-testpypi - - run: | - if [ -f "autorelease-env.sh" ]; then - cat autorelease-env.sh >> $GITHUB_ENV - fi - if [ -f "./.autorelease/test-testpypi.sh"]; then - source ./.autorelease/test-testpypi.sh - else - test-testpypi - fi - name: "Test testpypi version" - + - name: "Test testpypi version" + run: | + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + if [ -f "./.autorelease/test-testpypi.sh" ]; then + source ./.autorelease/test-testpypi.sh + else + test-testpypi + fi diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 140f4a4..1846a6e 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -62,12 +62,11 @@ jobs: run: install-testpypi - name: "Test testpypi version" run: | - echo "testing" - #if [ -f "autorelease-env.sh" ]; then - #cat autorelease-env.sh >> $GITHUB_ENV - #fi - #if [ -f "./.autorelease/test-testpypi.sh" ]; then - #source ./.autorelease/test-testpypi.sh - #else - #test-testpypi - #fi + if [ -f "autorelease-env.sh" ]; then + cat autorelease-env.sh >> $GITHUB_ENV + fi + if [ -f "./.autorelease/test-testpypi.sh" ]; then + source ./.autorelease/test-testpypi.sh + else + test-testpypi + fi From cfcffb36e0efc39d1d6f582d132224b5fd32b1e7 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 29 Jan 2021 17:40:28 +0100 Subject: [PATCH 16/24] Add things to use a custom script subdirectory --- .github/workflows/autorelease-deploy.yml | 6 +++++- .github/workflows/autorelease-gh-rel.yml | 6 +++++- .github/workflows/autorelease-prep.yml | 18 +++++++++++------- .../gh_actions_stages/autorelease-deploy.yml | 6 +++++- .../gh_actions_stages/autorelease-gh-rel.yml | 6 +++++- .../gh_actions_stages/autorelease-prep.yml | 18 +++++++++++------- script_stages/test-testpypi | 6 +++++- 7 files changed, 47 insertions(+), 19 deletions(-) diff --git a/.github/workflows/autorelease-deploy.yml b/.github/workflows/autorelease-deploy.yml index 9a8f03b..5192236 100644 --- a/.github/workflows/autorelease-deploy.yml +++ b/.github/workflows/autorelease-deploy.yml @@ -17,7 +17,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | python -m pip install twine wheel diff --git a/.github/workflows/autorelease-gh-rel.yml b/.github/workflows/autorelease-gh-rel.yml index bb5cd27..32cd720 100644 --- a/.github/workflows/autorelease-gh-rel.yml +++ b/.github/workflows/autorelease-gh-rel.yml @@ -18,7 +18,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | VERSION=`python setup.py --version` diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index 1846a6e..ae965dc 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -24,7 +24,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | python -m pip install twine wheel @@ -56,7 +60,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - name: "Install testpypi version" run: install-testpypi @@ -65,8 +73,4 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh - else - test-testpypi - fi + test-testpypi diff --git a/autorelease/gh_actions_stages/autorelease-deploy.yml b/autorelease/gh_actions_stages/autorelease-deploy.yml index 9a8f03b..5192236 100644 --- a/autorelease/gh_actions_stages/autorelease-deploy.yml +++ b/autorelease/gh_actions_stages/autorelease-deploy.yml @@ -17,7 +17,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | python -m pip install twine wheel diff --git a/autorelease/gh_actions_stages/autorelease-gh-rel.yml b/autorelease/gh_actions_stages/autorelease-gh-rel.yml index bb5cd27..32cd720 100644 --- a/autorelease/gh_actions_stages/autorelease-gh-rel.yml +++ b/autorelease/gh_actions_stages/autorelease-gh-rel.yml @@ -18,7 +18,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | VERSION=`python setup.py --version` diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index 1846a6e..ae965dc 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -24,7 +24,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - run: | python -m pip install twine wheel @@ -56,7 +60,11 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - eval $INSTALL_AUTORELEASE + if [ -f "./.autorelease/install-autorelease" ]; then + source ./.autorelease/install-autorelease + else + eval $INSTALL_AUTORELEASE + fi name: "Install autorelease" - name: "Install testpypi version" run: install-testpypi @@ -65,8 +73,4 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi.sh" ]; then - source ./.autorelease/test-testpypi.sh - else - test-testpypi - fi + test-testpypi diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index 479ba75..a65bb43 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,4 +1,8 @@ -if [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then +#!/bin/bash + +if [ -f "./.autorelease/test-testpypi" ]; then + source ./.autorelease/test-testpypi || exit 1 +elif [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then eval $AUTORELEASE_TEST_TESTPYPI || exit 1 else python -m pip install pytest From e52138f9ef36bdaccb4a1c18edc3c288c05c6ca5 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 29 Jan 2021 17:45:04 +0100 Subject: [PATCH 17/24] Re-enable override of test-testpypi --- .github/workflows/autorelease-prep.yml | 6 +++++- autorelease/gh_actions_stages/autorelease-prep.yml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index ae965dc..d5e383e 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -73,4 +73,8 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - test-testpypi + if [ -f "./.autorelease/test-testpypi" ]; then + source ./.autorelease/test-testpypi + else + test-testpypi + fi diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index ae965dc..d5e383e 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -73,4 +73,8 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - test-testpypi + if [ -f "./.autorelease/test-testpypi" ]; then + source ./.autorelease/test-testpypi + else + test-testpypi + fi From 9fd305e7b717bc7f955d6b002f496e6f32d7a835 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 29 Jan 2021 17:47:19 +0100 Subject: [PATCH 18/24] undo previous --- .github/workflows/autorelease-prep.yml | 6 +----- autorelease/gh_actions_stages/autorelease-prep.yml | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/autorelease-prep.yml b/.github/workflows/autorelease-prep.yml index d5e383e..ae965dc 100644 --- a/.github/workflows/autorelease-prep.yml +++ b/.github/workflows/autorelease-prep.yml @@ -73,8 +73,4 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi" ]; then - source ./.autorelease/test-testpypi - else - test-testpypi - fi + test-testpypi diff --git a/autorelease/gh_actions_stages/autorelease-prep.yml b/autorelease/gh_actions_stages/autorelease-prep.yml index d5e383e..ae965dc 100644 --- a/autorelease/gh_actions_stages/autorelease-prep.yml +++ b/autorelease/gh_actions_stages/autorelease-prep.yml @@ -73,8 +73,4 @@ jobs: if [ -f "autorelease-env.sh" ]; then cat autorelease-env.sh >> $GITHUB_ENV fi - if [ -f "./.autorelease/test-testpypi" ]; then - source ./.autorelease/test-testpypi - else - test-testpypi - fi + test-testpypi From f481265bd4f598434edcf66e789f424f10631a16 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 29 Jan 2021 17:56:43 +0100 Subject: [PATCH 19/24] Release 0.3.0 --- autorelease-travis.yml | 10 +++++----- .../gh_actions_stages/autorelease-default-env.sh | 2 +- devtools/conda-recipe/meta.yaml | 2 +- setup.cfg | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autorelease-travis.yml b/autorelease-travis.yml index fe85857..cb318e4 100644 --- a/autorelease-travis.yml +++ b/autorelease-travis.yml @@ -1,4 +1,4 @@ -# AUTORELEASE v0.2.7.dev0 +# AUTORELEASE v0.3.0 # for nonrelease, use @master # for release, use v${VERSION}, e.g., v1.0.0 stages: @@ -9,7 +9,7 @@ stages: - deploy pypi import: - - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@master - - dwhswenson/autorelease:travis_stages/test_testpypi.yml@master - - dwhswenson/autorelease:travis_stages/cut_release.yml@master - - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@master + - dwhswenson/autorelease:travis_stages/deploy_testpypi.yml@v0.3.0 + - dwhswenson/autorelease:travis_stages/test_testpypi.yml@v0.3.0 + - dwhswenson/autorelease:travis_stages/cut_release.yml@v0.3.0 + - dwhswenson/autorelease:travis_stages/deploy_pypi.yml@v0.3.0 diff --git a/autorelease/gh_actions_stages/autorelease-default-env.sh b/autorelease/gh_actions_stages/autorelease-default-env.sh index f1da159..064478c 100644 --- a/autorelease/gh_actions_stages/autorelease-default-env.sh +++ b/autorelease/gh_actions_stages/autorelease-default-env.sh @@ -1,4 +1,4 @@ -INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.6" +INSTALL_AUTORELEASE="python -m pip install autorelease==0.3.0" if [ -f autorelease-env.sh ]; then source autorelease-env.sh fi diff --git a/devtools/conda-recipe/meta.yaml b/devtools/conda-recipe/meta.yaml index 20bb453..bdc85ea 100644 --- a/devtools/conda-recipe/meta.yaml +++ b/devtools/conda-recipe/meta.yaml @@ -1,7 +1,7 @@ package: name: autorelease # add ".dev0" for unreleased versions - version: "0.2.7.dev0" + version: "0.3.0" source: path: ../../ diff --git a/setup.cfg b/setup.cfg index 079ab86..32fed74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = autorelease -version = 0.2.7.dev0 +version = 0.3.0 # version should end in .dev0 if this isn't to be released short_description = Tools to keep the release process clean. description = Tools to keep the release process clean. From bf481cbbb57dbac630c6ce76292f78a9f1224381 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Fri, 29 Jan 2021 20:10:29 +0100 Subject: [PATCH 20/24] More details in test-testpypi --- script_stages/test-testpypi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index a65bb43..3ae5e6e 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,10 +1,13 @@ #!/bin/bash if [ -f "./.autorelease/test-testpypi" ]; then + echo "Using custom test-testpypi" source ./.autorelease/test-testpypi || exit 1 elif [ -n "$AUTORELEASE_TEST_TESTPYPI" ]; then + echo "Using custom AUTORELEASE_TEST_TESTPYPI: $AUTORELEASE_TEST_TESTPYPI" eval $AUTORELEASE_TEST_TESTPYPI || exit 1 else + echo "Using default test-testpypi" python -m pip install pytest python -c "import $PACKAGE_IMPORT_NAME" || exit 1 py.test --pyargs $PACKAGE_IMPORT_NAME || exit 1 From 805add6ab0d1e8b7f61227c28dcae43e84501221 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sat, 30 Jan 2021 04:24:08 +0100 Subject: [PATCH 21/24] debug --- .github/workflows/autorelease-default-env.sh | 2 +- script_stages/test-testpypi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autorelease-default-env.sh b/.github/workflows/autorelease-default-env.sh index f1da159..064478c 100644 --- a/.github/workflows/autorelease-default-env.sh +++ b/.github/workflows/autorelease-default-env.sh @@ -1,4 +1,4 @@ -INSTALL_AUTORELEASE="python -m pip install autorelease==0.2.6" +INSTALL_AUTORELEASE="python -m pip install autorelease==0.3.0" if [ -f autorelease-env.sh ]; then source autorelease-env.sh fi diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index 3ae5e6e..39598b5 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,5 +1,5 @@ #!/bin/bash - +echo `pwd` if [ -f "./.autorelease/test-testpypi" ]; then echo "Using custom test-testpypi" source ./.autorelease/test-testpypi || exit 1 From 4e632f822f1d2e8752ed6fd7b8294e5732af37eb Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sat, 30 Jan 2021 04:34:43 +0100 Subject: [PATCH 22/24] debug --- script_stages/test-testpypi | 1 + 1 file changed, 1 insertion(+) diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index 39598b5..cd8ac00 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,5 +1,6 @@ #!/bin/bash echo `pwd` +echo `ls` if [ -f "./.autorelease/test-testpypi" ]; then echo "Using custom test-testpypi" source ./.autorelease/test-testpypi || exit 1 From 0210bee7309c6e79a1329b410e785de4bf829384 Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sat, 30 Jan 2021 04:41:08 +0100 Subject: [PATCH 23/24] again.. HELPS TO ADD THE FILES! --- .autorelease/install-autorelease | 3 +++ .autorelease/test-testpypi | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 .autorelease/install-autorelease create mode 100644 .autorelease/test-testpypi diff --git a/.autorelease/install-autorelease b/.autorelease/install-autorelease new file mode 100644 index 0000000..1c87814 --- /dev/null +++ b/.autorelease/install-autorelease @@ -0,0 +1,3 @@ +#!/bin/bash + +python -m pip install -e . diff --git a/.autorelease/test-testpypi b/.autorelease/test-testpypi new file mode 100644 index 0000000..90014d5 --- /dev/null +++ b/.autorelease/test-testpypi @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "Using custom test-testpypi" +cd ~ +python -c "import autorelease" From e0488063753d19fb8eb975c84f3ce077cc42c31d Mon Sep 17 00:00:00 2001 From: "David W.H. Swenson" Date: Sat, 30 Jan 2021 05:54:41 +0100 Subject: [PATCH 24/24] cleanup --- script_stages/test-testpypi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script_stages/test-testpypi b/script_stages/test-testpypi index cd8ac00..6e26d1b 100644 --- a/script_stages/test-testpypi +++ b/script_stages/test-testpypi @@ -1,6 +1,6 @@ #!/bin/bash -echo `pwd` -echo `ls` +#echo `pwd` +#echo `ls` if [ -f "./.autorelease/test-testpypi" ]; then echo "Using custom test-testpypi" source ./.autorelease/test-testpypi || exit 1