diff --git a/.conda/bld.bat b/.conda/bld.bat index 542b82616..22b63e50a 100644 --- a/.conda/bld.bat +++ b/.conda/bld.bat @@ -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. diff --git a/.conda/build.sh b/.conda/build.sh index 85bbe442f..620cd127a 100644 --- a/.conda/build.sh +++ b/.conda/build.sh @@ -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 diff --git a/.conda/meta.yaml b/.conda/meta.yaml index c80d3b56f..e16eb480d 100644 --- a/.conda/meta.yaml +++ b/.conda/meta.yaml @@ -16,7 +16,7 @@ source: path: ../ build: - number: 9 + number: 12 requirements: host: @@ -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: diff --git a/.conda_mac/build.sh b/.conda_mac/build.sh index f1299991b..2036035f6 100644 --- a/.conda_mac/build.sh +++ b/.conda_mac/build.sh @@ -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 \ No newline at end of file diff --git a/environment.yml b/environment.yml index 13cece2df..52f129faa 100644 --- a/environment.yml +++ b/environment.yml @@ -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