CICD Improvements

.github/workflows/hera_pr.yaml

@@ -3,7 +3,7 @@ name: Hera PR build
 on: pull_request
 
 jobs:
-  hera-pr-build:
+  build-linux:
 
     timeout-minutes: 10
 
@@ -25,7 +25,7 @@ jobs:
 
       - name: Install base dependencies
         run: |
-          python -m pip install --upgrade "tox<4.0"
+          python -m pip install --upgrade "tox<4.0" tox-wheel twine
 
       - name: Run lint
         env:
@@ -41,6 +41,93 @@ jobs:
 
       - name: Run tests
         env:
+          ENABLE_BDIST_EXT_MODULE: 'yes'
           TOXENV: python${{ matrix.python-version }}
         run: |
           tox
+
+      - name: Check build
+        run: |
+          twine check .tox/dist/*
+
+      - name: upload build artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: pypi-build-arts
+          path: .tox/dist
+
+      - name: upload coverage files
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage-data
+          path: ".tox/.coverage.*"
+
+  coverage:
+    needs: [build-linux]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+
+      - name: get coverage files
+        uses: actions/download-artifact@v2
+        with:
+          name: coverage-data
+          path: .tox
+
+      - name: list coverage files
+        run: |
+          find .tox -name ".coverage*"
+
+      - name: install tox
+        run: |
+          python -m pip install --upgrade tox
+
+      - name: create coverage report
+        env:
+          TOXENV: coverage
+        run: |
+          tox
+
+      - name: upload coverage HTML report
+        uses: actions/upload-artifact@v2
+        with:
+          name: html-report
+          path: .tox/htmlcov
+
+  publish:
+    needs: [coverage]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.7'
+
+      - name: get pypi build arts
+        uses: actions/download-artifact@v2
+        with:
+          name: pypi-build-arts
+          path: dist
+
+      - name: list pypi build arts
+        run: |
+          ls -la dist/
+
+      - name: install twine
+        run: |
+          python -m pip install --upgrade twine
+
+      - name: Check build
+        run: |
+          twine check dist/*

Makefile

@@ -20,7 +20,7 @@ typecheck:
 	mypy --namespace-packages tests
 
 test:
-	pytest --durations=5 $(TEST_FOLDER)
+	pytest -c tox.ini $(TEST_FOLDER)
 
 verify: lint typecheck test
 	echo "Lint, typecheck, test successfully completed!"

README.md

@@ -9,6 +9,7 @@ and its crew were specially protected by the goddess Hera.
 
 [![Build](https://github.com/argoproj-labs/hera-workflows/actions/workflows/hera_build_and_publish.yaml/badge.svg)](https://github.com/argoproj-labs/hera-workflows/blob/main/.github/workflows/hera_build_and_publish.yaml)
 [![Pypi](https://img.shields.io/pypi/v/hera-workflows.svg)](https://pypi.python.org/pypi/hera-workflows)
+[![CondaForge](https://img.shields.io/conda/v/conda-forge/hera-workflows.svg)](https://anaconda.org/conda-forge/hera-workflows)
 [![Downloads](https://pepy.tech/badge/hera-workflows)](https://pepy.tech/project/hera-workflows)
 [![Downloads/month](https://pepy.tech/badge/hera-workflows/month)](https://pepy.tech/project/hera-workflows)
 [![Downloads/week](https://pepy.tech/badge/hera-workflows/week)](https://pepy.tech/project/hera-workflows)
@@ -94,12 +95,24 @@ In you activated `pipenv` shell, you can utilize the tasks found in `Makefile`,
 make test
 ```
 
-To run tests on all supported python versions run [tox](https://tox.wiki/en/latest/):
+To run tests on all supported python versions with coverage run [tox](https://tox.wiki/en/latest/):
 
 ```shell
 tox
 ```
 
+To run tests for a specific python version with coverage run:
+
+```shell
+tox -e python3.7 coverage
+```
+
+To list all available `tox` envs run:
+
+```shell
+tox -a
+```
+
 > See project `tox.ini` for more details
 
 Also, see the [contributing guide](https://github.com/argoproj-labs/hera-workflows/blob/main/CONTRIBUTING.md)!

setup.cfg

@@ -1,8 +1,3 @@
-[pytest]
-addopts = --cov=hera -vv
-# for now, keep this commented out, as it's used explicitly in Makefile
-; testpaths = tests
-
 [flake8]
 exclude = # do not look here for things to lint
 	.git

setup.py

@@ -1,8 +1,27 @@
-from setuptools import find_namespace_packages, setup
+import os
+from setuptools import setup, Distribution
 
 VERSION = open('VERSION').read().strip()
 LONG_DESCRIPTION = open('README.md').read()
 
+
+class BinaryDistribution(Distribution):
+    """Distribution which enables a binary package with platform name
+
+    Will build `none-any` wheels by default, e.g. -
+
+        hera_workflows-1.8.0-py3-none-any.whl
+
+    If the env var ENABLE_BDIST_EXT_MODULE=yes is defined built wheel will have platform and
+    python version info, e.g. -
+    Used to create wheels for specific OS and Python version, e.g. -
+
+        hera_workflows-1.8.0-cp37-cp37m-macosx_10_9_x86_64.whl
+    """
+    def has_ext_modules(foo):
+        return os.environ.get('ENABLE_BDIST_EXT_MODULE') == 'yes'
+
+
 setup(
     name='hera-workflows',
     version=VERSION,
@@ -45,6 +64,7 @@
         "certifi",
         "pytz"
     ],
-    zip_safe=False
+    zip_safe=False,
+    distclass=BinaryDistribution
 )
 

tox.ini

@@ -1,14 +1,50 @@
 [tox]
-envlist = python{3.7,3.8,3.9,3.10}
+envlist = python{3.7,3.8,3.9,3.10},coverage
+
+[pytest]
+addopts = --durations=5 -vv
+
+[coverage:run]
+branch = true
+parallel = true
+
+[coverage:report]
+skip_covered = True
+show_missing = True
+
+[coverage:paths]
+source = src/hera
+    */.tox/*/lib/python*/site-packages/hera
+    */.tox/pypy*/site-packages/hera
+    */.tox\*\Lib\site-packages\hera
+    */src/hera
+    *\src\hera
 
 [testenv]
 wheel = true
-allowlist_externals =
-    make
+setenv =
+    ENABLE_BDIST_EXT_MODULE = {env:ENABLE_BDIST_EXT_MODULE:no}
+    COVERAGE_FILE = {env:COVERAGE_FILE:{toxworkdir}/.coverage.{envname}}
 deps =
     pytest
+    pytest-cov
 commands=
-    make test
+    pytest \
+        --cov "{envsitepackagesdir}/hera" \
+        --cov-config "{toxinidir}/tox.ini"
+
+[testenv:coverage]
+setenv =
+    COVERAGE_FILE = {toxworkdir}/.coverage
+skip_install = true
+deps =
+    coverage
+commands =
+    coverage combine
+    coverage report -m
+    coverage xml -o {toxworkdir}/coverage.xml
+    coverage html -d {toxworkdir}/htmlcov
+depends = python3.7, python3.8, python3.9, python3.10
 
 [testenv:lint]
 skipsdist = True