From e6a130792041d9f45d6e6c961e40d53a4d783ed9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Jun 2022 20:58:21 +0000 Subject: [PATCH 1/2] :arrow_up: Bump numpy from 1.16.4 to 1.22.0 Bumps [numpy](https://github.com/numpy/numpy) from 1.16.4 to 1.22.0. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/main/doc/HOWTO_RELEASE.rst) - [Commits](https://github.com/numpy/numpy/compare/v1.16.4...v1.22.0) --- updated-dependencies: - dependency-name: numpy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile | 2 +- .github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile | 2 +- CHANGELOG.md | 3 +++ CPAC/info.py | 2 +- requirements.txt | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile b/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile index 7d5c424907..7bb7b66e37 100644 --- a/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile +++ b/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile @@ -130,7 +130,7 @@ RUN conda update conda -y && \ matplotlib==3.1.3 \ networkx==2.4 \ nose==1.3.7 \ - numpy==1.16.4 \ + numpy==1.22.0 \ pandas==0.23.4 \ scipy==1.4.1 \ traits==4.6.0 \ diff --git a/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile b/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile index 3170286ed4..54afa03f72 100644 --- a/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile +++ b/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile @@ -140,7 +140,7 @@ RUN conda update conda -y && \ matplotlib==2.2.2 \ networkx==2.4 \ nose==1.3.7 \ - numpy==1.15.4 \ + numpy==1.22.0 \ pandas==0.23.4 \ scipy==1.1.0 \ traits==4.6.0 \ diff --git a/CHANGELOG.md b/CHANGELOG.md index 7acefed2be..e3ca7c49b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +### Updated dependencies +- numpy 1.22.0 (from 1.16.4) + ## [v1.8.4] - 2022-06-27 ### Added diff --git a/CPAC/info.py b/CPAC/info.py index 8e43b41c4a..3599a94817 100644 --- a/CPAC/info.py +++ b/CPAC/info.py @@ -183,7 +183,7 @@ def get_cpac_gitversion(): "nilearn==0.4.1", "nipype==1.5.1", "nose==1.3.7", - "numpy==1.16.4", + "numpy==1.22.0", "pandas==0.23.4", "patsy==0.5.0", "prov==1.5.2", diff --git a/requirements.txt b/requirements.txt index c37cfe918f..c2463755e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ nibabel==2.3.3 nilearn==0.4.1 nipype==1.5.1 nose==1.3.7 -numpy==1.21.0 +numpy==1.22.0 pandas==0.23.4 patsy==0.5.0 prov==1.5.2 From 141fd745223576fae9a4c483d32ee4a1c96212e8 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Fri, 23 Sep 2022 12:50:55 -0400 Subject: [PATCH 2/2] :package: Install conda packages from conda-forge channel --- .github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile | 2 +- .github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile b/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile index 7bb7b66e37..fb28c7175b 100644 --- a/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile +++ b/.github/Dockerfiles/Ubuntu.bionic-non-free.Dockerfile @@ -124,7 +124,7 @@ ENV PATH=/usr/bin/nvm/versions/node/v12.12.0/bin:/usr/local/miniconda/bin:$PATH COPY requirements.txt /opt/requirements.txt RUN conda update conda -y && \ conda install nomkl && \ - conda install -y \ + conda install -c conda-forge -y \ blas \ cython \ matplotlib==3.1.3 \ diff --git a/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile b/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile index 54afa03f72..5c1f8a370a 100644 --- a/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile +++ b/.github/Dockerfiles/Ubuntu.xenial-20200114.Dockerfile @@ -134,7 +134,7 @@ ENV PATH="/usr/local/miniconda/bin:$PATH" \ # install conda dependencies RUN conda update conda -y && \ conda install nomkl && \ - conda install -y \ + conda install -c conda-forge -y \ blas \ cython \ matplotlib==2.2.2 \