Better handling of the PyPI deploy archive

codeship-services.yml

@@ -2,8 +2,6 @@ image_builder: &build-base
   build:
     context: .
     dockerfile: ./deployment/build-env.dockerfile
-  volumes:
-    - ./tmp/dist:/opt/molecular-design-toolkit/dist
   add_docker: true
   cached: true
   working_dir: /opt/molecular-design-toolkit

codeship-steps.yml

@@ -90,12 +90,23 @@
    - command: deployment/run-ci-tests.sh
      name: testrunner
 
+
 # If this build is tagged with a PEP440-compliant version number AND the tests have passed,
 # upload the package to PyPI, and push the docker images to dockerhub as
 # autodesk/moldesign:[imagename]-[version-number]
-- name: publish-python
+- name: release
   service: publisher
   # matches tags that are valid PEP440 versions
+  type: serial
   tag: '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)((a|rc|b)(0|[1-9]\d*))?$'
-  command: deployment/publish.sh
+  steps:
+   - type: parallel
+     services:
+       - test_moldesign_complete
+       - test_moldesign_complete_py2
+     steps:
+     - command: deployment/test-version-number.sh
+   - name: upload
+     command: deployment/publish.sh
+     service: publisher
 

deployment/publish.sh

@@ -8,17 +8,11 @@
 # fail immediately if any command fails:
 set -e
 
-pyversion=$(python -m moldesign version | tail -n 1)
-
-if [ "${pyversion}" == "${CI_BRANCH}" ]; then
-  echo "Deploying version ${CI_BRANCH}"
-else
-  echo "Can't publish - moldesign package version '${pyversion}' differs from its Git tag '${CI_BRANCH}'"
-  exit 1
-fi
-
+# Copy python package out of the docker image
+sdist=moldesign-${pyversion}.tar.gz
+docker run moldesign_py_build:dev -v ./tmp/dist:/hostdists  cp dist/${sdist} /hostdists
 
-# Push images
+# Push images to dockerhub
 for img in moldesign_minimal       \
            moldesign_minimal_py2   \
            moldesign_complete      \
@@ -28,8 +22,6 @@ for img in moldesign_minimal       \
 done
 
 
-# Copy build artifacts
-sdist=moldesign-${pyversion}.tar.gz
-docker run moldesign_py_build:dev -v ./tmp/dists:/hostdists  cp dist/${sdist} /hostdists
+# Push python package to PyPI
 echo "Uploading version ${CI_BRANCH} to PyPI:"
 twine upload -u ${PYPI_USER} -p ${PYPI_PASSWORD} ./tmp/dists/moldesign-${pyversion}.tar.gz

deployment/run-ci-tests.sh

@@ -3,6 +3,7 @@
 # Defined by codeship
 # - CI_BRANCH
 # - CI_COMMIT_MESSAGE
+# - PROJECT_ID
 # Defined in ../codeship-services.yml
 # - TESTENV
 # - PYVERSION

deployment/test-version-number.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -e
+
+if [ -z "${CI_BRANCH}" ]; then
+  echo "Error: env var CI_BRANCH not set"
+  exit 1
+fi
+
+
+pyversion=$(python -m moldesign version | tail -n 1)
+
+echo "Expecting moldesign==${pyversion}"
+echo "Found moldesign==${pyversion}"
+
+
+if [ "${pyversion}" == "${CI_BRANCH}" ]; then
+  echo "All good"
+  exit 0
+else
+  echo "Error: moldesign package version '${pyversion}' differs from its Git tag '${CI_BRANCH}'"
+  exit 1
+fi