Merge pull request #191 from nicolasbock/pypi

Fix PyPi package

Author: nicolasbock

.github/workflows/build.yaml

@@ -15,8 +15,6 @@ jobs:
       fail-fast: true
       matrix:
         include:
-          - os: ubuntu-18.04
-            python-version: 3.6
           - os: ubuntu-22.04
             python-version: 3.7
           - os: ubuntu-22.04
@@ -49,7 +47,7 @@ jobs:
     - name: Install tox
       run: sudo apt install --yes tox
 
-    - name: Test
+    - name: Build and test
       run: tox -e ${{ env.tox_environment }}
 
     - name: Archive test results
@@ -77,3 +75,7 @@ jobs:
     - name: Build docs
       run: tox -e docs
       if: ${{ matrix.python-version == '3.10' }}
+
+    - name: Test PyPi Package
+      run: tox -e pypi
+      if: ${{ matrix.python-version == '3.10' }}

.github/workflows/publish.yaml

@@ -13,21 +13,17 @@ jobs:
     name: Publish PyPI Package
     steps:
     - name: Check out sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         fetch-depth: 0
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: '3.9'
+        python-version: '3.10'
     - name: Publish PyPI Package
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py --version
-        git log --oneline --decorate --color | head -n 20
-        pip install setuptools wheel twine
-        rm -rf dist
-        python setup.py sdist bdist_wheel
-        twine upload dist/*
+        tox -e pypi
+        twine upload .tox/pypi/dist/*

CONTRIBUTING.rst

@@ -1,7 +1,7 @@
 Developer Documentation
 =======================
 
-This project supports Python 3.6, 3.7, 3.8, 3.9, and 3.10. Other Python versions
+This project supports Python 3.7, 3.8, 3.9, and 3.10. Other Python versions
 might work as well but are not regularly tested.
 
 For locally testing changes it is very handy to install `tox` which automates

README.rst

@@ -124,9 +124,3 @@ The command understands the following command line arguments:
      --pull                Download latest docker image
      --show-options        Show currently selected options and defaults
      --ccache CCACHE_DIR   Path to mount that contains ccache cache
-
-Developer Instructions
-----------------------
-
-For more information and how to contribute to this project see the
-:doc:`Contributing <contributing>` page.

tox.ini

@@ -25,3 +25,12 @@ commands = bandit --exit-zero --recursive {toxinidir}/ebuildtester {toxinidir}/t
 
 [testenv:pep8]
 commands = pycodestyle ebuildtester
+
+[testenv:pypi]
+deps =
+     setuptools
+     wheel
+     twine
+commands =
+     python setup.py sdist bdist_wheel --dist-dir {envdir}/dist
+     twine check --strict {envdir}/dist/*