Skip to content

Commit

Permalink
Pin tensorflow-hub<0.14.0 (#1446)
Browse files Browse the repository at this point in the history
* Pin pynwb 2.3.3

* Remove pynwb pin, add comments
  • Loading branch information
roomrys authored Aug 11, 2023
1 parent 4730788 commit 88fdb68
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .conda/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set PIP_IGNORE_INSTALLED=False

@REM Install the pip dependencies. Note: Using urls to wheels might be better:
@REM https://docs.conda.io/projects/conda-build/en/stable/user-guide/wheel-files.html)
pip install -r .\requirements.txt
pip install --no-cache-dir -r .\requirements.txt

@REM Install sleap itself. This does not install the requirements, but will list which
@REM requirements are missing (see "install_requires") when user attempts to install.
Expand Down
2 changes: 1 addition & 1 deletion .conda/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export PIP_IGNORE_INSTALLED=False

# Install the pip dependencies. Note: Using urls to wheels might be better:
# https://docs.conda.io/projects/conda-build/en/stable/user-guide/wheel-files.html)
pip install -r ./requirements.txt
pip install --no-cache-dir -r ./requirements.txt


# Install sleap itself. This does not install the requirements, but will list which
Expand Down
4 changes: 2 additions & 2 deletions .conda/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ source:
path: ../

build:
number: 9
number: 12

requirements:
host:
Expand Down Expand Up @@ -83,7 +83,7 @@ requirements:
- conda-forge::scikit-video
- conda-forge::seaborn
- sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10, sleap channel has 2.6.3
- conda-forge::tensorflow-hub
- conda-forge::tensorflow-hub <0.14.0 # Causes pynwb conflicts on linux GH-1446

test:
imports:
Expand Down
2 changes: 1 addition & 1 deletion .conda_mac/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ export PIP_NO_INDEX=False
export PIP_NO_DEPENDENCIES=False
export PIP_IGNORE_INSTALLED=False

pip install -r requirements.txt
pip install --no-cache-dir -r requirements.txt

python setup.py install --single-version-externally-managed --record=record.txt
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ dependencies:
- conda-forge::scikit-video
- conda-forge::seaborn
- sleap::tensorflow >=2.6.3,<2.11 # No windows GPU support for >2.10
- conda-forge::tensorflow-hub
- conda-forge::tensorflow-hub # Pinned in meta.yml, but no problems here... yet

# Packages required by tensorflow to find/use GPUs
- conda-forge::cudatoolkit ==11.3.1
Expand Down

0 comments on commit 88fdb68

Please sign in to comment.