Merge branch 'main' of https://github.com/epics-containers/python3-pip-skeleton into dev

Author: gilesknap

.github/workflows/code.yml

@@ -115,8 +115,6 @@ jobs:
         run: |
           docker run --name test build bash /project/.github/workflows/container_tests.sh
           docker cp test:/project/dist .
-          docker cp test:/project/requirements.txt .
-          docker cp test:/project/requirements_dev.txt .
           docker cp test:/project/cov.xml .
 
       - name: Upload coverage to Codecov
@@ -139,11 +137,8 @@ jobs:
       - name: Upload build files
         uses: actions/upload-artifact@v3
         with:
-          name: build_files
-          path: |
-            dist
-            requirements.txt
-            requirements_dev.txt
+          name: dist
+          path: dist/*
 
   sdist:
     needs: container
@@ -157,7 +152,7 @@ jobs:
         # Replace this with the cli command if different to the repo name
         # (In the python3-pip-skeleton-cli this is already renamed)
         run: |
-          pip install build_files/dist/*.gz
+          pip install dist/*.gz
           python3-pip-skeleton --version
 
   release:
@@ -175,14 +170,13 @@ jobs:
         uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v0.1.14
         with:
           files: |
-            build_files/*
-            build_files/dist/*
+            dist/*
           generate_release_notes: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Publish to PyPI
         env:
           TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_token }}
-        run: pipx run twine upload build_files/dist/*
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: pipx run twine upload dist/*/whl dist/*.tar.gz

.github/workflows/container_tests.sh

@@ -2,19 +2,14 @@
 set -x
 
 cd /project
-
-python -m venv /tmp/venv
-source /tmp/venv/bin/activate
+source /venv/bin/activate
 
 touch requirements_dev.txt
 pip install -r requirements_dev.txt -e .[dev]
-pip freeze --exclude-editable > requirements_dev.txt
+pip freeze --exclude-editable > dist/requirements_dev.txt
 
 pipdeptree
 
-# ensure non-zero length requirements.txt
-echo "# runtime dependencies" >> requirements.txt
-
 git config --global user.email "[email protected]"
 git config --global user.name "Your Name"
 

.github/workflows/docs.yml

@@ -9,7 +9,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"]
         python: ["3.10"]
 
     runs-on: ubuntu-latest

.github/workflows/linkcheck.yml

@@ -10,7 +10,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-latest"]
         python: ["3.10"]
 
     runs-on: ubuntu-latest

Dockerfile

@@ -30,9 +30,10 @@ ENV PATH=/venv/bin:$PATH
 RUN cd /project && \
     pip install --upgrade pip && \
     pip install -r requirements.txt dist/*.whl && \
-    pip freeze  > requirements.txt && \
+    pip freeze  > dist/requirements.txt && \
     # we don't want to include our own wheel in requirements - remove with sed
-    sed -i '/file:\/\//d' requirements.txt
+    # and replace with a comment to avoid a zero length asset upload later
+    sed -i '/file:/s/^/# Requirements for /' dist/requirements.txt
 
 FROM python:3.10-slim as runtime
 

setup.cfg

@@ -33,18 +33,16 @@ setup_requires =
 # For development tests/docs
 dev =
     black==22.6.0
-    pipdeptree
     flake8-isort
     isort>5.0
     mypy
+    pipdeptree
     pre-commit
     pytest-cov
+    setuptools_scm[toml]>=6.2
     sphinx-rtd-theme-github-versions
     tox
-    setuptools_scm[toml]>=6.2
     types-mock
-    sphinx-rtd-theme-github-versions
-    sphinx-apischema
 
 [options.packages.find]
 where = src