Merge pull request #24 from pytest-dev/python-newer

expand python matrix

Author: RonnyPfannschmidt

.github/workflows/deploy.yaml

@@ -1,19 +1,52 @@
-name: Python application
+name: "python tests+artifacts+release"
 
 on:
   pull_request:
   push:
-    branches: [main]
+    branches:
+    - main
+    tags:
+    - "v*"
+  release:
+    types: [published]
+
 
 jobs:
+  dist:
+    runs-on: ubuntu-latest
+    name: Python sdist/wheel
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-python@v2
+      with:
+        python-version: "3.9"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade wheel setuptools build
+
+    - name: Build package
+      run: python -m build -o dist/
+    - uses: actions/upload-artifact@v2
+      with:
+        name: dist
+        path: dist
+
   test:
     runs-on: ubuntu-latest
+    needs: [dist]
     strategy:
       matrix:
         # todo: extract from source
-        python-version: [2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9]
-        install-style: [full, editable]
-
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10-dev"]
+        install-from: ["dist/*.whl"]
+        include:
+        - python-version: 3.9
+          install-from: "-e ."
+        - python-version: 3.9
+          install-from: "."
+        - python-version: 3.9
+          install-from: "dist/*.tar.gz"
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
@@ -25,14 +58,41 @@ jobs:
         python -m pip install --upgrade pip
         pip install -U setuptools setuptools_scm
         pip install pytest
-
+    - uses: actions/download-artifact@v2
+      with:
+        name: dist
+        path: dist
     - name: install editable
-      run: pip install -e .
-      if: matrix.install-style=='editable'
-    - name: install full
-      run: pip install .
-
-      if: matrix.install-style=='full'
-
+      run: pip install ${{ matrix.install-from }}
     - name: pytest
       run: pytest
+
+
+  dist_check:
+    runs-on: ubuntu-latest
+    needs: [dist]
+    steps:
+    - uses: actions/setup-python@v2
+      with:
+        python-version: "3.9"
+    - uses: actions/download-artifact@v2
+      with:
+        name: dist
+        path: dist
+    - run: pipx run twine check --strict dist/*
+
+  dist_upload:
+
+    runs-on: ubuntu-latest
+    if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
+    needs: [dist_check, test]
+    steps:
+    - uses: actions/download-artifact@v2
+      with:
+        name: dist
+        path: dist
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.pypi_token }}

.github/workflows/pythonapp.yml

@@ -1,5 +1,5 @@
-Welcome to apipkg!
-------------------------
+Welcome to apipkg !
+-------------------
 
 With apipkg you can control the exported namespace of a Python package and
 greatly reduce the number of imports for your users.
@@ -17,6 +17,7 @@ Tutorial example
 Here is a simple ``mypkg`` package that specifies one namespace
 and exports two objects imported from different modules::
 
+
     # mypkg/__init__.py
     import apipkg
     apipkg.initpkg(__name__, {
@@ -76,11 +77,11 @@ Feedback?
 
 If you have questions you are welcome to
 
-* join the #pytest channel `on irc.libera.chat
-<ircs://irc.libera.chat:6697/#pytest>`_ (using an IRC client, `via webchat
-<https://web.libera.chat/#pytest>`_, or `via Matrix
-<https://matrix.to/#/%23pytest:libera.chat>`_).
-* create an issue on https://github.com/pytest-dev/apipkg/issues
+* join the **#pytest** channel on irc.libera.chat_
+  (using an IRC client, via webchat_, or via Matrix_).
+* create an issue on the bugtracker_
 
-have fun,
-holger krekel
+.. _irc.libera.chat: ircs://irc.libera.chat:6697/#pytest
+.. _webchat: https://web.libera.chat/#pytest
+.. _matrix: https://matrix.to/#/%23pytest:libera.chat
+.. _bugtracker: https://github.com/pytest-dev/apipkg/issues