Skip to content

Commit

Permalink
Bump versions and fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Davidy22 committed Jan 4, 2025
1 parent 5fe1b22 commit 8d2c690
Show file tree
Hide file tree
Showing 7 changed files with 662 additions and 649 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -49,7 +49,6 @@ jobs:
virtualenv test-rtd
. ./test-rtd/bin/activate
pip install -r requirements-dev.txt
rm -rf test-rtd
# for dev
make dev-actions
Expand All @@ -60,6 +59,7 @@ jobs:
make test-actions
# prepare for deployment
make generate-paths
rm -rf test-rtd
- uses: Thog/action-equals@v1
id: isLatest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
id: tag
run: echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT

- name: Set up Python 3.9
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11

- name: Checkout the current branch
run: |
Expand Down
8 changes: 4 additions & 4 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@ reno = {version = ">=2.8.0",extras = ["sphinx"]}
colorlog = "*"
sphinx-rtd-theme = "*"
sphinxcontrib-programoutput = "*"
e1839a8 = {editable = true,path = "."}
twine = "*"
pathlib2 = "*"
scandir = {markers = "python_version > '3.5'"}
pathlib2 = {markers = "python_version < '3.8'"}
scandir = {markers = "python_version < '3.5'"}
pyfakefs = "*"
pytest-cov = "*"
pew = "*"
Expand All @@ -38,5 +37,6 @@ pre-commit = "==2.17.0"
[packages]
pbr = "*"
wheel = "*"
typing = {markers = "python_version > '3.5'"}
typing = {markers = "python_version < '3.5'"}
cython = "*"
pyyaml = "*"
1,283 changes: 648 additions & 635 deletions Pipfile.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ mypy-extensions==1.0.0; python_version >= '3.5'
nh3==0.2.20; python_version >= '3.8'
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'
packaging==24.2; python_version >= '3.8'
pathlib2==2.3.7.post1
pathlib2==2.3.7.post1; python_version < '3.8'
pathspec==0.12.1; python_version >= '3.8'
pbr==6.1.0; python_version >= '2.6'
pep8==1.7.1
Expand All @@ -66,7 +66,7 @@ requests==2.32.3; python_version >= '3.8'
requests-toolbelt==1.0.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
rfc3986==2.0.0; python_version >= '3.7'
rich==13.9.4; python_full_version >= '3.8.0'
scandir==1.10.0; python_version > '3.5'
scandir==1.10.0; python_version < '3.5'
secretstorage==3.3.3; python_version >= '3.6'
setuptools==75.6.0; python_version >= '3.9'
six==1.17.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
Expand All @@ -91,5 +91,5 @@ virtualenv==20.28.0; python_version >= '3.8'
virtualenv-clone==0.5.7; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
yapf==0.43.0; python_version >= '3.7'
cython==3.0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
typing==3.7.4.3; python_version > '3.5'
typing==3.7.4.3; python_version < '3.5'
wheel==0.45.1; python_version >= '3.8'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
cython==3.0.11; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
pbr==6.1.0; python_version >= '2.6'
pyyaml==6.0.2; python_version >= '3.8'
typing==3.7.4.3; python_version > '3.5'
typing==3.7.4.3; python_version < '3.5'
wheel==0.45.1; python_version >= '3.8'
4 changes: 2 additions & 2 deletions scripts/bootstrap-dev-pip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ else
fi

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

echo "Please ensure your local bin directory is in your path"
Expand Down

0 comments on commit 8d2c690

Please sign in to comment.