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

Switch to scientifc python nightly package location for cron tests against upstream nightly wheels #4203

Merged
merged 5 commits into from
Jul 28, 2023
Merged

Switch to scientifc python nightly package location for cron tests against upstream nightly wheels #4203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
817682d
switch to scientifc python nightly package
IAlibay Jul 16, 2023
2569906
temporarily run cron job on PR
IAlibay Jul 16, 2023
98026d5
Looks like we might be able to switch to NPY_DOUBLE?
IAlibay Jul 17, 2023
cd9cb46
more testing for NPY_DOUBLE
IAlibay Jul 17, 2023
ef8b146
Update gh-ci-cron.yaml
IAlibay Jul 28, 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
2 changes: 1 addition & 1 deletion .github/workflows/gh-ci-cron.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
# overwrite installs by picking up nightly wheels
- name: nightly_wheels
run: |
pip install --pre -U -i https://pypi.anaconda.org/scipy-wheels-nightly/simple scipy numpy h5py matplotlib
pip install --pre -U -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple scipy numpy networkx matplotlib

- name: list_deps
run: |
Expand Down
4 changes: 2 additions & 2 deletions package/MDAnalysis/lib/src/transformations/transformations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ PyConverter_AnyDoubleArray(
PyObject **address)
{
PyArrayObject *obj = (PyArrayObject *)object;
if (PyArray_Check(object) && obj->descr->type_num == PyArray_DOUBLE) {
if (PyArray_Check(object) && obj->descr->type_num == NPY_DOUBLE) {
Copy link
Member Author

Choose a reason for hiding this comment

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

@hmacdope or @richardjgowers - am I correct in thinking that this is an acceptable replacement for the now removed PyArray_DOUBLE?

Copy link
Member

Choose a reason for hiding this comment

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

Looks correct to me, there is even a tools/replace_old_macros.sed in the NumPy repo that does what you did.

*address = object;
Py_INCREF(object);
return NPY_SUCCEED;
Expand Down Expand Up @@ -965,7 +965,7 @@ PyOutputConverter_AnyDoubleArrayOrNone(
*address = NULL;
return NPY_SUCCEED;
}
if (PyArray_Check(object) && (obj->descr->type_num == PyArray_DOUBLE)) {
if (PyArray_Check(object) && (obj->descr->type_num == NPY_DOUBLE)) {
Py_INCREF(object);
*address = (PyArrayObject *)object;
return NPY_SUCCEED;
Expand Down