Skip to content

Commit f447fc1

Browse files
domdfcodingdomdfcoding
committed
Don't officially support PyPy, but test on multiple click versions instead.
1 parent c261701 commit f447fc1

File tree

6 files changed

+42
-38
lines changed

6 files changed

+42
-38
lines changed

‎.github/workflows/python_ci.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ jobs:
1919
runs-on: "windows-2019"
2020
continue-on-error: ${{ matrix.config.experimental }}
2121
env:
22-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7'
22+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1'
2323

2424
strategy:
2525
fail-fast: False
2626
matrix:
2727
config:
28-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
29-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
30-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
31-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
32-
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}
33-
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
34-
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
28+
- {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False}
29+
- {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False}
30+
- {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False}
31+
- {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False}
32+
- {python-version: "3.10.0-rc.1", testenvs: "py310-dev-click{7,8},build", experimental: True}
3533

3634
steps:
3735
- name: Checkout 🛎️

‎.github/workflows/python_ci_linux.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ jobs:
1919
runs-on: "ubuntu-20.04"
2020
continue-on-error: ${{ matrix.config.experimental }}
2121
env:
22-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7'
22+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1'
2323

2424
strategy:
2525
fail-fast: False
2626
matrix:
2727
config:
28-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
29-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
30-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
31-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
32-
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}
33-
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
34-
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
28+
- {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False}
29+
- {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False}
30+
- {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False}
31+
- {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False}
32+
- {python-version: "3.10.0-rc.1", testenvs: "py310-dev-click{7,8},build", experimental: True}
3533

3634
steps:
3735
- name: Checkout 🛎️

‎.github/workflows/python_ci_macos.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,17 @@ jobs:
1919
runs-on: "macos-latest"
2020
continue-on-error: ${{ matrix.config.experimental }}
2121
env:
22-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7'
22+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-rc.1'
2323

2424
strategy:
2525
fail-fast: False
2626
matrix:
2727
config:
28-
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
29-
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
30-
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
31-
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
32-
- {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True}
33-
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
34-
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
28+
- {python-version: "3.6", testenvs: "py36-click{7,8},build", experimental: False}
29+
- {python-version: "3.7", testenvs: "py37-click{7,8},build", experimental: False}
30+
- {python-version: "3.8", testenvs: "py38-click{7,8},build", experimental: False}
31+
- {python-version: "3.9", testenvs: "py39-click{7,8},build", experimental: False}
32+
- {python-version: "3.10.0-rc.1", testenvs: "py310-dev-click{7,8},build", experimental: True}
3533

3634
steps:
3735
- name: Checkout 🛎️

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ snippet-fmt = "snippet_fmt.__main__:main"
3030
[tool.whey]
3131
base-classifiers = [ "Development Status :: 4 - Beta", "Environment :: Console", "Intended Audience :: Developers",]
3232
python-versions = [ "3.6", "3.7", "3.8", "3.9",]
33-
python-implementations = [ "CPython", "PyPy",]
33+
python-implementations = [ "CPython",]
3434
platforms = [ "Windows", "macOS", "Linux",]
3535
license-key = "MIT"
3636
package = "snippet_fmt"

‎repo_helper.yml‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ python_versions:
2626
- '3.8'
2727
- '3.9'
2828
- 3.10-dev
29-
- pypy36
30-
- pypy37
3129

3230
keywords:
3331
- formatting
@@ -62,10 +60,7 @@ extra_sphinx_extensions:
6260
exclude_files:
6361
- contributing
6462

65-
#mypy_plugins:
66-
# - attr_utils.mypy_plugin
67-
68-
#third_party_version_matrix:
69-
# click:
70-
# - 7
71-
# - 8
63+
third_party_version_matrix:
64+
click:
65+
- 7
66+
- 8

‎tox.ini‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,14 @@
1616
# * pytest
1717

1818
[tox]
19-
envlist = py36, py37, py38, py39, py310-dev, pypy36, pypy37, mypy, build
19+
envlist =
20+
py36-click{7,8}
21+
py37-click{7,8}
22+
py38-click{7,8}
23+
py39-click{7,8}
24+
py310-dev-click{7,8}
25+
mypy
26+
build
2027
skip_missing_interpreters = True
2128
isolated_build = True
2229
requires =
@@ -25,13 +32,21 @@ requires =
2532
tox-pip-version>=0.0.7
2633

2734
[envlists]
28-
test = py36, py37, py38, py39, py310-dev, pypy36, pypy37
35+
test =
36+
py36-click{7,8}
37+
py37-click{7,8}
38+
py38-click{7,8}
39+
py39-click{7,8}
40+
py310-dev-click{7,8}
2941
qa = mypy, lint
30-
cov = py36, coverage
42+
cov = py36-click7, coverage
3143

3244
[testenv]
3345
setenv = PYTHONDEVMODE = 1
34-
deps = -r{toxinidir}/tests/requirements.txt
46+
deps =
47+
-r{toxinidir}/tests/requirements.txt
48+
click7: click~=7.0
49+
click8: click~=8.0
3550
commands =
3651
python --version
3752
python -m pytest --cov=snippet_fmt -r aR tests/ {posargs}

0 commit comments

Comments
 (0)