Skip to content

Commit

Permalink
ci: simpler PyPy usage, drop unmaintained scipy + pypy index
Browse files Browse the repository at this point in the history
  • Loading branch information
henryiii committed Oct 25, 2021
1 parent abe454f commit 6feeb22
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 20 deletions.
24 changes: 15 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ jobs:
key: ${{ runner.os }}-pip-${{ matrix.python }}-x64-${{ hashFiles('tests/requirements.txt') }}

- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run: |
python -m pip install -r tests/requirements.txt --only-binary=:all:
- name: Setup annotations on Linux
if: runner.os == 'Linux'
Expand All @@ -108,7 +109,7 @@ jobs:

- name: C++11 tests
# TODO: Figure out how to load the DLL on Python 3.8+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev'))"
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
run: cmake --build . --target cpptest -j 2

- name: Interface test C++11
Expand Down Expand Up @@ -136,7 +137,7 @@ jobs:

- name: C++ tests
# TODO: Figure out how to load the DLL on Python 3.8+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev'))"
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10' || matrix.python == '3.11-dev' || matrix.python == 'pypy-3.8'))"
run: cmake --build build2 --target cpptest

# Third build - C++17 mode with unstable ABI
Expand Down Expand Up @@ -236,7 +237,8 @@ jobs:
sudo apt-get install libc6-dbg # Needed by Valgrind
- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run: |
python -m pip install -r tests/requirements.txt --only-binary=:all:
- name: Configure
run: >
Expand Down Expand Up @@ -513,7 +515,7 @@ jobs:
- name: Install dependencies
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
python3 -m pip install -r tests/requirements.txt --prefer-binary
python3 -m pip install -r tests/requirements.txt --only-binary=:all:
- name: Configure C++11
run: |
Expand Down Expand Up @@ -604,7 +606,8 @@ jobs:
run: python3 -m pip install --upgrade pip

- name: Install dependencies
run: python3 -m pip install cmake -r tests/requirements.txt --prefer-binary
run: |
python3 -m pip install cmake -r tests/requirements.txt --only-binary=:all:
- name: VAR_BUILD_TYPE 7
if: matrix.centos == 7
Expand Down Expand Up @@ -760,7 +763,8 @@ jobs:
arch: x86

- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run:
python -m pip install -r tests/requirements.txt --only-binary=:all:

# First build - C++11 mode and inplace
- name: Configure ${{ matrix.args }}
Expand Down Expand Up @@ -806,7 +810,8 @@ jobs:
toolset: 14.0

- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run: |
python -m pip install -r tests/requirements.txt --only-binary=:all:
# First build - C++11 mode and inplace
- name: Configure
Expand Down Expand Up @@ -855,7 +860,8 @@ jobs:
uses: jwlawson/[email protected]

- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run: |
python -m pip install -r tests/requirements.txt --only-binary=:all:
# First build - C++11 mode and inplace
- name: Configure
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ jobs:
python-version: 2.7

- name: Prepare env
run: python -m pip install -r tests/requirements.txt --prefer-binary
run: |
python -m pip install -r tests/requirements.txt --only-binary=:all:
- name: Python Packaging tests
run: pytest tests/extra_python_package/
Expand All @@ -50,7 +51,8 @@ jobs:
python-version: 3.8

- name: Prepare env
run: python -m pip install -r tests/requirements.txt build twine --prefer-binary
run: |
python -m pip install -r tests/requirements.txt build twine --only-binary=:all:
- name: Python Packaging tests
run: pytest tests/extra_python_package/
Expand Down
16 changes: 7 additions & 9 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
--extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010/
numpy==1.16.6; python_version<"3.6" and sys_platform!="win32"
numpy==1.19.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version=="3.6"
numpy==1.20.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version=="3.7"
numpy==1.19.3; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version=="3.6"
numpy==1.21.2; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version>="3.7" and python_version<"3.10"
numpy==1.21.2; platform_python_implementation!="PyPy" and sys_platform=="linux" and python_version=="3.10"
numpy==1.16.6; python_version<"3.6" and sys_platform!="win32" and platform_python_implementation!="PyPy"
numpy==1.19.0; platform_python_implementation=="PyPy" and sys_platform=="linux" and python_version=="3.6"
numpy==1.20.0; platform_python_implementation=="PyPy" and sys_platform=="linux" and python_version=="3.7"
numpy==1.19.3; platform_python_implementation!="PyPy" and python_version=="3.6"
numpy==1.21.3; platform_python_implementation!="PyPy" and python_version>="3.7"
py @ git+https://github.com/pytest-dev/py; python_version>="3.11"
pytest==4.6.9; python_version<"3.5"
pytest==6.1.2; python_version=="3.5"
pytest==6.2.4; python_version>="3.6"
pytest-timeout
scipy==1.2.3; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version<"3.6"
scipy==1.5.4; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version>="3.6" and python_version<"3.10"
scipy==1.2.3; platform_python_implementation!="PyPy" and python_version<"3.6"
scipy==1.5.4; platform_python_implementation!="PyPy" and python_version>="3.6" and python_version<"3.10"

0 comments on commit 6feeb22

Please sign in to comment.