diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 69718e1..cfd8627 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.7.____cpython: - CONFIG: linux_64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_numpy1.18python3.8.____cpython: CONFIG: linux_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -20,22 +16,22 @@ jobs: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_aarch64_numpy1.18python3.7.____cpython: - CONFIG: linux_aarch64_numpy1.18python3.7.____cpython + linux_64_numpy1.21python3.10.____cpython: + CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.18python3.8.____cpython: CONFIG: linux_aarch64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_aarch64_numpy1.19python3.9.____cpython: CONFIG: linux_aarch64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-aarch64 - linux_ppc64le_numpy1.18python3.7.____cpython: - CONFIG: linux_ppc64le_numpy1.18python3.7.____cpython + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_numpy1.21python3.10.____cpython: + CONFIG: linux_aarch64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_ppc64le_numpy1.18python3.8.____cpython: CONFIG: linux_ppc64le_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' @@ -44,6 +40,10 @@ jobs: CONFIG: linux_ppc64le_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + linux_ppc64le_numpy1.21python3.10.____cpython: + CONFIG: linux_ppc64le_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a592248..f997efa 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,20 +8,23 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.7.____cpython: - CONFIG: osx_64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.8.____cpython: CONFIG: osx_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' osx_64_numpy1.19python3.9.____cpython: CONFIG: osx_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.8.____cpython: - CONFIG: osx_arm64_python3.8.____cpython + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.19python3.8.____cpython: + CONFIG: osx_arm64_numpy1.19python3.8.____cpython + UPLOAD_PACKAGES: 'True' + osx_arm64_numpy1.19python3.9.____cpython: + CONFIG: osx_arm64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_arm64_python3.9.____cpython: - CONFIG: osx_arm64_python3.9.____cpython + osx_arm64_numpy1.21python3.10.____cpython: + CONFIG: osx_arm64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 82c7525..6371940 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,15 +8,15 @@ jobs: vmImage: windows-2019 strategy: matrix: - win_64_numpy1.18python3.7.____cpython: - CONFIG: win_64_numpy1.18python3.7.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.18python3.8.____cpython: CONFIG: win_64_numpy1.18python3.8.____cpython UPLOAD_PACKAGES: 'True' win_64_numpy1.19python3.9.____cpython: CONFIG: win_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' + win_64_numpy1.21python3.10.____cpython: + CONFIG: win_64_numpy1.21python3.10.____cpython + UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml similarity index 93% rename from .ci_support/linux_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 6fb63f1..5b6e004 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -15,13 +15,13 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.21' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml index 0cb9b84..4991d8f 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.18python3.8.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.18' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml index 8f93e9d..c50fe42 100644 --- a/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.19python3.9.____cpython.yaml @@ -17,7 +17,7 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: - '1.19' pin_run_as_build: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml similarity index 85% rename from .ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml index 43b795f..90d2148 100644 --- a/.ci_support/linux_aarch64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_aarch64_numpy1.21python3.10.____cpython.yaml @@ -17,15 +17,15 @@ cxx_compiler: cxx_compiler_version: - '9' docker_image: -- quay.io/condaforge/linux-anvil-aarch64 +- quay.io/condaforge/linux-anvil-cos7-x86_64 numpy: -- '1.18' +- '1.21' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml similarity index 93% rename from .ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml rename to .ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml index a6c4b7f..bbe5cae 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.21python3.10.____cpython.yaml @@ -15,13 +15,13 @@ cxx_compiler_version: docker_image: - quay.io/condaforge/linux-anvil-ppc64le numpy: -- '1.18' +- '1.21' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/migrations/pypy37-windows.yaml b/.ci_support/migrations/pypy37-windows.yaml new file mode 100644 index 0000000..386dbe6 --- /dev/null +++ b/.ci_support/migrations/pypy37-windows.yaml @@ -0,0 +1,33 @@ +migrator_ts: 1623865877 +__migrator: + paused: False + migration_number: 1 + operation: key_add + primary_key: python + ordering: + python: + - 3.6.* *_cpython + - 3.7.* *_cpython + - 3.8.* *_cpython + - 3.9.* *_cpython + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy # new entry + longterm: True + pr_limit: 6 + bump_number: 0 + wait_for_migrators: + - pypy37 + commit_message: "Rebuild for PyPy3.7 for windows" + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: # [win] + - 3.7.* *_73_pypy # [win] +# additional entries to add for zip_keys +numpy: # [win] + - 1.19 # [win] +python_impl: # [win] + - pypy # [win] diff --git a/.ci_support/migrations/pypy37.yaml b/.ci_support/migrations/pypy37.yaml new file mode 100644 index 0000000..bfb714d --- /dev/null +++ b/.ci_support/migrations/pypy37.yaml @@ -0,0 +1,29 @@ +migrator_ts: 1608144114 +__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.6.* *_73_pypy + - 3.7.* *_73_pypy # new entry + paused: false + longterm: True + pr_limit: 50 + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + +python: # [not (win or arm64)] + - 3.7.* *_73_pypy # [not (win or arm64)] +# additional entries to add for zip_keys +numpy: # [not (win or arm64)] + - 1.19 # [not (win or arm64)] +python_impl: # [not (win or arm64)] + - pypy # [not (win or arm64)] diff --git a/.ci_support/migrations/python310.yaml b/.ci_support/migrations/python310.yaml new file mode 100644 index 0000000..f61ae7a --- /dev/null +++ b/.ci_support/migrations/python310.yaml @@ -0,0 +1,33 @@ +migrator_ts: 1634137107 +__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 # new entry + - 3.6.* *_73_pypy + - 3.7.* *_73_pypy + paused: false + longterm: True + pr_limit: 40 + exclude: + # this shouldn't attempt to modify the python feedstocks + - python + - pypy3.6 + - pypy-meta + - cross-python + - python_abi + exclude_pinned_pkgs: false + +python: + - 3.10.* *_cpython +# additional entries to add for zip_keys +numpy: + - 1.21 +python_impl: + - cpython diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml similarity index 93% rename from .ci_support/osx_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 10235dc..13f31cd 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -15,13 +15,13 @@ cxx_compiler_version: macos_machine: - x86_64-apple-darwin13.4.0 numpy: -- '1.18' +- '1.21' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython target_platform: - osx-64 zip_keys: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.8.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.19python3.8.____cpython.yaml diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml similarity index 100% rename from .ci_support/osx_arm64_python3.9.____cpython.yaml rename to .ci_support/osx_arm64_numpy1.19python3.9.____cpython.yaml diff --git a/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml new file mode 100644 index 0000000..1875d18 --- /dev/null +++ b/.ci_support/osx_arm64_numpy1.21python3.10.____cpython.yaml @@ -0,0 +1,31 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +c_compiler: +- clang +c_compiler_version: +- '11' +channel_sources: +- conda-forge +channel_targets: +- conda-forge pandas_rc +cxx_compiler: +- clangxx +cxx_compiler_version: +- '11' +macos_machine: +- arm64-apple-darwin20.0.0 +numpy: +- '1.21' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- 3.10.* *_cpython +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - python + - numpy diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml similarity index 89% rename from .ci_support/win_64_numpy1.18python3.7.____cpython.yaml rename to .ci_support/win_64_numpy1.21python3.10.____cpython.yaml index f689a55..0ea1fce 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.21python3.10.____cpython.yaml @@ -7,13 +7,13 @@ channel_targets: cxx_compiler: - vs2017 numpy: -- '1.18' +- '1.21' pin_run_as_build: python: min_pin: x.x max_pin: x.x python: -- 3.7.* *_cpython +- 3.10.* *_cpython target_platform: - win-64 zip_keys: diff --git a/README.md b/README.md index 0dd2dcd..c14a456 100644 --- a/README.md +++ b/README.md @@ -27,13 +27,6 @@ Current build status - - - - + @@ -69,10 +62,10 @@ Current build status - + @@ -90,10 +83,10 @@ Current build status - + @@ -111,24 +104,31 @@ Current build status - + - + - + + + + @@ -145,6 +145,13 @@ Current build status variant + + +
VariantStatus
linux_64_numpy1.18python3.7.____cpython - - variant - -
linux_64_numpy1.18python3.8.____cpython @@ -48,10 +41,10 @@ Current build status
linux_aarch64_numpy1.18python3.7.____cpythonlinux_64_numpy1.21python3.10.____cpython - variant + variant
linux_ppc64le_numpy1.18python3.7.____cpythonlinux_aarch64_numpy1.21python3.10.____cpython - variant + variant
osx_64_numpy1.18python3.7.____cpythonlinux_ppc64le_numpy1.21python3.10.____cpython - variant + variant
osx_arm64_python3.8.____cpythonosx_64_numpy1.21python3.10.____cpython - variant + variant
osx_arm64_python3.9.____cpythonosx_arm64_numpy1.19python3.8.____cpython - variant + variant
win_64_numpy1.18python3.7.____cpythonosx_arm64_numpy1.19python3.9.____cpython - variant + variant + +
osx_arm64_numpy1.21python3.10.____cpython + + variant
win_64_numpy1.21python3.10.____cpython + + variant + +
diff --git a/conda-forge.yml b/conda-forge.yml index e758699..975007b 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,9 @@ -build_platform: {osx_arm64: osx_64} +build_platform: + linux_aarch64: linux_64 + osx_arm64: osx_64 conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: azure, win: azure} +provider: + linux_aarch64: default + linux_ppc64le: azure + win: azure test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f437c6d..058e460 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,12 +9,12 @@ source: sha256: c0d453fda0a87d51f5fe65c16a89b64f13a736f4f17c0202cfcff67e6b341a57 build: - number: 0 + number: 1 script: - export PYTHONUNBUFFERED=1 # [ppc64le] - {{ PYTHON }} -m pip install -vv --no-deps --ignore-installed . # [not unix] - {{ PYTHON }} -m pip install -vv --no-deps --ignore-installed . --global-option="build_ext" --global-option="-j${CPU_COUNT}" --no-use-pep517 # [unix] - skip: true # [py<37] + skip: true # [py<38] requirements: build: @@ -34,7 +34,6 @@ requirements: - {{ pin_compatible('numpy') }} - python-dateutil >=2.7.3 - pytz >=2017.2 - - setuptools test: imports: