release-test: newer pip

fixes Python 3.10 + manylinux wheel download & caching

Author: mr-c

.github/workflows/ci-tests.yml

@@ -127,9 +127,6 @@ jobs:
         with:
           singularity-version: ${{ env.singularity_version }}
 
-      - name: install lxml dev packages (due to lack of Python 3.10 wheels)
-        run: sudo apt-get install -y libxml2-dev libxslt-dev
-
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
@@ -150,11 +147,3 @@ jobs:
         env:
           RELEASE_SKIP: head
         run: ./release-test.sh
-
-      - name: Publish package
-        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages_dir: testenv3_3/dist

.github/workflows/tag_to_publish.yml

@@ -0,0 +1,54 @@
+name: Publish tag to PyPI
+
+on:
+  push:
+    tags: [ 'v*' ]
+
+concurrency:
+  group: tag-${{github.ref}}
+  cancel-in-progress: true
+
+env:
+  singularity_version: 3.6.4
+
+jobs:
+  release_to_pypi:
+    name: cwl-utils release test
+
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Singularity
+        uses: eWaterCycle/setup-singularity@v7
+        with:
+          singularity-version: ${{ env.singularity_version }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.10"  # quoted, otherwise that turns into the number 3.1
+
+      - name: Cache for pip
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-release-${{ hashFiles('requirements.txt', 'test-requirements.txt') }}
+
+      - name: Install packages
+        run: |
+          pip install -U pip setuptools wheel
+          pip install virtualenv
+
+      - name: Release test
+        env:
+          RELEASE_SKIP: head
+        run: ./release-test.sh
+
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
+          packages_dir: testenv3/dist

Makefile

@@ -32,7 +32,7 @@ DEVPKGS=diff_cover black pylint pep257 pydocstyle flake8 tox tox-pyenv \
 	-rtest-requirements.txt -rmypy-requirements.txt
 DEBDEVPKGS=pep8 python-autopep8 pylint python-coverage pydocstyle sloccount \
 	   python-flake8 python-mock shellcheck
-VERSION=$(shell awk '{print $3}' < cwl_utils/__meta__.py )
+VERSION=v$(shell echo $$(tail -n 1 cwl_utils/__meta__.py | awk '{print $$3}'))
 mkfile_dir := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 UNAME_S=$(shell uname -s)
 

release-test.sh

@@ -18,8 +18,8 @@ else
     HEAD=$(git rev-parse HEAD)
 fi
 run_tests="bin/py.test --pyargs ${module}"
-pipver=20.3 # minimum required version of pip for Python 3.10
-setuptoolsver=50.0.0 # required for Python 3.10
+pipver=20.3.2  # minimum required version of pip for Python 3.10
+setuptoolsver=50.0.0  # required for Python 3.10
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 
 rm -Rf testenv? || /bin/true