diff --git a/.github/workflows/arviz_compat.yml b/.github/workflows/arviz_compat.yml index 6d38839425..1410dd48ea 100644 --- a/.github/workflows/arviz_compat.yml +++ b/.github/workflows/arviz_compat.yml @@ -38,12 +38,12 @@ jobs: - name: Cache conda uses: actions/cache@v1 env: - # Increase this value to reset cache if environment-dev-py39.yml has not changed + # Increase this value to reset cache if environment-test-py39.yml has not changed CACHE_NUMBER: 0 with: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('conda-envs/environment-dev-py39.yml') }} + hashFiles('conda-envs/environment-test-py39.yml') }} - name: Cache multiple paths uses: actions/cache@v2 env: @@ -61,19 +61,19 @@ jobs: miniforge-variant: Mambaforge miniforge-version: latest mamba-version: "*" - activate-environment: pymc-dev-py39 + activate-environment: pymc-test-py39 channel-priority: strict - environment-file: conda-envs/environment-dev-py39.yml + environment-file: conda-envs/environment-test-py39.yml use-mamba: true use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly! - name: Install pymc run: | - conda activate pymc-dev-py39 + conda activate pymc-test-py39 pip install -e . python --version - name: Install latest arviz run: | - conda activate pymc-dev-py39 + conda activate pymc-test-py39 pip uninstall arviz -y pip install git+git://github.com/arviz-devs/arviz.git - name: Run tests diff --git a/.github/workflows/jaxtests.yml b/.github/workflows/jaxtests.yml index 45e698e20c..cf1f5b64df 100644 --- a/.github/workflows/jaxtests.yml +++ b/.github/workflows/jaxtests.yml @@ -34,12 +34,12 @@ jobs: - name: Cache conda uses: actions/cache@v1 env: - # Increase this value to reset cache if environment-dev-py39.yml has not changed + # Increase this value to reset cache if environment-test-py39.yml has not changed CACHE_NUMBER: 0 with: path: ~/conda_pkgs_dir key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ - hashFiles('conda-envs/environment-dev-py39.yml') }} + hashFiles('conda-envs/environment-test-py39.yml') }} - name: Cache multiple paths uses: actions/cache@v2 env: @@ -57,19 +57,19 @@ jobs: miniforge-variant: Mambaforge miniforge-version: latest mamba-version: "*" - activate-environment: pymc-dev-py39 + activate-environment: pymc-test-py39 channel-priority: strict - environment-file: conda-envs/environment-dev-py39.yml + environment-file: conda-envs/environment-test-py39.yml use-mamba: true use-only-tar-bz2: true # IMPORTANT: This needs to be set for caching to work properly! - name: Install pymc run: | - conda activate pymc-dev-py39 + conda activate pymc-test-py39 pip install -e . python --version - name: Install jax specific dependencies run: | - conda activate pymc-dev-py39 + conda activate pymc-test-py39 pip install "numpyro>=0.8.0" - name: Run tests run: | diff --git a/conda-envs/environment-dev-py37.yml b/conda-envs/environment-dev-py37.yml index f461596420..604f028f6d 100644 --- a/conda-envs/environment-dev-py37.yml +++ b/conda-envs/environment-dev-py37.yml @@ -11,11 +11,11 @@ dependencies: - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 -- ipython +- ipython>=7.16 - myst-nb -- numpy>=1.15 +- numpy>=1.15.0 - numpydoc<1.2 -- pandas>=0.24 +- pandas>=0.24.0 - pip - pre-commit>=2.8.0 - pydata-sphinx-theme @@ -23,11 +23,11 @@ dependencies: - pytest>=3.0 - python-graphviz - python=3.7 -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - sphinx-copybutton - sphinx-notfound-page - sphinx>=1.5 -- typing-extensions +- typing-extensions>=3.7.4 - pip: - polyagamma - sphinx-design diff --git a/conda-envs/environment-dev-py38.yml b/conda-envs/environment-dev-py38.yml index d5617ffa61..73fba0fdf0 100644 --- a/conda-envs/environment-dev-py38.yml +++ b/conda-envs/environment-dev-py38.yml @@ -11,7 +11,7 @@ dependencies: - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 -- ipython +- ipython>=7.16 - myst-nb - numpy>=1.15.0 - numpydoc<1.2 @@ -23,7 +23,7 @@ dependencies: - pytest>=3.0 - python-graphviz - python=3.8 -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - sphinx-copybutton - sphinx-notfound-page - sphinx>=1.5 diff --git a/conda-envs/environment-dev-py39.yml b/conda-envs/environment-dev-py39.yml index e6e476ec4c..3075395b24 100644 --- a/conda-envs/environment-dev-py39.yml +++ b/conda-envs/environment-dev-py39.yml @@ -11,11 +11,11 @@ dependencies: - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 -- ipython +- ipython>=7.16 - myst-nb - numpy>=1.15.0 - numpydoc<1.2 -- pandas +- pandas>=0.24.0 - pip - pre-commit>=2.8.0 - pydata-sphinx-theme @@ -23,7 +23,7 @@ dependencies: - pytest>=3.0 - python-graphviz - python=3.9 -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - sphinx-copybutton - sphinx-notfound-page - sphinx>=1.5 diff --git a/conda-envs/environment-test-py37.yml b/conda-envs/environment-test-py37.yml index af99718472..c9de235dfe 100644 --- a/conda-envs/environment-test-py37.yml +++ b/conda-envs/environment-test-py37.yml @@ -11,15 +11,15 @@ dependencies: - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 -- ipython +- ipython>=7.16 - libblas=*=*mkl - mkl-service - numpy>=1.15.0 -- pandas>=0.24 +- pandas>=0.24.0 - pre-commit>=2.8.0 - pytest-cov>=2.5 - pytest>=3.0 - python-graphviz - python=3.7 -- scipy>1.4.1 -- typing-extensions +- scipy>=1.4.1,<1.8.0 +- typing-extensions>=3.7.4 diff --git a/conda-envs/environment-test-py38.yml b/conda-envs/environment-test-py38.yml index c63bf4d214..715a6a0495 100644 --- a/conda-envs/environment-test-py38.yml +++ b/conda-envs/environment-test-py38.yml @@ -11,15 +11,15 @@ dependencies: - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 -- ipython +- ipython>=7.16 - libblas=*=*mkl - mkl-service - numpy>=1.15.0 -- pandas +- pandas>=0.24.0 - pre-commit>=2.8.0 - pytest-cov>=2.5 - pytest>=3.0 - python-graphviz - python=3.8 -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - typing-extensions>=3.7.4 diff --git a/conda-envs/environment-test-py39.yml b/conda-envs/environment-test-py39.yml index 5cd354fe4d..c57798f005 100644 --- a/conda-envs/environment-test-py39.yml +++ b/conda-envs/environment-test-py39.yml @@ -7,19 +7,19 @@ dependencies: - aeppl=0.0.18 - aesara=2.3.8 - arviz>=0.11.4 -- cachetools +- cachetools>=4.2.1 - cloudpickle - fastprogress>=0.2.0 -- h5py +- h5py>=2.7 - ipython>=7.16 - libblas=*=*mkl - mkl-service - numpy>=1.15.0 -- pandas +- pandas>=0.24.0 - pre-commit>=2.8.0 - pytest-cov>=2.5 - pytest>=3.0 - python-graphviz - python=3.9 -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - typing-extensions>=3.7.4 diff --git a/conda-envs/windows-environment-dev-py38.yml b/conda-envs/windows-environment-dev-py38.yml index 788ae6d28a..0ac4afb0c3 100644 --- a/conda-envs/windows-environment-dev-py38.yml +++ b/conda-envs/windows-environment-dev-py38.yml @@ -10,16 +10,16 @@ dependencies: - cachetools>=4.2.1 - cloudpickle - fastprogress>=0.2.0 -- h5py +- h5py>=2.7 - numpy>=1.15.0 -- pandas +- pandas>=0.24.0 - pip - python=3.8 - python-graphviz -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - typing-extensions>=3.7.4 # Extra stuff for dev, testing and docs build -- ipython +- ipython>=7.16 - myst-nb - numpydoc<1.2 - pre-commit>=2.8.0 diff --git a/conda-envs/windows-environment-test-py38.yml b/conda-envs/windows-environment-test-py38.yml index 2d8fc3fe21..380bbf1024 100644 --- a/conda-envs/windows-environment-test-py38.yml +++ b/conda-envs/windows-environment-test-py38.yml @@ -6,8 +6,8 @@ dependencies: # base dependencies (see install guide for Windows) - aeppl=0.0.18 - aesara=2.3.8 -- arviz>=0.11.2 -- cachetools +- arviz>=0.11.4 +- cachetools>=4.2.1 - cloudpickle - fastprogress>=0.2.0 - h5py>=2.7 @@ -16,11 +16,11 @@ dependencies: - mkl-service==2.3.0 - m2w64-toolchain - numpy>=1.15.0 -- pandas +- pandas>=0.24.0 - pip - python=3.8 - python-graphviz -- scipy>1.4.1 +- scipy>=1.4.1,<1.8.0 - typing-extensions>=3.7.4 # Extra stuff for testing - ipython>=7.16 diff --git a/requirements-dev.txt b/requirements-dev.txt index 4a317a1f5a..4162f63304 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,17 +8,17 @@ cachetools>=4.2.1 cloudpickle fastprogress>=0.2.0 h5py>=2.7 -ipython +ipython>=7.16 myst-nb numpy>=1.15.0 numpydoc<1.2 -pandas +pandas>=0.24.0 polyagamma pre-commit>=2.8.0 pydata-sphinx-theme pytest-cov>=2.5 pytest>=3.0 -scipy>1.4.1 +scipy>=1.4.1,<1.8.0 sphinx-copybutton sphinx-design sphinx-notfound-page diff --git a/requirements.txt b/requirements.txt index 46ec438b54..e75a5878a8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,5 +6,5 @@ cloudpickle fastprogress>=0.2.0 numpy>=1.15.0 pandas>=0.24.0 -scipy>=1.4.1 +scipy>=1.4.1,<1.8.0 typing-extensions>=3.7.4 diff --git a/scripts/generate_pip_deps_from_conda.py b/scripts/generate_pip_deps_from_conda.py index 4831fc412a..79b8f0e118 100755 --- a/scripts/generate_pip_deps_from_conda.py +++ b/scripts/generate_pip_deps_from_conda.py @@ -50,7 +50,6 @@ "m2w64-toolchain", "mkl-service", "numba", - "scipy", "python-graphviz", } RENAME = {}