Skip to content

Commit

Permalink
Small version fixes (#670)
Browse files Browse the repository at this point in the history
* Pin old setuptools version so we can install old gym version and invalidate windows cache.

* Update isort version.

* Update setuptools version in pyproject.toml
  • Loading branch information
ernestum authored Feb 3, 2023
1 parent 64b0a73 commit 2acc4b6
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ commands:
# Download and cache dependencies
- restore_cache:
keys:
- v7win-dependencies-{{ checksum "setup.py" }}-{{ checksum "ci/build_and_activate_venv.ps1" }}
- v8win-dependencies-{{ checksum "setup.py" }}-{{ checksum "ci/build_and_activate_venv.ps1" }}

- run:
name: install python and binary dependencies
Expand Down Expand Up @@ -152,7 +152,7 @@ commands:
- save_cache:
paths:
- .\venv
key: v7win-dependencies-{{ checksum "setup.py" }}-{{ checksum "ci/build_and_activate_venv.ps1" }}
key: v8win-dependencies-{{ checksum "setup.py" }}-{{ checksum "ci/build_and_activate_venv.ps1" }}

- run:
name: install imitation
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ repos:
- id: black
- id: black-jupyter
- repo: https://github.com/PyCQA/isort
rev: 5.10.1
rev: 5.12.0
hooks:
- id: isort
# Python static analysis
Expand Down
3 changes: 2 additions & 1 deletion ci/build_and_activate_venv.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ If ($venv -eq $null) {

virtualenv -p python3.8 $venv
& $venv\Scripts\activate
python -m pip install --upgrade pip
# Note: We need to install setuptools==66.1.1 to allow installing gym==0.21.0.
python -m pip install --upgrade pip setuptools==66.1.1
pip install ".[docs,parallel,test]"
3 changes: 2 additions & 1 deletion ci/build_and_activate_venv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@ fi
virtualenv -p ${python_version} ${venv}
# shellcheck disable=SC1090,SC1091
source ${venv}/bin/activate
python -m pip install --upgrade pip setuptools>=45
# Note: We need to install setuptools==66.1.1 to allow installing gym==0.21.0.
python -m pip install --upgrade pip setuptools==66.1.1
pip install ".[docs,parallel,test]"
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[build-system]
requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
# Note: setuptools 66.1.1 is the last version that supports installing gym==0.21.0
requires = ["setuptools==66.1.1", "setuptools_scm[toml]>=6.2"]
build-backend = "setuptools.build_meta"

# TODO(juan): we've commented this out because currently
Expand Down

0 comments on commit 2acc4b6

Please sign in to comment.