Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Unpin numpy as a host dep #89

Closed
wants to merge 6 commits into from
Closed

Unpin numpy as a host dep #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ddf813
Undo numpy pinning bandaid fix
MilesCranmer Jun 6, 2023
ebe4fee
Bump build number
MilesCranmer Jun 6, 2023
4f43c48
New pysr install command
MilesCranmer Jun 7, 2023
63b1261
Run full PySR test in conda build
MilesCranmer Jun 7, 2023
9699768
Pin numpy version for band-aid fix
MilesCranmer Jun 7, 2023
d9c2ca8
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

16 changes: 8 additions & 8 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions ...port/linux_64_python3.10.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.10.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...pport/linux_64_python3.8.____cpython.yaml → ...ux_64_numpy1.21python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.8.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...pport/linux_64_python3.9.____cpython.yaml → ...ux_64_numpy1.21python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.9.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...port/linux_64_python3.11.____cpython.yaml → ...x_64_numpy1.23python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.11.* *_cpython
target_platform:
- linux-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...upport/osx_64_python3.10.____cpython.yaml → ...x_64_numpy1.21python3.10.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.10.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...support/osx_64_python3.8.____cpython.yaml → ...sx_64_numpy1.21python3.8.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.8.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...support/osx_64_python3.9.____cpython.yaml → ...sx_64_numpy1.21python3.9.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.9.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
5 changes: 5 additions & 0 deletions ...upport/osx_64_python3.11.____cpython.yaml → ...x_64_numpy1.23python3.11.____cpython.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -14,3 +16,6 @@ python:
- 3.11.* *_cpython
target_platform:
- osx-64
zip_keys:
- - python
- numpy
32 changes: 16 additions & 16 deletions README.md
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
9 changes: 5 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ source:
sha256: {{ sha256 }}

build:
number: 1
number: 2
skip: true # [win]
requirements:
host:
- python
- 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
Comment on lines +22 to 24
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed now

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The other question I have here is: why are the other packages (pandas, sympy, scikit-learn) included in host?

- pandas
- sympy
Expand Down Expand Up @@ -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
Expand Down