Skip to content

Commit 3d5753c

Browse files
authored
Merge branch 'main' into dependabot/pip/dot-github/workflows/pipx-eq-1.7.1
2 parents dcc971c + 3726b61 commit 3d5753c

File tree

5 files changed

+840
-601
lines changed

5 files changed

+840
-601
lines changed

.github/workflows/constraints.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pip==24.2
2-
pipx==1.7.1
2+
pipx==1.7.1,!=1.5,!=1.6
33
nox==2023.4.22
44
nox-poetry==1.0.3
55
virtualenv==20.26.3

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: nox --force-color --session=docs-build
4343

4444
- name: Upload documentation
45-
uses: actions/upload-artifact@v3
45+
uses: actions/upload-artifact@v4
4646
with:
4747
name: docs
4848
path: docs/_build

.github/workflows/tests.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
print("::set-output result={}".format(result))
7979
8080
- name: Restore pre-commit cache
81-
uses: actions/cache@v3
81+
uses: actions/cache@v4
8282
if: matrix.session == 'pre-commit'
8383
with:
8484
path: ~/.cache/pre-commit
@@ -92,10 +92,11 @@ jobs:
9292
9393
- name: Upload coverage data
9494
if: always() && matrix.session == 'tests'
95-
uses: actions/upload-artifact@v3
95+
uses: actions/upload-artifact@v4
9696
with:
97-
name: coverage-data
97+
name: coverage-data-${{ strategy.job-index }}
9898
path: ".coverage.*"
99+
include-hidden-files: true
99100

100101
coverage:
101102
runs-on: ubuntu-latest
@@ -126,9 +127,10 @@ jobs:
126127
nox --version
127128
128129
- name: Download coverage data
129-
uses: actions/download-artifact@v3
130+
uses: actions/download-artifact@v4
130131
with:
131-
name: coverage-data
132+
pattern: coverage-data-*
133+
merge-multiple: true
132134

133135
- name: Combine coverage data and display human readable report
134136
run: |

docs/requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
furo==2024.8.6
2-
sphinx==8.0.2
3-
myst_parser==4.0.0
2+
sphinx==8.2.3
3+
myst_parser==4.0.1

0 commit comments

Comments
 (0)