From 3ddf8136b0a689201590bf2775f99055751de667 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Tue, 6 Jun 2023 12:33:12 -0400 Subject: [PATCH 1/6] Undo numpy pinning bandaid fix --- recipe/meta.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 69d1132..46a6fef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,10 +18,7 @@ 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 >=1.24.3 + - numpy - pandas - sympy - scikit-learn >=1.0.0 From ebe4fee94a9bac81a2588a415f5b92f16edacf9c Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Tue, 6 Jun 2023 12:35:06 -0400 Subject: [PATCH 2/6] Bump build number --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 46a6fef..606bc29 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: From 4f43c48895370d426a03db78890b49cc73ebe40a Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Wed, 7 Jun 2023 09:22:18 -0400 Subject: [PATCH 3/6] New pysr install command --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' From 63b1261eb4418c3491c634b04037637a3f92bf92 Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Wed, 7 Jun 2023 09:22:34 -0400 Subject: [PATCH 4/6] Run full PySR test in conda build --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 606bc29..1fd711d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,6 +48,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 From 9699768d748ccc3eb8b44ef59b71960a1bb9e6fa Mon Sep 17 00:00:00 2001 From: MilesCranmer Date: Wed, 7 Jun 2023 09:24:14 -0400 Subject: [PATCH 5/6] Pin numpy version for band-aid fix --- recipe/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1fd711d..105289e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,9 @@ requirements: - pyjulia >=0.6.0 - julia - numpy + # Temporary fix for PyCall.jl mistakenly re-installing numpy. + # TODO: Remove this. + - numpy >=1.24.3 - pandas - sympy - scikit-learn >=1.0.0 From d9c2ca81b0707e94101f87893917a4bb35a960ad Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 8 Jun 2023 03:53:24 +0000 Subject: [PATCH 6/6] MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.06.08.00.22.40 --- .azure-pipelines/azure-pipelines-linux.yml | 16 +++++----- .azure-pipelines/azure-pipelines-osx.yml | 16 +++++----- ...x_64_numpy1.21python3.10.____cpython.yaml} | 5 +++ ...ux_64_numpy1.21python3.8.____cpython.yaml} | 5 +++ ...ux_64_numpy1.21python3.9.____cpython.yaml} | 5 +++ ...x_64_numpy1.23python3.11.____cpython.yaml} | 5 +++ ...x_64_numpy1.21python3.10.____cpython.yaml} | 5 +++ ...sx_64_numpy1.21python3.8.____cpython.yaml} | 5 +++ ...sx_64_numpy1.21python3.9.____cpython.yaml} | 5 +++ ...x_64_numpy1.23python3.11.____cpython.yaml} | 5 +++ README.md | 32 +++++++++---------- 11 files changed, 72 insertions(+), 32 deletions(-) rename .ci_support/{linux_64_python3.10.____cpython.yaml => linux_64_numpy1.21python3.10.____cpython.yaml} (84%) rename .ci_support/{linux_64_python3.8.____cpython.yaml => linux_64_numpy1.21python3.8.____cpython.yaml} (84%) rename .ci_support/{linux_64_python3.9.____cpython.yaml => linux_64_numpy1.21python3.9.____cpython.yaml} (84%) rename .ci_support/{linux_64_python3.11.____cpython.yaml => linux_64_numpy1.23python3.11.____cpython.yaml} (84%) rename .ci_support/{osx_64_python3.10.____cpython.yaml => osx_64_numpy1.21python3.10.____cpython.yaml} (84%) rename .ci_support/{osx_64_python3.8.____cpython.yaml => osx_64_numpy1.21python3.8.____cpython.yaml} (84%) rename .ci_support/{osx_64_python3.9.____cpython.yaml => osx_64_numpy1.21python3.9.____cpython.yaml} (84%) rename .ci_support/{osx_64_python3.11.____cpython.yaml => osx_64_numpy1.23python3.11.____cpython.yaml} (84%) 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 - + - + - + - + - + - + - + - +
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