Skip to content

Commit

Permalink
MRG: Merge pull request #68 from octue/release/0.0.16
Browse files Browse the repository at this point in the history
Release/0.0.16
  • Loading branch information
cortadocodes committed Feb 1, 2021
2 parents 49e5a0b + dc20928 commit e99182c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/python-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:

tests:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '#skip_ci_tests')"
env:
USING_COVERAGE: '3.8'
strategy:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/scripts/check-version-consistency.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
PACKAGE_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__))))


class NotAVersionBranchException(Exception):
class NotAReleaseBranchException(Exception):
pass


Expand All @@ -33,16 +33,16 @@ def release_branch_version_matches_setup_version(setup_version, full_branch_name
:raise NotAVersionBranchException:
:return bool:
"""
if not full_branch_name.startswith("release"):
raise NotAReleaseBranchException(f"The branch is not a release branch: {full_branch_name!r}.")

try:
branch_type, branch_name = full_branch_name.split("/")
except ValueError:
raise InvalidBranchNameFormat(
f"The branch name must be in the form 'branch_type/branch_name'; received {full_branch_name!r}"
)

if branch_type != "release":
raise NotAVersionBranchException(f"The branch is not a release branch: {full_branch_name!r}.")

return branch_name == setup_version


Expand All @@ -63,6 +63,6 @@ def release_branch_version_matches_setup_version(setup_version, full_branch_name
)
sys.exit(1)

except NotAVersionBranchException as e:
except NotAReleaseBranchException as e:
print(e.args[0])
sys.exit(0)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

setup(
name="twined",
version="0.0.15",
version="0.0.16",
py_modules=[],
install_requires=["jsonschema ~= 3.2.0", "python-dotenv"],
url="https://www.github.com/octue/twined",
Expand Down

0 comments on commit e99182c

Please sign in to comment.