Skip to content

Commit

Permalink
Merge pull request MacPython#141 from h-vetinari/no_manylinux1
Browse files Browse the repository at this point in the history
remove last vestiges of manylinux1
  • Loading branch information
tylerjereddy committed Nov 18, 2021
2 parents 05bdc40 + 0e5d762 commit d94b566
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ The wheel-building repository:
* does a fresh build of any required C / C++ libraries;
* builds a scipy wheel, linking against these fresh builds;
* processes the wheel using delocate_ (OSX) or auditwheel_ ``repair``
(Manylinux1_). ``delocate`` and ``auditwheel`` copy the required dynamic
(manylinux_). ``delocate`` and ``auditwheel`` copy the required dynamic
libraries into the wheel and relinks the extension modules against the
copied libraries;
* uploads the built wheels to a Anaconda Cloud container - see "Using the
Expand All @@ -63,7 +63,7 @@ The wheel-building repository:

The resulting wheels are therefore self-contained and do not need any external
dynamic libraries apart from those provided as standard by OSX / Linux as
defined by the manylinux1 standard.
defined by the manylinux standards.

Both Appveyor and Travis CI are using secret/encrypted keys to provide
Anaconda Cloud upload credentials for merged PRs and weekly builds. The keys
Expand Down Expand Up @@ -126,7 +126,7 @@ and then upload them manually to pypi, or by using twine_.

Of course, you will need permissions to upload to PyPI, for this to work.

.. _manylinux1: https://www.python.org/dev/peps/pep-0513
.. _manylinux: https://www.python.org/dev/peps/pep-0600
.. _twine: https://pypi.python.org/pypi/twine
.. _delocate: https://pypi.python.org/pypi/delocate
.. _auditwheel: https://pypi.python.org/pypi/auditwheel
3 changes: 1 addition & 2 deletions azure-posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@ parameters:

jobs:
- job: ${{ parameters.name }}
timeoutInMinutes: 90
timeoutInMinutes: 150
pool:
vmImage: ${{ parameters.vmImage }}
variables:
REPO_DIR: "scipy"
PLAT: "x86_64"
NIGHTLY_BUILD_COMMIT: "master"
DAILY_COMMIT: "master"
MB_ML_VER: "1"
strategy:
matrix:
${{ insert }}: ${{ parameters.matrix }}
Expand Down

0 comments on commit d94b566

Please sign in to comment.