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.

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

update max SciPy to 1.7.0 #67

Merged
merged 4 commits into from
Oct 4, 2021
Merged

update max SciPy to 1.7.0 #67

merged 4 commits into from
Oct 4, 2021

Conversation

esc
Copy link
Member

@esc esc commented Jul 16, 2021

As title

@esc
Copy link
Member Author

esc commented Jul 16, 2021

My guess is that the CI config doesn't activate, because the changes need to be on master?

Copy link
Contributor

@stuartarchibald stuartarchibald left a comment

Choose a reason for hiding this comment

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

Thanks for the patch, will the conda recipes also need updating?

- scipy<=1.6.2
- setuptools
run:
- python
- numba
- scipy<=1.6.2
test:
requires:
- scipy<=1.6.2

@stuartarchibald stuartarchibald added the 4 - Waiting on author Waiting for author to respond to review label Jul 16, 2021
@stuartarchibald stuartarchibald added this to the 0.4.0 milestone Jul 16, 2021
@esc
Copy link
Member Author

esc commented Jul 19, 2021

Thanks for the patch, will the conda recipes also need updating?

- scipy<=1.6.2
- setuptools
run:
- python
- numba
- scipy<=1.6.2
test:
requires:
- scipy<=1.6.2

fixed in ed96485

@esc
Copy link
Member Author

esc commented Jul 19, 2021

Fixes #66

@de846
Copy link

de846 commented Oct 1, 2021

Thanks for this PR 👍 Is it possible to get this merged anytime soon?

@@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.6.2"]
scipy-version: [">=0.16,<1.4", ">=1.4,<=1.7.0"]
Copy link
Contributor

Choose a reason for hiding this comment

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

Think line 66 also needs the same change?

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed in e671fbb

@esc
Copy link
Member Author

esc commented Oct 1, 2021

@stuartarchibald I believe I have addressed everything in this pull-request. Let's get this merged and make a new PR if broken?

@esc
Copy link
Member Author

esc commented Oct 1, 2021

@de846 thank you for the ping on this issue.

Copy link
Contributor

@stuartarchibald stuartarchibald left a comment

Choose a reason for hiding this comment

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

Thanks for the patch and fixes.

@esc esc added 5 - Ready to merge Review and testing done, is ready to merge and removed 4 - Waiting on author Waiting for author to respond to review labels Oct 4, 2021
@esc
Copy link
Member Author

esc commented Oct 4, 2021

@stuartarchibald thank you for approval, will merge now and see what happens.

@esc esc merged commit af927b7 into numba:master Oct 4, 2021
@esc
Copy link
Member Author

esc commented Oct 4, 2021

So, after merging this, it seems like SciPy 1.7.0 isn't being picked up at all. Neither during build nor during test:

During build I see:

Run conda install -c numba conda-build python=3.8 numba>=0.45 'scipy>=1.4,<=1.7.0' flake8 pytest pip
Obtaining file:///home/runner/work/numba-scipy/numba-scipy
Installing collected packages: numba-scipy
  Running setup.py develop for numba-scipy
Successfully installed numba-scipy

But this doesn't actually matter, because we do build with conda-build eventually.

There we get:

Run conda build -c defaults -c numba --python 3.8 buildscripts/conda_recipes/numba-scipy/
...
    scipy:            1.6.2-py38had2a1c9_1     

Then during one of the test runs, I get:

Run conda install -c numba python=3.8 numba>=0.45 'scipy>=1.4,<=1.7.0' flake8 pytest
...
  scipy                     1.6.2            py38had2a1c9_1  

Probably it would make sense if someone else could confirm what I am seeing, to make sure I am not looking at the wrong output.

@stuartarchibald
Copy link
Contributor

@esc is there a scipy 1.7.0 build in defaults?

@esc
Copy link
Member Author

esc commented Oct 4, 2021

@esc is there a scipy 1.7.0 build in defaults?

Anaconda.org does seem to imply this exists:

https://anaconda.org/anaconda/scipy

@esc
Copy link
Member Author

esc commented Oct 4, 2021

I see, it's an off by one error, we should have used 1.7.1 not 1.7.0 apparently. I just tried making that change locally on my Mac and that got me the correct version.

@esc
Copy link
Member Author

esc commented Oct 4, 2021

I see, it's an off by one error, we should have used 1.7.1 not 1.7.0 apparently. I just tried making that change locally on my Mac and that got me the correct version.

Correct version yes, but I was unable to complete the package build:

Traceback (most recent call last):
  File "/Users/vhaenel/miniconda3/bin/conda-build", line 11, in <module>
    sys.exit(main())
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/cli/main_build.py", line 474, in main
    execute(sys.argv[1:])
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/cli/main_build.py", line 465, in execute
    verify=args.verify, variants=args.variants)
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/api.py", line 195, in build
    variants=variants
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/build.py", line 3013, in build_tree
    notest=notest,
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/build.py", line 2291, in build
    newly_built_packages = bundlers[pkg_type](output_d, m, env, stats)
  File "/Users/vhaenel/miniconda3/lib/python3.7/site-packages/conda_build/build.py", line 1565, in bundle_conda
    "run that executable.".format(dep, env_var_name))
conda_build.exceptions.CondaBuildException: Empty package; python present in build and host deps.  You probably picked up the build environment's python  executable.  You need to alter your recipe to  use the PYTHON env var in your recipe to run that executable.

@esc
Copy link
Member Author

esc commented Oct 4, 2021

A fix is here: #71

sklam pushed a commit to sklam/numba-scipy that referenced this pull request Jun 29, 2022
@esc esc deleted the update_scipy branch April 9, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
5 - Ready to merge Review and testing done, is ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants