Skip to content

Commit

Permalink
Merge pull request #14 from regro-cf-autotick-bot/rebuild-pypy38-0-1_…
Browse files Browse the repository at this point in the history
…h2343b8

Rebuild for PyPy3.8 and PyPy3.9
  • Loading branch information
jochym authored Oct 28, 2022
2 parents e1c06e0 + 32c89c1 commit 84d2aa4
Show file tree
Hide file tree
Showing 14 changed files with 161 additions and 42 deletions.
16 changes: 10 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 9 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ docker_image:
liblapack:
- 3.9 *netlib
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.8.* *_73_pypy
target_platform:
- linux-64
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docker_image:
liblapack:
- 3.9 *netlib
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
Expand Down
31 changes: 31 additions & 0 deletions .ci_support/linux_64_numpy1.20python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
boost:
- 1.78.0
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
liblapack:
- 3.9 *netlib
numpy:
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
target_platform:
- linux-64
zip_keys:
- - python
- numpy
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ docker_image:
liblapack:
- 3.9 *netlib
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
Expand Down
9 changes: 0 additions & 9 deletions .ci_support/migrations/boost1780.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions .ci_support/migrations/pypy38.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
migrator_ts: 1647123563
__migrator:
migration_number: 1
operation: key_add
primary_key: python
ordering:
python:
- 3.6.* *_cpython
- 3.7.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
- 3.10.* *_cpython
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: False
longterm: True
use_local: False
check_solvable: True
exclude_pinned_pkgs: False
pr_limit: 10
bump_number: 1
commit_message: "Rebuild for PyPy3.8 and PyPy3.9"
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
ignored_deps_per_node:
matplotlib:
- pyqt

python:
- 3.8.* *_73_pypy # [not (osx and arm64)]
- 3.9.* *_73_pypy # [not (osx and arm64)]
numpy:
# part of a zip_keys: python, python_impl, numpy
- 1.20 # [not (osx and arm64)]
- 1.20 # [not (osx and arm64)]
python_impl:
- pypy # [not (osx and arm64)]
- pypy # [not (osx and arm64)]
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ llvm_openmp:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
python:
- 3.7.* *_cpython
- 3.8.* *_73_pypy
target_platform:
- osx-64
zip_keys:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ llvm_openmp:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
Expand Down
33 changes: 33 additions & 0 deletions .ci_support/osx_64_numpy1.20python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
boost:
- 1.78.0
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '14'
liblapack:
- 3.9 *netlib
llvm_openmp:
- '14'
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
target_platform:
- osx-64
zip_keys:
- - python
- numpy
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ llvm_openmp:
macos_machine:
- x86_64-apple-darwin13.4.0
numpy:
- '1.19'
- '1.20'
pin_run_as_build:
boost:
max_pin: x.x.x
Expand Down
38 changes: 26 additions & 12 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source:
- use_external_spglib.patch

build:
number: 4
number: 5
skip: true # [win or py<35]

requirements:
Expand Down

0 comments on commit 84d2aa4

Please sign in to comment.