Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support TF 2.16 #858

Merged
merged 21 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/develop-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e tests_old -- --runslow only

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/quality-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e types_old

Expand All @@ -53,6 +53,7 @@ jobs:
tests:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
part: [ "1", "2", "3", "4" ]
name: tests (part${{ matrix.part }})
Expand All @@ -67,14 +68,15 @@ jobs:
tests_old:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
part: [ "1", "2", "3", "4" ]
name: tests_old (part${{ matrix.part }})
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e tests_old_${{ matrix.part }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e types_old

Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e tests_old_${{ matrix.part }}

Expand All @@ -94,7 +94,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.7"
python-version: "3.9"
- run: pip install tox
- run: tox -e tests_old -- --runslow only

Expand Down
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ query_point, observation, arg_min_idx = result.try_get_optimal_point()

## Installation

Trieste supports Python 3.7+ and TensorFlow 2.5+, and uses [semantic versioning](https://semver.org/).
Trieste supports Python 3.9+ and TensorFlow 2.5+, and uses [semantic versioning](https://semver.org/).


### For users
Expand Down Expand Up @@ -111,6 +111,13 @@ Alternatively, you can copy and paste the tutorials into fresh notebooks and avo
$ pip install trieste[plotting]
```

### Importing Keras

Like [tensorflow-probability](https://www.tensorflow.org/probability), Trieste currently uses Keras 2. When using Tensorflow versions 2.16 onwards (which default to Keras 3) this needs to be imported from `tf_keras` rather than `tf.keras`. Alternatively, for a shortcut that works with all versions of Tensorflow, you can write:
```python
from gpflow.keras import tf_keras
```

## The Trieste Community

### Getting help
Expand Down
19 changes: 10 additions & 9 deletions common_build/format/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
black==23.3.0
click==8.1.3
flake8==6.0.0
isort==5.12.0
black==24.4.2
click==8.1.7
flake8==7.1.0
isort==5.13.2
mccabe==0.7.0
mypy-extensions==1.0.0
packaging==23.1
pathspec==0.11.1
platformdirs==3.5.3
pycodestyle==2.10.0
pyflakes==3.0.1
packaging==24.1
pathspec==0.12.1
platformdirs==4.2.2
pycodestyle==2.12.0
pyflakes==3.2.0
tomli==2.0.1
typing_extensions==4.12.2
54 changes: 26 additions & 28 deletions common_build/taskipy/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,37 +1,35 @@
astroid==2.15.5
attrs==23.1.0
black==23.3.0
click==8.1.3
astroid==3.2.2
attrs==23.2.0
black==24.4.2
click==8.1.7
colorama==0.4.6
coverage==7.2.7
dill==0.3.6
exceptiongroup==1.1.1
filelock==3.12.2
flake8==6.0.0
coverage==7.5.3
dill==0.3.8
exceptiongroup==1.2.1
filelock==3.15.4
flake8==7.1.0
iniconfig==2.0.0
isort==5.12.0
lazy-object-proxy==1.9.0
isort==5.13.2
mccabe==0.7.0
mypy==1.3.0
mypy==1.10.0
mypy-extensions==1.0.0
packaging==23.1
pathspec==0.11.1
platformdirs==3.5.3
pluggy==1.0.0
psutil==5.9.5
pycodestyle==2.10.0
pyflakes==3.0.1
pylint==2.17.4
pytest==7.3.2
packaging==24.1
pathspec==0.12.1
platformdirs==4.2.2
pluggy==1.5.0
psutil==5.9.8
pycodestyle==2.12.0
pyflakes==3.2.0
pylint==3.2.3
pytest==8.2.2
pytest-black==0.3.12
pytest-cov==4.1.0
pytest-cov==5.0.0
pytest-flake8==1.1.1
pytest-isort==3.1.0
pytest-isort==4.0.0
pytest-mypy==0.10.3
pytest-pylint==0.19.0
taskipy==1.11.0
pytest-pylint==0.21.0
taskipy==1.13.0
toml==0.10.2
tomli==2.0.1
tomlkit==0.11.8
typing_extensions==4.6.3
wrapt==1.14.1
tomlkit==0.12.5
typing_extensions==4.12.2
6 changes: 3 additions & 3 deletions common_build/types/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mypy==1.3.0
mypy==1.10.0
mypy-extensions==1.0.0
tomli==2.0.1
types-PyYAML==6.0.12.10
typing_extensions==4.6.3
types-PyYAML==6.0.12.20240311
typing_extensions==4.12.2
127 changes: 63 additions & 64 deletions docs/constraints.txt
Original file line number Diff line number Diff line change
@@ -1,74 +1,73 @@
accessible-pygments==0.0.4
alabaster==0.7.13
anyascii==0.3.2
astroid==2.15.5
asttokens==2.2.1
attrs==23.1.0
Babel==2.12.1
backcall==0.2.0
beautifulsoup4==4.12.2
bleach==6.0.0
certifi==2023.5.7
charset-normalizer==3.1.0
accessible-pygments==0.0.5
alabaster==0.7.16
astroid==3.2.2
asttokens==2.4.1
attrs==23.2.0
Babel==2.15.0
beautifulsoup4==4.12.3
bleach==6.1.0
certifi==2024.6.2
charset-normalizer==3.3.2
decorator==5.1.1
defusedxml==0.7.1
docutils==0.20.1
executing==1.2.0
fastjsonschema==2.17.1
idna==3.4
docutils==0.21.2
exceptiongroup==1.2.1
executing==2.0.1
fastjsonschema==2.20.0
idna==3.7
imagesize==1.4.1
ipython==8.14.0
jedi==0.18.2
Jinja2==3.1.2
jsonschema==4.17.3
jupyter_client==8.2.0
jupyter_core==5.3.0
jupyterlab-pygments==0.2.2
latexcodec==2.0.1
lazy-object-proxy==1.9.0
MarkupSafe==2.1.3
matplotlib-inline==0.1.6
mistune==2.0.5
nbclient==0.8.0
nbconvert==7.4.0
nbformat==5.9.0
nbsphinx==0.9.2
packaging==23.1
pandocfilters==1.5.0
parso==0.8.3
pexpect==4.8.0
pickleshare==0.7.5
platformdirs==3.5.3
prompt-toolkit==3.0.38
ipython==8.25.0
jedi==0.19.1
Jinja2==3.1.4
jsonschema==4.22.0
jsonschema-specifications==2023.12.1
jupyter_client==8.6.2
jupyter_core==5.7.2
jupyterlab_pygments==0.3.0
latexcodec==3.0.0
MarkupSafe==2.1.5
matplotlib-inline==0.1.7
mistune==3.0.2
nbclient==0.10.0
nbconvert==7.16.4
nbformat==5.10.4
nbsphinx==0.9.4
packaging==24.1
pandocfilters==1.5.1
parso==0.8.4
pexpect==4.9.0
platformdirs==4.2.2
prompt_toolkit==3.0.47
ptyprocess==0.7.0
pure-eval==0.2.2
pybtex==0.24.0
pybtex-docutils==1.0.2
pydata-sphinx-theme==0.13.3
Pygments==2.15.1
pyrsistent==0.19.3
python-dateutil==2.8.2
PyYAML==6.0
pyzmq==25.1.0
requests==2.31.0
pybtex-docutils==1.0.3
pydata-sphinx-theme==0.15.3
Pygments==2.18.0
python-dateutil==2.9.0.post0
PyYAML==6.0.1
pyzmq==26.0.3
referencing==0.35.1
requests==2.32.3
rpds-py==0.18.1
six==1.16.0
snowballstemmer==2.2.0
soupsieve==2.4.1
Sphinx==7.0.1
sphinx-autoapi==2.1.1
sphinxcontrib-applehelp==1.0.4
sphinxcontrib-bibtex==2.5.0
sphinxcontrib-devhelp==1.0.2
sphinxcontrib-htmlhelp==2.0.1
soupsieve==2.5
Sphinx==7.3.7
sphinx-autoapi==3.1.2
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-bibtex==2.6.2
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.3
sphinxcontrib-serializinghtml==1.1.5
stack-data==0.6.2
tinycss2==1.2.1
tornado==6.3.2
traitlets==5.9.0
typing_extensions==4.6.3
urllib3==2.0.3
wcwidth==0.2.6
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-serializinghtml==1.1.10
stack-data==0.6.3
tinycss2==1.3.0
tomli==2.0.1
tornado==6.4.1
traitlets==5.14.3
typing_extensions==4.12.2
urllib3==2.2.2
wcwidth==0.2.13
webencodings==0.5.1
wrapt==1.14.1
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ To install Trieste, run

$ pip install trieste

The library supports Python 3.7 onwards, and uses `semantic versioning <https://semver.org/>`_.
The library supports Python 3.9 onwards, and uses `semantic versioning <https://semver.org/>`_.

Getting help
------------
Expand Down
Loading
Loading