Skip to content

Commit

Permalink
Upgrade more tox jobs to 3.10 and rename a couple (#696)
Browse files Browse the repository at this point in the history
  • Loading branch information
uri-granta authored Feb 15, 2023
1 parent a2676a9 commit 51dc954
Show file tree
Hide file tree
Showing 11 changed files with 97 additions and 99 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/develop-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.10"
- run: pip install tox
- run: tox -e tests -- --runslow only

slowtests_latest:
slowtests_old:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.7"
- run: pip install tox
- run: tox -e tests_latest -- --runslow only
- run: tox -e tests_old -- --runslow only

fulldocs:
runs-on: ubuntu-latest
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/quality-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.10"
- run: pip install tox
- run: tox -e types

types_latest:
types_old:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.7"
- run: pip install tox
- run: tox -e types_latest
- run: tox -e types_old

format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.10"
- run: pip install tox
- run: tox -e format

Expand All @@ -54,19 +54,19 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.10"
- run: pip install tox
- run: tox -e tests

tests_latest:
tests_old:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.7"
- run: pip install tox
- run: tox -e tests_latest
- run: tox -e tests_old

docs:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions docs/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Building documentation

> **Note: though trieste itself supports any version of Python from 3.7 onwards, the trieste documentation currently only builds using Python 3.7 or 3.8.**
To build the documentation, ensure you have both [tox](https://tox.readthedocs.io) and [pandoc](https://github.com/jgm/pandoc/releases/) installed.
Then run the following from the repository root directory:

Expand Down
43 changes: 5 additions & 38 deletions docs/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,29 +1,17 @@
absl-py==1.4.0
alabaster==0.7.13
astroid==2.13.3
astunparse==1.6.3
astroid==2.14.2
attrs==22.2.0
Babel==2.11.0
backcall==0.2.0
beautifulsoup4==4.11.1
beautifulsoup4==4.11.2
bleach==6.0.0
cachetools==5.3.0
certifi==2022.12.7
charset-normalizer==3.0.1
cloudpickle==2.2.1
decorator==5.1.1
defusedxml==0.7.1
dm-tree==0.1.8
docutils==0.16
entrypoints==0.4
fastjsonschema==2.16.2
flatbuffers==23.1.21
gast==0.5.3
google-auth==2.16.0
google-auth-oauthlib==0.4.6
google-pasta==0.2.0
grpcio==1.51.1
h5py==3.8.0
idna==3.4
imagesize==1.4.1
importlib-metadata==4.13.0
Expand All @@ -35,34 +23,24 @@ jsonschema==4.17.3
jupyter_client==7.4.9
jupyter_core==4.12.0
jupyterlab-pygments==0.2.2
keras==2.8.0
Keras-Preprocessing==1.1.2
latexcodec==2.0.1
lazy-object-proxy==1.9.0
libclang==15.0.6.1
Markdown==3.4.1
MarkupSafe==2.1.2
matplotlib-inline==0.1.6
mistune==2.0.4
mistune==2.0.5
nbclient==0.7.2
nbconvert==7.2.9
nbformat==5.7.3
nbsphinx==0.8.12
nest-asyncio==1.5.6
numpy==1.21.6
oauthlib==3.2.2
opt-einsum==3.3.0
packaging==23.0
pandocfilters==1.5.0
parso==0.8.3
pexpect==4.8.0
pickleshare==0.7.5
pkgutil_resolve_name==1.3.10
prompt-toolkit==3.0.36
protobuf==3.19.6
ptyprocess==0.7.0
pyasn1==0.4.8
pyasn1-modules==0.2.8
pybtex==0.24.0
pybtex-docutils==1.0.2
pydata-sphinx-theme==0.8.1
Expand All @@ -73,8 +51,6 @@ pytz==2022.7.1
PyYAML==6.0
pyzmq==25.0.0
requests==2.28.2
requests-oauthlib==1.3.1
rsa==4.9
six==1.16.0
snowballstemmer==2.2.0
soupsieve==2.3.2.post1
Expand All @@ -87,23 +63,14 @@ sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
tensorboard==2.8.0
tensorboard-data-server==0.6.1
tensorboard-plugin-wit==1.8.1
tensorflow==2.8.4
tensorflow-estimator==2.8.0
tensorflow-io-gcs-filesystem==0.30.0
tensorflow-probability==0.13.0
termcolor==2.2.0
tinycss2==1.2.1
tornado==6.2
traitlets==5.8.1
traitlets==5.9.0
typed-ast==1.5.4
typing_extensions==4.4.0
Unidecode==1.3.6
urllib3==1.26.14
wcwidth==0.2.6
webencodings==0.5.1
Werkzeug==2.2.2
wrapt==1.14.1
zipp==3.12.0
zipp==3.13.0
54 changes: 36 additions & 18 deletions docs/notebooks/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,27 +1,31 @@
about-time==4.2.1
absl-py==1.4.0
aiohttp==3.8.3
aiofiles==22.1.0
aiohttp==3.8.4
aiohttp-cors==0.7.0
aiosignal==1.3.1
aiosqlite==0.18.0
alive-progress==3.0.1
anyio==3.6.2
argon2-cffi==21.3.0
argon2-cffi-bindings==21.2.0
arrow==1.2.3
astunparse==1.6.3
async-timeout==4.0.2
asynctest==0.13.0
attrs==22.2.0
autograd==1.5
Babel==2.11.0
backcall==0.2.0
beautifulsoup4==4.11.1
beautifulsoup4==4.11.2
bleach==6.0.0
blessed==1.19.1
blessed==1.20.0
Box2D==2.3.10
cached-property==1.5.2
cachetools==5.3.0
certifi==2022.12.7
cffi==1.15.1
charset-normalizer==2.1.1
charset-normalizer==3.0.1
check-shapes==1.0.0
click==8.1.3
cloudpickle==2.2.1
Expand All @@ -42,6 +46,7 @@ fastjsonschema==2.16.2
filelock==3.9.0
flatbuffers==23.1.21
fonttools==4.38.0
fqdn==1.5.1
frozenlist==1.3.3
future==0.18.3
gast==0.4.0
Expand All @@ -64,18 +69,24 @@ importlib-resources==5.10.2
ipykernel==6.16.2
ipython==7.34.0
ipython-genutils==0.2.0
isoduration==20.11.0
jedi==0.18.2
Jinja2==3.0.3
json5==0.9.11
jsonpointer==2.3
jsonschema==4.17.3
jupyter-events==0.5.0
jupyter-server==1.23.5
jupyter-ydoc==0.2.2
jupyter_client==7.4.9
jupyter_core==4.12.0
jupyterlab==3.5.3
jupyter_server_fileid==0.6.0
jupyter_server_ydoc==0.6.1
jupyterlab==3.6.1
jupyterlab-pygments==0.2.2
jupyterlab_server==2.19.0
jupytext==1.14.4
keras==2.8.0
keras==2.10.0
Keras-Preprocessing==1.1.2
kiwisolver==1.4.4
lark==1.1.5
Expand All @@ -87,7 +98,7 @@ matplotlib==3.5.3
matplotlib-inline==0.1.6
mdit-py-plugins==0.3.3
mdurl==0.1.2
mistune==2.0.4
mistune==2.0.5
msgpack==1.0.4
multidict==6.0.4
multipledispatch==0.6.0
Expand All @@ -113,7 +124,7 @@ pexpect==4.8.0
pickleshare==0.7.5
Pillow==9.4.0
pkgutil_resolve_name==1.3.10
platformdirs==2.6.2
platformdirs==3.0.0
plotly==5.13.0
prometheus-client==0.13.1
prompt-toolkit==3.0.36
Expand All @@ -130,44 +141,51 @@ pymoo==0.6.0.1
pyparsing==3.0.9
pyrsistent==0.19.3
python-dateutil==2.8.2
python-json-logger==2.0.6
pytz==2022.7.1
PyYAML==6.0
pyzmq==25.0.0
qdldl==0.1.5.post3
ray==2.2.0
requests==2.28.2
requests-oauthlib==1.3.1
rfc3339-validator==0.1.4
rfc3986-validator==0.1.1
rsa==4.9
scipy==1.7.3
scs==3.2.2
Send2Trash==1.8.0
six==1.16.0
smart-open==6.3.0
sniffio==1.3.0
soupsieve==2.3.2.post1
soupsieve==2.4
tabulate==0.9.0
tenacity==8.1.0
tensorboard==2.8.0
tenacity==8.2.1
tensorboard==2.10.1
tensorboard-data-server==0.6.1
tensorboard-plugin-wit==1.8.1
tensorflow==2.8.4
tensorflow-estimator==2.8.0
tensorflow==2.10.1
tensorflow-estimator==2.10.0
tensorflow-io-gcs-filesystem==0.30.0
tensorflow-probability==0.13.0
tensorflow-probability==0.18.0
termcolor==2.2.0
terminado==0.17.1
tinycss2==1.2.1
toml==0.10.2
tomli==2.0.1
tornado==6.2
traitlets==5.8.1
traitlets==5.9.0
typing_extensions==4.4.0
uri-template==1.2.0
urllib3==1.26.14
virtualenv==20.17.1
virtualenv==20.19.0
wcwidth==0.2.6
webcolors==1.12
webencodings==0.5.1
websocket-client==1.5.0
websocket-client==1.5.1
Werkzeug==2.2.2
wrapt==1.14.1
y-py==0.5.5
yarl==1.8.2
zipp==3.12.0
ypy-websocket==0.8.2
zipp==3.13.0
4 changes: 0 additions & 4 deletions docs/notebooks/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,3 @@ jupyterlab
jupytext
gym<0.22
box2d

# pin to version of TF used in prod
tensorflow ~= 2.8.0
tensorflow-probability ~= 0.13.0
4 changes: 0 additions & 4 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,3 @@ pydata-sphinx-theme
ipython
nbsphinx
sphinxcontrib-bibtex

# pin to version of TF used in prod
tensorflow ~= 2.8.0
tensorflow-probability ~= 0.13.0
2 changes: 1 addition & 1 deletion generate_constraints.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ generate_for_env common_build/format false
generate_for_env common_build/taskipy false
generate_for_env common_build/types false
generate_for_env notebooks true
generate_for_env tests true
generate_for_env tests/old true
generate_for_env tests/latest true

rm -rf $VENV_DIR
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/requirements.txt → tests/old/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ packaging
pytest
PyYAML

# pin to version of TF used in prod
# pin to older version of TF (for now)
tensorflow ~= 2.8.0
tensorflow-probability ~= 0.13.0
Loading

0 comments on commit 51dc954

Please sign in to comment.