Skip to content

Commit 7e6c46d

Browse files
committed
# Conflicts: # .github/workflows/main.yml
2 parents 353c3df + 33dd012 commit 7e6c46d

File tree

3 files changed

+22
-36
lines changed

3 files changed

+22
-36
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -37,65 +37,47 @@ jobs:
3737
- python: "3.10"
3838
platform: ubuntu-latest
3939
# disabled for #463
40-
# - python: pypy3.9
40+
# - python: pypy3.10
4141
# platform: ubuntu-latest
4242
runs-on: ${{ matrix.platform }}
43-
continue-on-error: ${{ matrix.python == '3.12' }}
43+
continue-on-error: ${{ matrix.python == '3.13' }}
4444
steps:
45-
- uses: actions/checkout@v3
46-
with:
47-
# fetch all branches and tags (to get tags for versioning)
48-
# ref actions/checkout#448
49-
fetch-depth: 0
45+
- uses: actions/checkout@v4
5046
- name: Setup Python
5147
uses: actions/setup-python@v4
5248
with:
5349
python-version: ${{ matrix.python }}
5450
allow-prereleases: true
5551
- name: Install tox
56-
run: |
57-
python -m pip install tox
52+
run: python -m pip install tox
5853
- name: Run
5954
run: tox
6055

61-
diffcov:
56+
collateral:
57+
strategy:
58+
fail-fast: false
59+
matrix:
60+
job: [diffcov, docs]
6261
runs-on: ubuntu-latest
6362
steps:
64-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v4
6564
with:
6665
fetch-depth: 0
6766
- name: Setup Python
6867
uses: actions/setup-python@v4
6968
with:
7069
python-version: 3.x
7170
- name: Install tox
72-
run: |
73-
python -m pip install tox
74-
- name: Evaluate coverage
75-
run: tox
76-
env:
77-
TOXENV: diffcov
78-
79-
docs:
80-
runs-on: ubuntu-latest
81-
env:
82-
TOXENV: docs
83-
steps:
84-
- uses: actions/checkout@v3
85-
- name: Setup Python
86-
uses: actions/setup-python@v4
87-
- name: Install tox
88-
run: |
89-
python -m pip install tox
90-
- name: Run
91-
run: tox
71+
run: python -m pip install tox
72+
- name: Eval ${{ matrix.job }}
73+
run: tox -e ${{ matrix.job }}
9274

9375
check: # This job does nothing and is only used for the branch protection
9476
if: always()
9577

9678
needs:
9779
- test
98-
- docs
80+
- collateral
9981

10082
runs-on: ubuntu-latest
10183

@@ -114,14 +96,13 @@ jobs:
11496
runs-on: ubuntu-latest
11597

11698
steps:
117-
- uses: actions/checkout@v3
99+
- uses: actions/checkout@v4
118100
- name: Setup Python
119101
uses: actions/setup-python@v4
120102
with:
121103
python-version: 3.x
122104
- name: Install tox
123-
run: |
124-
python -m pip install tox
105+
run: python -m pip install tox
125106
- name: Run
126107
run: tox -e release
127108
env:

pytest.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ filterwarnings=
2424
# pypa/build#615
2525
ignore:'encoding' argument not specified::build.env
2626

27+
# dateutil/dateutil#1284
28+
ignore:datetime.datetime.utcfromtimestamp:DeprecationWarning:dateutil.tz.tz
29+
2730
## end upstream

tox.ini

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ extras =
2828
changedir = docs
2929
commands =
3030
python -m sphinx -W --keep-going . {toxinidir}/build/html
31-
python -m sphinxlint
31+
python -m sphinxlint \
32+
# workaround for sphinx-contrib/sphinx-lint#83
33+
--jobs 1
3234

3335
[testenv:finalize]
3436
description = assemble changelog and tag a release

0 commit comments

Comments
 (0)