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

32-bit Linux running on 64-bit ARM arch should have platform "linux_armv7l" #234

Merged
merged 15 commits into from Feb 6, 2020

Conversation

@xuhdev
Copy link
Contributor

@xuhdev xuhdev commented Nov 14, 2019

Currently on a 32-bit OS that runs on a 64-bit ARM CPU (ARM-v8,
aarch64), _linux_platforms returns the incorrect string. This commit
fixes this issue by following the solution similar to that of the
x86_64/x86 pair.

Ported from pypa/pip#7352

cc @chrahunt @bdwyer2

@xuhdev
Copy link
Contributor Author

@xuhdev xuhdev commented Nov 20, 2019

I have no idea why the coverage dropped...

…rmv7l".

Currently on a 32-bit OS that runs on a 64-bit ARM CPU (ARM-v8,
aarch64), _linux_platforms returns the incorrect string. This commit
fixes this issue by following the solution similar to that of the
x86_64/x86 pair.
@xuhdev xuhdev force-pushed the xuhdev:arm branch from f44a11c to 30eeb7a Jan 23, 2020
@xuhdev xuhdev requested review from brettcannon, pradyunsg and chrahunt and removed request for brettcannon Jan 23, 2020
@brettcannon brettcannon self-requested a review Jan 24, 2020
Copy link
Member

@brettcannon brettcannon left a comment

Tests are unfortunately failing.

tests/test_tags.py Outdated Show resolved Hide resolved
tests/test_tags.py Outdated Show resolved Hide resolved
xuhdev and others added 2 commits Jan 24, 2020
Co-Authored-By: Brett Cannon <54418+brettcannon@users.noreply.github.com>
Co-Authored-By: Brett Cannon <54418+brettcannon@users.noreply.github.com>
@xuhdev xuhdev requested a review from brettcannon Jan 24, 2020
@xuhdev
Copy link
Contributor Author

@xuhdev xuhdev commented Jan 24, 2020

No idea what the lint error means..

@brettcannon
Copy link
Member

@brettcannon brettcannon commented Jan 28, 2020

@xuhdev you need to run black over your code to fix your formatting.

@xuhdev xuhdev force-pushed the xuhdev:arm branch from 1c5ec41 to 7c11eac Jan 28, 2020
@xuhdev xuhdev force-pushed the xuhdev:arm branch 5 times, most recently from 18c0f14 to 2667118 Jan 28, 2020
xuhdev added a commit to xuhdev/pypa-packaging that referenced this pull request Jan 28, 2020
Directly calling "pytest" sometimes breaks tests on "pypy", such as pypa#234. As explained from pypy website <https://docs.pytest.org/en/latest/usage.html>:

> ["python -m pytest"] is almost equivalent to invoking the command line
> script pytest [...] directly, except that calling via python will also
> add the current directory to sys.path.

Note that the pytest script is not directly invoked in tests for other
Python interpreters.
xuhdev added a commit to xuhdev/pypa-packaging that referenced this pull request Jan 28, 2020
Directly calling "pytest" sometimes breaks tests on "pypy", such as pypa#234. As explained from pypy website <https://docs.pytest.org/en/latest/usage.html>:

> ["python -m pytest"] is almost equivalent to invoking the command line
> script pytest [...] directly, except that calling via python will also
> add the current directory to sys.path.

Note that, unlike tests for pypy, the pytest script is not directly invoked in tests for other
Python interpreters.
xuhdev added a commit to xuhdev/pypa-packaging that referenced this pull request Jan 28, 2020
Directly calling "pytest" sometimes breaks tests on "pypy", such as pypa#234, because the actual current code is untested.

As explained from pypy website <https://docs.pytest.org/en/latest/usage.html>:

> ["python -m pytest"] is almost equivalent to invoking the command line
> script pytest [...] directly, except that calling via python will also
> add the current directory to sys.path.

Note that, unlike tests for pypy, the pytest script is not directly invoked in tests for other
Python interpreters.
@xuhdev xuhdev force-pushed the xuhdev:arm branch from 2667118 to e9a63dd Jan 28, 2020
xuhdev added 2 commits Jan 29, 2020
@xuhdev
Copy link
Contributor Author

@xuhdev xuhdev commented Jan 29, 2020

@brettcannon All tests have passed now. Could you review again? Thanks!

Copy link
Member

@brettcannon brettcannon left a comment

Just a clean-up of the test code to cut down on repetitiveness.

CHANGELOG.rst Outdated Show resolved Hide resolved
CHANGELOG.rst Outdated Show resolved Hide resolved
tests/test_tags.py Outdated Show resolved Hide resolved
xuhdev and others added 3 commits Feb 1, 2020
Co-Authored-By: Brett Cannon <54418+brettcannon@users.noreply.github.com>
Co-Authored-By: Brett Cannon <54418+brettcannon@users.noreply.github.com>
@xuhdev xuhdev requested a review from brettcannon Feb 2, 2020
@xuhdev xuhdev force-pushed the xuhdev:arm branch from 87b0023 to fd1533e Feb 2, 2020
@xuhdev
Copy link
Contributor Author

@xuhdev xuhdev commented Feb 3, 2020

brettcannon added 2 commits Feb 6, 2020
@pradyunsg
Copy link
Member

@pradyunsg pradyunsg commented Feb 6, 2020

OK to have this merged w/o my review.

@pradyunsg pradyunsg removed their request for review Feb 6, 2020
@brettcannon brettcannon merged commit 46bedf3 into pypa:master Feb 6, 2020
23 checks passed
23 checks passed
nox -s lint
Details
test (ubuntu, 2.7)
Details
test (ubuntu, 3.5)
Details
test (ubuntu, 3.6)
Details
test (ubuntu, 3.7)
Details
test (ubuntu, 3.8)
Details
test (ubuntu, pypy2)
Details
test (ubuntu, pypy3)
Details
test (windows, 2.7)
Details
test (windows, 3.5)
Details
test (windows, 3.6)
Details
test (windows, 3.7)
Details
test (windows, 3.8)
Details
test (windows, pypy2)
Details
test (macOS, 2.7)
Details
test (macOS, 3.5)
Details
test (macOS, 3.6)
Details
test (macOS, 3.7)
Details
test (macOS, 3.8)
Details
test (macOS, pypy2)
Details
test (macOS, pypy3)
Details
Build sdist and wheel
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
xuhdev added a commit to IBM/MAX-Object-Detector that referenced this pull request Feb 10, 2020
@xuhdev xuhdev deleted the xuhdev:arm branch Feb 13, 2020
xuhdev added a commit to IBM/MAX-Object-Detector that referenced this pull request Apr 30, 2020
The bug in pypa/packaging#234 is now in the current stable pip.
xuhdev added a commit to IBM/MAX-Object-Detector that referenced this pull request Apr 30, 2020
The bug in pypa/packaging#234 is now in the current stable pip.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.