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

TST: use latest pypy37 not pypy36 #17847

Merged
merged 3 commits into from
Nov 28, 2020
Merged

TST: use latest pypy37 not pypy36 #17847

merged 3 commits into from
Nov 28, 2020

Conversation

mattip
Copy link
Member

@mattip mattip commented Nov 25, 2020

As pointed out in gh-17843, the pypy CI run was using pypy3.6 not pypy3.7. Whoops. xref gh-17745.

@seberg
Copy link
Member

seberg commented Nov 25, 2020

Hmm, seems the PyPy test already failed.

@charris
Copy link
Member

charris commented Nov 27, 2020

Curious that that warning doesn't show up in other tests. The warning seems to be due to these lines in compiled_base.c:

    #if (PY_VERSION_HEX >= 0x030700A2)
    const char *docstr;
    #else
    char *docstr;
    #endif

@charris
Copy link
Member

charris commented Nov 28, 2020

The fix should be made in PyPy but I suppose we can work around it here until then. I think the wheels builds ignore warnings which is why they didn't fail, so 1.20 should be OK.

charris
charris reviewed Nov 28, 2020
View reviewed changes
numpy/core/src/multiarray/compiled_base.c Outdated
@@ -1420,7 +1420,7 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
{
PyObject *obj;
PyObject *str;
#if (PY_VERSION_HEX >= 0x030700A2)
#if PY_VERSION_HEX >= 0x030700A2 && (! defined(PYPY_VERSION_NUM) || PYPY_VERSION_NUM > 0x07030300)
Copy link
Member

Choose a reason for hiding this comment

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

No space after !.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixing

@mattip
Copy link
Member Author

mattip commented Nov 28, 2020

The fix should be made in PyPy

It will be part of the next release, which will have PYPY_VERSION_NUM > 0x07030300. The current release has 0x07030300

@charris
Copy link
Member

charris commented Nov 28, 2020

It will be part of the next release

At that point we should be able to get rid of the #if entirely since we have dropped Python 3.6. I think that would be the first change to break 3.6 :)

@charris charris merged commit f1f8455 into numpy:master Nov 28, 2020
@charris
Copy link
Member

charris commented Nov 28, 2020

Thanks Matti.

@charris charris mentioned this pull request Dec 3, 2020
Merged
@mattip mattip deleted the pypy37a branch April 8, 2021 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@charris charris charris left review comments

Assignees
No one assigned
Labels
05 - Testing component: CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@mattip @seberg @charris