Merge #171

171: Version bump to v4.0.5. r=duckinator a=duckinator



Co-authored-by: Ellen Marie Dash <[email protected]>

.cirrus.yml

@@ -7,24 +7,6 @@ env:
   LC_ALL: C.UTF-8
   LANG: C.UTF-8
 
-docker_builder:
-  only_if: $CIRRUS_TAG != ''
-  depends_on:
-    - Lint
-    - Zipapp_bootstrap
-    - Linux
-    - macOS
-    - FreeBSD
-    #- Windows
-    - repos
-  env:
-    DOCKER_USERNAME: ENCRYPTED[a957943032559f0859a16a4421bc3602338080e6d9ce63a980db4fd34dbdc2afbe3a20c620139c669182eced4211a515]
-    DOCKER_PASSWORD: ENCRYPTED[dd7f31d490b645298258ac9ec78ac3a7e034e8bfcf8fbfec0137787eef3934e01a42ef3b5eda42b1b1f7a3296fae619e]
-  build_script:
-    - docker build --tag duckinator/bork:${CIRRUS_TAG} --tag duckinator/bork:latest --build-arg "VERSION=$(echo $CIRRUS_TAG | sed 's/^v//')" .
-  login_script: docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
-  push_script: docker push duckinator/bork:$CIRRUS_TAG duckinator/bork:latest
-
 Lint_task:
   container:
     image: python:3-slim
@@ -153,9 +135,9 @@ repos_task:
     - bork build
     - bork release --dry-run
 
+# If bork/version.py is modified on the master branch, make a release.
 Release_task:
-  only_if: "changesInclude('bork/__init__.py')"
-  trigger_type: manual
+  only_if: "changesInclude('bork/version.py') && $BRANCH == 'master'"
   depends_on:
     - Lint
     - Zipapp_bootstrap
@@ -178,3 +160,18 @@ Release_task:
     - bork run test
   release_script:
     - bork release
+
+# If there's a new tag, which should only happen after a successful release
+# to PyPi, publish an image on Docker Hub.
+docker_builder:
+  only_if: $CIRRUS_TAG != ''
+  name: "Release on Docker Hub"
+  depends_on:
+    - Release
+  env:
+    DOCKER_USERNAME: ENCRYPTED[a957943032559f0859a16a4421bc3602338080e6d9ce63a980db4fd34dbdc2afbe3a20c620139c669182eced4211a515]
+    DOCKER_PASSWORD: ENCRYPTED[dd7f31d490b645298258ac9ec78ac3a7e034e8bfcf8fbfec0137787eef3934e01a42ef3b5eda42b1b1f7a3296fae619e]
+  build_script:
+    - docker build --tag duckinator/bork:${CIRRUS_TAG} --tag duckinator/bork:latest --build-arg "VERSION=$(echo $CIRRUS_TAG | sed 's/^v//')" .
+  login_script: docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
+  push_script: docker push duckinator/bork:$CIRRUS_TAG duckinator/bork:latest

bork/__init__.py

@@ -1 +1,2 @@
-__version__ = '4.0.4'
+# Expose `bork.version.__version__` as `bork.__version__`.
+from .version import __version__  # noqa: F401

bork/version.py

@@ -0,0 +1,4 @@
+# This file should only ever be modified to change the version.
+# This will automatically prepare, and eventually create, a release.
+
+__version__ = '4.0.5'