Skip to content

Commit f080be1

Browse files
domdfcodingdomdfcoding
committed
Updated config files.
1 parent 4254b0f commit f080be1

File tree

10 files changed

+55
-47
lines changed

10 files changed

+55
-47
lines changed

‎.github/workflows/mypy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Python 🐍
2525
uses: "actions/setup-python@v2"
2626
with:
27-
python-version: "3.8"
27+
python-version: "3.6"
2828

2929
- name: Install dependencies 🔧
3030
run: |

‎.github/workflows/octocheese.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
name: "GitHub Releases"
55
on:
66
push:
7+
branches: ["master"]
78
schedule:
89
- cron: 0 12 * * 2,4,6
910

‎.github/workflows/python_ci.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: Windows Tests
3+
name: Windows
44

55
on:
66
push:
@@ -11,17 +11,19 @@ jobs:
1111
tests:
1212
name: "Python ${{ matrix.config.python-version }}"
1313
runs-on: "windows-2019"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,3.9'
16+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
2021
config:
21-
- {python-version: "3.6", testenvs: "py36,build"}
22-
- {python-version: "3.7", testenvs: "py37,build"}
23-
- {python-version: "3.8", testenvs: "py38,build"}
24-
- {python-version: "3.9", testenvs: "py39,build"}
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
26+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
2527

2628
steps:
2729
- name: Checkout 🛎️

‎.github/workflows/python_ci_linux.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: Linux Tests
3+
name: Linux
44

55
on:
66
push:
@@ -10,19 +10,21 @@ on:
1010
jobs:
1111
tests:
1212
name: "Python ${{ matrix.config.python-version }}"
13-
runs-on: "ubuntu-18.04"
13+
runs-on: "ubuntu-20.04"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9'
16+
USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9,3.10.0-alpha.3'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
2021
config:
21-
- {python-version: "3.6", testenvs: "py36,build"}
22-
- {python-version: "3.7", testenvs: "py37,build"}
23-
- {python-version: "3.8", testenvs: "py38,build"}
24-
- {python-version: "pypy3", testenvs: "pypy3,build"}
25-
- {python-version: "3.9", testenvs: "py39,build"}
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "pypy3", testenvs: "pypy3,build", experimental: False}
26+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
27+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
2628

2729
steps:
2830
- name: Checkout 🛎️
@@ -54,7 +56,7 @@ jobs:
5456

5557
Coverage:
5658
needs: tests
57-
runs-on: "ubuntu-18.04"
59+
runs-on: "ubuntu-20.04"
5860
steps:
5961
- name: Checkout 🛎️
6062
uses: "actions/checkout@v2"
@@ -98,7 +100,7 @@ jobs:
98100
Deploy:
99101
needs: tests
100102

101-
runs-on: "ubuntu-18.04"
103+
runs-on: "ubuntu-20.04"
102104
steps:
103105
- name: Checkout 🛎️
104106
uses: "actions/checkout@v2"
@@ -130,7 +132,8 @@ jobs:
130132

131133
Conda:
132134
needs: deploy
133-
runs-on: "ubuntu-18.04"
135+
runs-on: "ubuntu-20.04"
136+
if: startsWith(github.ref, 'refs/tags/') || ${{ startsWith(github.event.head_commit.message, 'Bump version') != true }}
134137
steps:
135138
- name: Checkout 🛎️
136139
uses: "actions/checkout@v2"
@@ -154,7 +157,6 @@ jobs:
154157
bash .github/actions_build_conda.sh
155158
156159
- name: Deploy Conda 🚀
157-
if: startsWith(github.ref, 'refs/tags/')
158160
run: |
159161
chmod +x .github/actions_deploy_conda.sh
160162
bash .github/actions_deploy_conda.sh

‎.github/workflows/python_ci_macos.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: macOS Tests
3+
name: macOS
44

55
on:
66
push:
@@ -11,18 +11,20 @@ jobs:
1111
tests:
1212
name: "Python ${{ matrix.config.python-version }}"
1313
runs-on: "macos-latest"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9'
16+
USING_COVERAGE: '3.6,3.7,3.8,pypy3,3.9,3.10.0-alpha.3'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
2021
config:
21-
- {python-version: "3.6", testenvs: "py36,build"}
22-
- {python-version: "3.7", testenvs: "py37,build"}
23-
- {python-version: "3.8", testenvs: "py38,build"}
24-
- {python-version: "pypy3", testenvs: "pypy3,build"}
25-
- {python-version: "3.9", testenvs: "py39,build"}
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "pypy3", testenvs: "pypy3,build", experimental: False}
26+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
27+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
2628

2729
steps:
2830
- name: Checkout 🛎️

‎README.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ domdf_python_tools
1717
* - Docs
1818
- |docs| |docs_check|
1919
* - Tests
20-
- |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
20+
- |actions_linux| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
2121
* - PyPI
2222
- |pypi-version| |supported-versions| |supported-implementations| |wheel|
2323
* - Anaconda
@@ -35,16 +35,16 @@ domdf_python_tools
3535
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22Docs+Check%22
3636
:alt: Docs Check Status
3737

38-
.. |travis| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/Linux%20Tests/badge.svg
39-
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22Linux+Tests%22
38+
.. |actions_linux| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/Linux/badge.svg
39+
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22Linux%22
4040
:alt: Linux Test Status
4141

42-
.. |actions_windows| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/Windows%20Tests/badge.svg
43-
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22Windows+Tests%22
42+
.. |actions_windows| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/Windows/badge.svg
43+
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22Windows%22
4444
:alt: Windows Test Status
4545

46-
.. |actions_macos| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/macOS%20Tests/badge.svg
47-
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22macOS+Tests%22
46+
.. |actions_macos| image:: https://github.com/domdfcoding/domdf_python_tools/workflows/macOS/badge.svg
47+
:target: https://github.com/domdfcoding/domdf_python_tools/actions?query=workflow%3A%22macOS%22
4848
:alt: macOS Test Status
4949

5050
.. |requires| image:: https://requires.io/github/domdfcoding/domdf_python_tools/requirements.svg?branch=master

‎doc-source/index.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ domdf_python_tools
1818
* - Docs
1919
- |docs| |docs_check|
2020
* - Tests
21-
- |travis| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
21+
- |actions_linux| |actions_windows| |actions_macos| |coveralls| |codefactor| |pre_commit_ci|
2222
* - PyPI
2323
- |pypi-version| |supported-versions| |supported-implementations| |wheel|
2424
* - Anaconda
@@ -36,16 +36,16 @@ domdf_python_tools
3636
:workflow: Docs Check
3737
:alt: Docs Check Status
3838

39-
.. |travis| actions-shield::
40-
:workflow: Linux Tests
39+
.. |actions_linux| actions-shield::
40+
:workflow: Linux
4141
:alt: Linux Test Status
4242

4343
.. |actions_windows| actions-shield::
44-
:workflow: Windows Tests
44+
:workflow: Windows
4545
:alt: Windows Test Status
4646

4747
.. |actions_macos| actions-shield::
48-
:workflow: macOS Tests
48+
:workflow: macOS
4949
:alt: macOS Test Status
5050

5151
.. |requires| requires-io-shield::

‎repo_helper.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ conda_channels:
77
python_deploy_version: 3.6
88

99
python_versions:
10-
- '3.6'
11-
- '3.7'
12-
- "3.8"
13-
- "pypy3"
14-
- "3.9"
15-
- "3.10-dev"
10+
- 3.6
11+
- 3.7
12+
- 3.8
13+
- pypy3
14+
- 3.9
15+
- 3.10-dev
1616

1717
# directory that contains tests
1818
tests_dir: "tests"

‎setup.cfg‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ classifiers =
3131
Programming Language :: Python :: 3.7
3232
Programming Language :: Python :: 3.8
3333
Programming Language :: Python :: 3.9
34-
Programming Language :: Python :: 3.10
3534
Programming Language :: Python :: Implementation :: CPython
3635
Programming Language :: Python :: Implementation :: PyPy
3736
Topic :: Software Development :: Libraries :: Python Modules

‎tox.ini‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
[tox]
1818
envlist = py36, py37, py38, pypy3, py39, py310-dev, mypy, build
1919
skip_missing_interpreters = True
20-
requires = pip>=20.3.1
20+
requires =
21+
pip>=20.3.3
22+
tox-envlist>=0.1.0
2123
isolated_build = True
2224

2325
[envlists]
@@ -32,7 +34,7 @@ python =
3234
3.8: py38, build
3335
pypy3: pypy3, build
3436
3.9: py39, build
35-
3.10-dev: py310-dev, build
37+
3.10.0-alpha.3: py310-dev, build
3638

3739
[testenv:docs]
3840
setenv = SHOW_TODOS = 1

0 commit comments

Comments
 (0)