Skip to content

Commit 8d2c690

Browse files
committed
Bump versions and fix CI
1 parent 5fe1b22 commit 8d2c690

File tree

7 files changed

+662
-649
lines changed

7 files changed

+662
-649
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
python-version: ["3.8", "3.9"]
13+
python-version: ["3.8", "3.9", "3.10", "3.11"]
1414

1515
steps:
1616
- uses: actions/checkout@v4
@@ -49,7 +49,6 @@ jobs:
4949
virtualenv test-rtd
5050
. ./test-rtd/bin/activate
5151
pip install -r requirements-dev.txt
52-
rm -rf test-rtd
5352
5453
# for dev
5554
make dev-actions
@@ -60,6 +59,7 @@ jobs:
6059
make test-actions
6160
# prepare for deployment
6261
make generate-paths
62+
rm -rf test-rtd
6363
6464
- uses: Thog/action-equals@v1
6565
id: isLatest

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
id: tag
2222
run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
2323

24-
- name: Set up Python 3.9
24+
- name: Set up Python 3.11
2525
uses: actions/setup-python@v5
2626
with:
27-
python-version: 3.9
27+
python-version: 3.11
2828

2929
- name: Checkout the current branch
3030
run: |

Pipfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ reno = {version = ">=2.8.0",extras = ["sphinx"]}
2222
colorlog = "*"
2323
sphinx-rtd-theme = "*"
2424
sphinxcontrib-programoutput = "*"
25-
e1839a8 = {editable = true,path = "."}
2625
twine = "*"
27-
pathlib2 = "*"
28-
scandir = {markers = "python_version > '3.5'"}
26+
pathlib2 = {markers = "python_version < '3.8'"}
27+
scandir = {markers = "python_version < '3.5'"}
2928
pyfakefs = "*"
3029
pytest-cov = "*"
3130
pew = "*"
@@ -38,5 +37,6 @@ pre-commit = "==2.17.0"
3837
[packages]
3938
pbr = "*"
4039
wheel = "*"
41-
typing = {markers = "python_version > '3.5'"}
40+
typing = {markers = "python_version < '3.5'"}
41+
cython = "*"
4242
pyyaml = "*"

Pipfile.lock

Lines changed: 648 additions & 635 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements-dev.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ mypy-extensions==1.0.0; python_version >= '3.5'
4040
nh3==0.2.20; python_version >= '3.8'
4141
nodeenv==1.9.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'
4242
packaging==24.2; python_version >= '3.8'
43-
pathlib2==2.3.7.post1
43+
pathlib2==2.3.7.post1; python_version < '3.8'
4444
pathspec==0.12.1; python_version >= '3.8'
4545
pbr==6.1.0; python_version >= '2.6'
4646
pep8==1.7.1
@@ -66,7 +66,7 @@ requests==2.32.3; python_version >= '3.8'
6666
requests-toolbelt==1.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
6767
rfc3986==2.0.0; python_version >= '3.7'
6868
rich==13.9.4; python_full_version >= '3.8.0'
69-
scandir==1.10.0; python_version > '3.5'
69+
scandir==1.10.0; python_version < '3.5'
7070
secretstorage==3.3.3; python_version >= '3.6'
7171
setuptools==75.6.0; python_version >= '3.9'
7272
six==1.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
@@ -91,5 +91,5 @@ virtualenv==20.28.0; python_version >= '3.8'
9191
virtualenv-clone==0.5.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
9292
yapf==0.43.0; python_version >= '3.7'
9393
cython==3.0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
94-
typing==3.7.4.3; python_version > '3.5'
94+
typing==3.7.4.3; python_version < '3.5'
9595
wheel==0.45.1; python_version >= '3.8'

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
cython==3.0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
33
pbr==6.1.0; python_version >= '2.6'
44
pyyaml==6.0.2; python_version >= '3.8'
5-
typing==3.7.4.3; python_version > '3.5'
5+
typing==3.7.4.3; python_version < '3.5'
66
wheel==0.45.1; python_version >= '3.8'

scripts/bootstrap-dev-pip.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ else
99
fi
1010

1111
python3 -m pip install $op --upgrade \
12-
'pip==20.0.2' \
13-
'pipenv==2018.11.26' \
12+
'pip==24.3.1' \
13+
'pipenv==2024.4.0' \
1414
|| echo "you may need to sudo me !"
1515

1616
echo "Please ensure your local bin directory is in your path"

0 commit comments

Comments
 (0)