diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 5e79a1a..c781d48 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,20 +8,20 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_python3.10.____cpython: - CONFIG: linux_64_python3.10.____cpython + linux_64_numpy1.21python3.10.____cpython: + CONFIG: linux_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.11.____cpython: - CONFIG: linux_64_python3.11.____cpython + linux_64_numpy1.21python3.8.____cpython: + CONFIG: linux_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.8.____cpython: - CONFIG: linux_64_python3.8.____cpython + linux_64_numpy1.21python3.9.____cpython: + CONFIG: linux_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_python3.9.____cpython: - CONFIG: linux_64_python3.9.____cpython + linux_64_numpy1.23python3.11.____cpython: + CONFIG: linux_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 6ba8295..46f9cf2 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,17 +8,17 @@ jobs: vmImage: macOS-11 strategy: matrix: - osx_64_python3.10.____cpython: - CONFIG: osx_64_python3.10.____cpython + osx_64_numpy1.21python3.10.____cpython: + CONFIG: osx_64_numpy1.21python3.10.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.11.____cpython: - CONFIG: osx_64_python3.11.____cpython + osx_64_numpy1.21python3.8.____cpython: + CONFIG: osx_64_numpy1.21python3.8.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.8.____cpython: - CONFIG: osx_64_python3.8.____cpython + osx_64_numpy1.21python3.9.____cpython: + CONFIG: osx_64_numpy1.21python3.9.____cpython UPLOAD_PACKAGES: 'True' - osx_64_python3.9.____cpython: - CONFIG: osx_64_python3.9.____cpython + osx_64_numpy1.23python3.11.____cpython: + CONFIG: osx_64_numpy1.23python3.11.____cpython UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.10.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.10.____cpython.yaml index 84cccee..08ee438 100644 --- a/.ci_support/linux_64_python3.10.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.10.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.10.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.8.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.8.____cpython.yaml index 7b5ae5c..4d43403 100644 --- a/.ci_support/linux_64_python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.8.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.8.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.9.____cpython.yaml rename to .ci_support/linux_64_numpy1.21python3.9.____cpython.yaml index 50d8196..bcbcc4c 100644 --- a/.ci_support/linux_64_python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.21python3.9.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.9.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml similarity index 84% rename from .ci_support/linux_64_python3.11.____cpython.yaml rename to .ci_support/linux_64_numpy1.23python3.11.____cpython.yaml index 66befba..f55cb50 100644 --- a/.ci_support/linux_64_python3.11.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.23python3.11.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.11.* *_cpython target_platform: - linux-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_python3.10.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.10.____cpython.yaml index 48d3e80..63bc181 100644 --- a/.ci_support/osx_64_python3.10.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.10.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.10.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_python3.8.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.8.____cpython.yaml index 76bbd40..6ff9fff 100644 --- a/.ci_support/osx_64_python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.8.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.8.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_python3.9.____cpython.yaml rename to .ci_support/osx_64_numpy1.21python3.9.____cpython.yaml index ab5e193..86452ff 100644 --- a/.ci_support/osx_64_python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.21python3.9.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.21' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.9.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - numpy diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml similarity index 84% rename from .ci_support/osx_64_python3.11.____cpython.yaml rename to .ci_support/osx_64_numpy1.23python3.11.____cpython.yaml index 2b912fb..2806e6b 100644 --- a/.ci_support/osx_64_python3.11.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.23python3.11.____cpython.yaml @@ -6,6 +6,8 @@ channel_targets: - conda-forge main macos_machine: - x86_64-apple-darwin13.4.0 +numpy: +- '1.23' pin_run_as_build: python: min_pin: x.x @@ -14,3 +16,6 @@ python: - 3.11.* *_cpython target_platform: - osx-64 +zip_keys: +- - python + - numpy diff --git a/README.md b/README.md index 99dd09b..0fe113a 100644 --- a/README.md +++ b/README.md @@ -34,59 +34,59 @@ Current build status - + - + - + - + - + - + - + - + diff --git a/recipe/build.sh b/recipe/build.sh index 8e0a5e3..9f11332 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -17,7 +17,7 @@ export JULIA_PROJECT="@pysr-${PKG_VERSION}" export JULIA_PKG_PRECOMPILE_AUTO="0" mkdir -p "${FAKEDEPOT}" -${PYTHON} -c 'import pysr; pysr.install();' +${PYTHON} -m pysr install # Override OpenSpecFun_jll artifact with conda-forge binaries julia -e 'ENV["JULIA_PKG_PRECOMPILE_AUTO"] = 0; using SymbolicRegression; open(".artifact_hash.txt", "w") do io; write(io, basename(SymbolicRegression.CoreModule.OperatorsModule.SpecialFunctions.OpenSpecFun_jll.artifact_dir)); end' diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 69d1132..105289e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,7 +10,7 @@ source: sha256: {{ sha256 }} build: - number: 1 + number: 2 skip: true # [win] requirements: host: @@ -18,9 +18,9 @@ requirements: - pip - pyjulia >=0.6.0 - julia - # temporarily rebuilding with newest numpy because PyCall.jl ends up - # reinstalling it and we want to avoid spamming ClobberWarnings - # TODO: remove this as soon as numpy does not get spuriously installed here anymore + - numpy + # Temporary fix for PyCall.jl mistakenly re-installing numpy. + # TODO: Remove this. - numpy >=1.24.3 - pandas - sympy @@ -51,6 +51,7 @@ test: - python -c 'from pysr.sr import init_julia; init_julia()' - python -c 'import pysr; pysr.install(); from pysr.sr import init_julia; init_julia()' - python -c 'import tempfile; tempenv = tempfile.mkdtemp(); import pysr; pysr.install(tempenv); from pysr.sr import init_julia; init_julia(tempenv)' + - python -m pysr.test main about: home: https://github.com/MilesCranmer/PySR
VariantStatus
linux_64_python3.10.____cpythonlinux_64_numpy1.21python3.10.____cpython - variant + variant
linux_64_python3.11.____cpythonlinux_64_numpy1.21python3.8.____cpython - variant + variant
linux_64_python3.8.____cpythonlinux_64_numpy1.21python3.9.____cpython - variant + variant
linux_64_python3.9.____cpythonlinux_64_numpy1.23python3.11.____cpython - variant + variant
osx_64_python3.10.____cpythonosx_64_numpy1.21python3.10.____cpython - variant + variant
osx_64_python3.11.____cpythonosx_64_numpy1.21python3.8.____cpython - variant + variant
osx_64_python3.8.____cpythonosx_64_numpy1.21python3.9.____cpython - variant + variant
osx_64_python3.9.____cpythonosx_64_numpy1.23python3.11.____cpython - variant + variant