Merge pull request #67 from graingert/github-actions

Author: graingert

.github/workflows/main.yaml

@@ -0,0 +1,80 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - v*
+  pull_request:
+
+jobs:
+  tox:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.7, 3.8, 3.9, '3.10']
+        os: [macOS-latest, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set Up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: pip cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key:
+            ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml', 'setup.py',
+            'setup.cfg') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
+      - name: Install
+        run: |
+          pip install tox
+
+      - name: tox
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: tox -e py,release
+
+      - name: upload dist
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.os }}_${{ matrix.python-version}}_dist
+          path: dist
+
+  all-successful:
+    # https://github.community/t/is-it-possible-to-require-all-github-actions-tasks-to-pass-without-enumerating-them/117957/4?u=graingert
+    runs-on: ubuntu-latest
+    needs: [tox]
+    steps:
+      - name: Download dists for PyPI
+        uses: actions/download-artifact@v2
+        with:
+          name: ubuntu-latest_3.10_dist
+          path: dist
+
+      - name: Display structure of donwloaded files
+        run: ls -R
+
+      - name: Publish package
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          user: __token__
+          password: ${{ secrets.pypi_password }}
+
+      - name: note that all tests succeeded
+        run: echo "🎉"

.github/workflows/main.yml

@@ -22,6 +22,7 @@
 
     description="Easily test your HTTP library against a local copy of httpbin",
     long_description=long_description,
+    long_description_content_type="text/x-rst",
 
     # The project URL.
     url='https://github.com/kevin1024/pytest-httpbin',
@@ -53,6 +54,7 @@
     packages=find_packages(exclude=["contrib", "docs", "tests*"]),
     include_package_data = True, # include files listed in MANIFEST.in
     install_requires = ['httpbin','six'],
+    extras_require = {"test": ["requests", "pytest"]},
 
     # the following makes a plugin available to pytest
     entry_points = {

setup.py

@@ -1,14 +1,32 @@
 # content of: tox.ini , put in same dir as setup.py
 
 [tox]
-envlist = py26, py27, py33, py34, py35, py36, pypy, pypy3
+minversion=3.24.5
+requires=
+    virtualenv>=20.13.2
+    tox-wheel>=0.7.0
+    tox-gh-actions>=2.9.1
+envlist = py37, py38, py39, py310, pypy3
 
 [testenv]
-deps = pytest
-       requests
-       py26: httpbin==0.5.0
-       py27: ipaddress
-       py35: ipaddress
-       py36: ipaddress
-       pypy: ipaddress
-commands = ./runtests.sh {posargs:tests/}
+wheel = True
+wheel_build_env = build
+extras = test
+commands = pytest -v -s
+
+[testenv:build]
+# empty environment to build universal wheel once per tox invocation
+# https://github.com/ionelmc/tox-wheel#build-configuration
+
+[testenv:release]
+deps =
+    build
+    twine
+whitelist_externals =
+    cp
+    rm
+commands =
+    rm -rf {toxinidir}/dist
+    cp -r {distdir} {toxinidir}/dist # copy the wheel built by tox-wheel
+    {envpython} -m build --sdist
+    twine check {toxinidir}/dist/*.*