From 957d1ee04d75d7e02d917c5f6c7c75a8e9a03acc Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Sun, 26 Jul 2020 10:33:00 +0200 Subject: [PATCH 1/3] Update dependencies versions in PyPy CI --- .circleci/config.yml | 36 +++++++++++++-------------- build_tools/circle/build_test_pypy.sh | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2c97896259ccb..0e5abc7c0b269 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,16 +105,16 @@ jobs: pypy3: docker: - - image: pypy:3.6-7.2.0 + - image: pypy:3.6-7.3.1 steps: - restore_cache: keys: - - pypy3-ccache-{{ .Branch }} - - pypy3-ccache + - pypy3-ccache-v2-{{ .Branch }} + - pypy3-ccache-v2 - checkout - run: ./build_tools/circle/build_test_pypy.sh - save_cache: - key: pypy3-ccache-{{ .Branch }}-{{ .BuildNum }} + key: pypy3-ccache-v2-{{ .Branch }}-{{ .BuildNum }} paths: - ~/.ccache - ~/.cache/pip @@ -148,20 +148,20 @@ workflows: requires: - lint - pypy3: - filters: - branches: - only: - - 0.20.X + # filters: + # branches: + # only: + # - 0.20.X - deploy: requires: - doc - pypy: - triggers: - - schedule: - cron: "0 0 * * *" - filters: - branches: - only: - - master - jobs: - - pypy3 + #pypy: + # triggers: + # - schedule: + # cron: "0 0 * * *" + # filters: + # branches: + # only: + # - master + # jobs: + # - pypy3 diff --git a/build_tools/circle/build_test_pypy.sh b/build_tools/circle/build_test_pypy.sh index dd7cdf3a93654..de38a1ecf91d0 100755 --- a/build_tools/circle/build_test_pypy.sh +++ b/build_tools/circle/build_test_pypy.sh @@ -21,7 +21,7 @@ which python pip install -U pip # pins versions to install wheel from https://antocuni.github.io/pypy-wheels/manylinux2010 -pip install --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 numpy==1.18.0 scipy==1.3.2 +pip install --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 numpy==1.19.1 scipy==1.5.2 # Install Cython directly pip install https://antocuni.github.io/pypy-wheels/ubuntu/Cython/Cython-0.29.14-py3-none-any.whl From 5bc8081f215ea6c16683d55af7c863e13e2705fa Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Sun, 26 Jul 2020 10:35:25 +0200 Subject: [PATCH 2/3] Fix synax error --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0e5abc7c0b269..9a11cb06d323c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -147,7 +147,7 @@ workflows: - doc-min-dependencies: requires: - lint - - pypy3: + - pypy3 # filters: # branches: # only: From 7b2ed570e469aefd46467570941bf94130994222 Mon Sep 17 00:00:00 2001 From: Roman Yurchak Date: Sun, 26 Jul 2020 11:07:31 +0200 Subject: [PATCH 3/3] Install latest Cython --- build_tools/circle/build_test_pypy.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build_tools/circle/build_test_pypy.sh b/build_tools/circle/build_test_pypy.sh index de38a1ecf91d0..206ed534af8b2 100755 --- a/build_tools/circle/build_test_pypy.sh +++ b/build_tools/circle/build_test_pypy.sh @@ -21,10 +21,8 @@ which python pip install -U pip # pins versions to install wheel from https://antocuni.github.io/pypy-wheels/manylinux2010 -pip install --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 numpy==1.19.1 scipy==1.5.2 +pip install --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 Cython numpy==1.19.1 scipy==1.5.2 -# Install Cython directly -pip install https://antocuni.github.io/pypy-wheels/ubuntu/Cython/Cython-0.29.14-py3-none-any.whl pip install sphinx numpydoc docutils joblib pillow pytest ccache -M 512M