Skip to content
This repository was archived by the owner on Feb 15, 2023. It is now read-only.

Commit d94b566

Browse files
authored
Merge pull request #141 from h-vetinari/no_manylinux1
remove last vestiges of manylinux1
2 parents 05bdc40 + 0e5d762 commit d94b566

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The wheel-building repository:
5454
* does a fresh build of any required C / C++ libraries;
5555
* builds a scipy wheel, linking against these fresh builds;
5656
* processes the wheel using delocate_ (OSX) or auditwheel_ ``repair``
57-
(Manylinux1_). ``delocate`` and ``auditwheel`` copy the required dynamic
57+
(manylinux_). ``delocate`` and ``auditwheel`` copy the required dynamic
5858
libraries into the wheel and relinks the extension modules against the
5959
copied libraries;
6060
* uploads the built wheels to a Anaconda Cloud container - see "Using the
@@ -63,7 +63,7 @@ The wheel-building repository:
6363

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

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

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

129-
.. _manylinux1: https://www.python.org/dev/peps/pep-0513
129+
.. _manylinux: https://www.python.org/dev/peps/pep-0600
130130
.. _twine: https://pypi.python.org/pypi/twine
131131
.. _delocate: https://pypi.python.org/pypi/delocate
132132
.. _auditwheel: https://pypi.python.org/pypi/auditwheel

azure-posix.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ parameters:
55

66
jobs:
77
- job: ${{ parameters.name }}
8-
timeoutInMinutes: 90
8+
timeoutInMinutes: 150
99
pool:
1010
vmImage: ${{ parameters.vmImage }}
1111
variables:
1212
REPO_DIR: "scipy"
1313
PLAT: "x86_64"
1414
NIGHTLY_BUILD_COMMIT: "master"
1515
DAILY_COMMIT: "master"
16-
MB_ML_VER: "1"
1716
strategy:
1817
matrix:
1918
${{ insert }}: ${{ parameters.matrix }}

0 commit comments

Comments
 (0)