Skip to content

Commit

Permalink
Merge da16145 into 412e520
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed Dec 26, 2020
2 parents 412e520 + da16145 commit 70c649d
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
Run:
name: "mypy"
name: "mypy / ${{ matrix.os }}"
runs-on: ${{ matrix.os }}

strategy:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
tests:
name: "Python ${{ matrix.config.python-version }}"
name: "windows-2019 / Python ${{ matrix.config.python-version }}"
runs-on: "windows-2019"
continue-on-error: ${{ matrix.config.experimental }}
env:
Expand Down Expand Up @@ -41,4 +41,4 @@ jobs:
python -m pip install --upgrade tox virtualenv
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: "python -m tox -e ${{ matrix.config.testenvs }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"
18 changes: 11 additions & 7 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
tests:
name: "Python ${{ matrix.config.python-version }}"
name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
runs-on: "ubuntu-20.04"
continue-on-error: ${{ matrix.config.experimental }}
env:
Expand Down Expand Up @@ -42,10 +42,10 @@ jobs:
python -m pip install --upgrade coverage_pyver_pragma
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: "python -m tox -e ${{ matrix.config.testenvs }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"


- name: "Upload Coverage"
- name: "Upload Coverage 🚀"
uses: actions/upload-artifact@v2
with:
name: "coverage-${{ matrix.config.python-version }}"
Expand All @@ -69,7 +69,7 @@ jobs:
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade coveralls coverage_pyver_pragma
- name: "Download Coverage"
- name: "Download Coverage 🪂"
uses: actions/download-artifact@v2
with:
path: coverage
Expand All @@ -78,12 +78,12 @@ jobs:
run: ls -R
working-directory: coverage

- name: Combine Coverage
- name: Combine Coverage 👷
run: |
shopt -s globstar
python -m coverage combine coverage/**/.coverage
- name: "Upload Combined Coverage Artefact"
- name: "Upload Combined Coverage Artefact 🚀"
uses: actions/upload-artifact@v2
with:
name: "combined-coverage"
Expand All @@ -102,23 +102,27 @@ jobs:
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v2"
if: startsWith(github.ref, 'refs/tags/')

- name: Setup Python 🐍
uses: "actions/setup-python@v2"
with:
python-version: 3.8
if: startsWith(github.ref, 'refs/tags/')

- name: Install dependencies 🔧
run: |
python -m pip install --upgrade pip setuptools wheel
python -m pip install --upgrade tox
if: startsWith(github.ref, 'refs/tags/')

- name: Build distributions 📦
run: |
tox -e build
if: startsWith(github.ref, 'refs/tags/')

- name: Upload distribution 📦 to PyPI
- name: Upload distribution to PyPI 🚀
if: startsWith(github.ref, 'refs/tags/')
uses: pypa/gh-action-pypi-publish@master
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
tests:
name: "Python ${{ matrix.config.python-version }}"
name: "macos-latest / Python ${{ matrix.config.python-version }}"
runs-on: "macos-latest"
continue-on-error: ${{ matrix.config.experimental }}
env:
Expand Down Expand Up @@ -41,4 +41,4 @@ jobs:
python -m pip install --upgrade tox virtualenv
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
run: "python -m tox -e ${{ matrix.config.testenvs }}"
run: python -m tox -e "${{ matrix.config.testenvs }}"
2 changes: 1 addition & 1 deletion doc-source/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default-values>=0.2.0
domdf-sphinx-theme>=0.3.0
extras-require>=0.2.0
seed-intersphinx-mapping>=0.1.1
sphinx>=3.0.3
sphinx<3.4.0,>=3.0.3
sphinx-copybutton>=0.2.12
sphinx-notfound-page>=0.5
sphinx-prompt>=1.1.0
Expand Down
15 changes: 7 additions & 8 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# You may add new sections, but any changes made to the following sections will be lost:
# * tox
# * envlists
# * gh-actions
# * testenv
# * testenv:docs
# * testenv:build
Expand All @@ -29,13 +28,6 @@ test = py36, py37, py38, py39
qa = mypy, lint
cov = py36, coverage

[gh-actions]
python =
3.6: py36, build
3.7: py37, build
3.8: py38, build
3.9: py39, build

[testenv]
setenv = PYTHONDEVMODE = 1
deps = -r{toxinidir}/tests/requirements.txt
Expand Down Expand Up @@ -160,6 +152,13 @@ package = octo_api
addopts = --color yes --durations 25
timeout = 300
[gh-actions]
python =
3.6: py36, build
3.7: py37, build
3.8: py38, build
3.9: py39, build
[travis]
python =
3.6: py36, build, mypy
Expand Down

0 comments on commit 70c649d

Please sign in to comment.