Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Commit fcd03bd

Browse files
committed
fixup readme, add manylinux1 wheels
1 parent b02bfb9 commit fcd03bd

File tree

2 files changed

+42
-28
lines changed

2 files changed

+42
-28
lines changed

README.rst

+17-28
Original file line numberDiff line numberDiff line change
@@ -34,52 +34,41 @@ The resulting wheels are therefore self-contained and do not need any external
3434
dynamic libraries apart from those provided as standard by OSX / Linux as
3535
defined by the manylinux standard.
3636

37-
The ``.travis.yml`` file in this repository has a line containing the API key
38-
for the Rackspace container encrypted with an RSA key that is unique to the
39-
repository - see http://docs.travis-ci.com/user/encryption-keys. This
40-
encrypted key gives the travis build permission to upload to the Rackspace
41-
directory pointed to by http://wheels.scipy.org.
37+
The ``azure/*`` files in this repository read a token stored in the Azure
38+
Pipeline used to run the CI. This encrypted key gives Azure permission to
39+
upload to the ananconda.org directories ``https://anaconda.org/<user>/numpy/``
40+
where user is the ``ANACONDA_ORG`` value in the ``yml`` files.
4241

4342
Triggering a build
4443
==================
4544

46-
You will likely want to edit the ``.travis.yml`` and ``appveyor.yml`` files to
45+
You will likely want to edit the ``azure/*`` files to
4746
specify the ``BUILD_COMMIT`` before triggering a build - see below.
4847

49-
You will need write permission to the github repository to trigger new builds
50-
on the travis-ci interface. Contact us on the mailing list if you need this.
48+
You will need write permission to the github repository to trigger new builds.
49+
Contact us on the mailing list if you need this.
5150

5251
You can trigger a build by:
5352

5453
* making a commit to the `numpy-wheels` repository (e.g. with `git
5554
commit --allow-empty`); or
56-
* clicking on the circular arrow icon towards the top right of the travis-ci
57-
page, to rerun the previous build.
58-
59-
In general, it is better to trigger a build with a commit, because this makes
60-
a new set of build products and logs, keeping the old ones for reference.
61-
Keeping the old build logs helps us keep track of previous problems and
62-
successful builds.
55+
* merging a pull request to the repo
6356

6457
Which numpy commit does the repository build?
6558
===============================================
6659

67-
The `numpy-wheels` repository will build the commit specified in the
68-
``BUILD_COMMIT`` at the top of the ``.travis.yml`` and ``appveyor.yml`` files.
69-
This can be any naming of a commit, including branch name, tag name or commit
70-
hash.
60+
PRs merged to this repo from a fork, and PRs directly pushed to this repo
61+
will build the commit specified in the ``BUILD_COMMIT`` at the top of the
62+
``azure/windows.yml`` and ``azure/posix.yml`` files, the wheels will be
63+
uploaded to https://anaconda.org/multibuild-wheels-staging/numpy. The
64+
``NIGHTLY_BUILD_COMMIT`` will be built once a week (sorry for the misnomer),
65+
and uploaded to https://anaconda.org/scipy-wheels-nightly/.
66+
The value of ``BUILD_COMMIT`` can be any naming of a commit, including branch
67+
name, tag name or commit hash.
7168

7269
Uploading the built wheels to pypi
7370
==================================
7471

75-
Be careful, http://wheels.scipy.org points to a container on a distributed
76-
content delivery network. It can take up to 15 minutes for the new wheel file
77-
to get updated into the container at http://wheels.scipy.org.
78-
79-
The same contents appear at
80-
https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com;
81-
you might prefer this address because it is https.
82-
8372
When the wheels are updated, you can download them to your machine manually,
8473
and then upload them manually to pypi, or by using twine_. You can also use a
8574
script for doing this, housed at :
@@ -92,7 +81,7 @@ You will typically have a directory on your machine where you store wheels,
9281
called a `wheelhouse`. The typical call for `wheel-uploader` would then
9382
be something like::
9483

95-
CDN_URL=https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com
84+
CDN_URL=https://anaconda.org/multibuild-wheels/staging/numpy/files
9685
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t macosx numpy 1.11.1
9786
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t manylinux1 numpy 1.11.1
9887
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t win numpy 1.11.1

azure-pipelines.yml

+25
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,31 @@ jobs:
7676
py_3.8_64:
7777
MB_PYTHON_VERSION: "3.8"
7878
MB_ML_VER: "2010"
79+
# manylinux1 wheels
80+
py_3.6_32:
81+
MB_PYTHON_VERSION: "3.6"
82+
PLAT: "i686"
83+
MB_ML_VER: "1"
84+
ENV_VARS_PATH: "env_vars_32.sh"
85+
py_3.6_64:
86+
MB_PYTHON_VERSION: "3.6"
87+
MB_ML_VER: "1"
88+
py_3.7_32:
89+
MB_PYTHON_VERSION: "3.7"
90+
PLAT: "i686"
91+
MB_ML_VER: "1"
92+
ENV_VARS_PATH: "env_vars_32.sh"
93+
py_3.7_64:
94+
MB_PYTHON_VERSION: "3.7"
95+
MB_ML_VER: "1"
96+
py_3.8_32:
97+
MB_PYTHON_VERSION: "3.8"
98+
PLAT: "i686"
99+
MB_ML_VER: "1"
100+
ENV_VARS_PATH: "env_vars_32.sh"
101+
py_3.8_64:
102+
MB_PYTHON_VERSION: "3.8"
103+
MB_ML_VER: "1"
79104

80105
- template: azure/posix.yml
81106
parameters:

0 commit comments

Comments
 (0)