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

Commit 0e4657a

Browse files
committed
Update README
1 parent a015b71 commit 0e4657a

File tree

1 file changed

+26
-27
lines changed

1 file changed

+26
-27
lines changed

README.rst

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ The wheel-building repository:
2525
(Manylinux1_). ``delocate`` and ``auditwheel`` copy the required dynamic
2626
libraries into the wheel and relinks the extension modules against the
2727
copied libraries;
28-
* uploads the built wheels to http://wheels.scipy.org (a Rackspace container
29-
kindly donated by Rackspace to scikit-learn).
28+
* uploads the built wheels to a Rackspace container kindly donated by Rackspace
29+
to scikit-learn.
3030

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

3535
The ``.travis.yml`` file in this repository has a line containing the API key
3636
for the Rackspace container encrypted with an RSA key that is unique to the
37-
repository - see http://docs.travis-ci.com/user/encryption-keys. This
37+
repository - see https://docs.travis-ci.com/user/encryption-keys. This
3838
encrypted key gives the travis build permission to upload to the Rackspace
39-
directory pointed to by http://wheels.scipy.org.
39+
containers we use to house the uploads.
4040

4141
Triggering a build
4242
==================
@@ -67,17 +67,26 @@ The ``pyreadstat-wheels`` repository will build the commit specified in the
6767
This can be any naming of a commit, including branch name, tag name or commit
6868
hash.
6969

70+
Note: when making a release, it's best to only push the commit (not the tag) of
71+
the release to the ``pyreadstat`` repo, then change ``BUILD_COMMIT`` to the
72+
commit hash, and only after all wheel builds completed successfully push the
73+
release tag to the repo. This avoids having to move or delete the tag in case
74+
of an unexpected build/test issue.
75+
7076
Uploading the built wheels to pypi
7177
==================================
7278

73-
Be careful, http://wheels.scipy.org points to a container on a distributed
74-
content delivery network. It can take up to 15 minutes for the new wheel file
75-
to get updated into the container at http://wheels.scipy.org.
79+
* release container visible at
80+
https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com
7681

77-
The same contents appear at
78-
https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com;
79-
you might prefer this address because it is https.
82+
Be careful, these links point to containers on a distributed content delivery
83+
network. It can take up to 15 minutes for the new wheel file to get updated
84+
into the containers at the links above.
8085

86+
When the wheels are updated, you can download them to your machine manually,
87+
and then upload them manually to pypi, or by using twine_. You can also use a
88+
script for doing this, housed at :
89+
https://github.com/MacPython/terryfy/blob/master/wheel-uploader
8190
When the wheels are updated, you can download them to your machine manually,
8291
and then upload them manually to pypi, or by using twine_. You can also use a
8392
script for doing this, housed at :
@@ -90,16 +99,12 @@ You will typically have a directory on your machine where you store wheels,
9099
called a `wheelhouse`. The typical call for `wheel-uploader` would then
91100
be something like::
92101

93-
VERSION=0.4.0
102+
VERSION=0.2.0
94103
CDN_URL=https://3f23b170c54c2533c070-1c8a9b3114517dc5fe17b7c3f8c63a43.ssl.cf2.rackcdn.com
95-
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t macosx pyreadstat $VERSION
96-
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t manylinux1 pyreadstat $VERSION
97-
wheel-uploader -r warehouse -u $CDN_URL -s -v -w ~/wheelhouse -t win pyreadstat $VERSION
104+
wheel-uploader -u $CDN_URL -s -v -w ~/wheelhouse -t all pyreadstat $VERSION
98105

99106
where:
100107

101-
* ``-r warehouse`` uses the upcoming Warehouse PyPI server (it is more
102-
reliable than the current PyPI service for uploads);
103108
* ``-u`` gives the URL from which to fetch the wheels, here the https address,
104109
for some extra security;
105110
* ``-s`` causes twine to sign the wheels with your GPG key;
@@ -108,28 +113,22 @@ where:
108113
``~/wheelhouse``.
109114

110115
``pyreadstat`` is the root name of the wheel(s) to download / upload, and
111-
``0.4.0`` is the version to download / upload.
116+
``0.2.0`` is the version to download / upload.
112117

113-
In order to use the Warehouse PyPI server, you will need something like this
118+
In order to upload the wheels, you will need something like this
114119
in your ``~/.pypirc`` file::
115120

116121
[distutils]
117122
index-servers =
118123
pypi
119-
warehouse
120124

121125
[pypi]
122126
username:your_user_name
123127
password:your_password
124128

125-
[warehouse]
126-
repository: https://upload.pypi.io/legacy/
127-
username: your_user_name
128-
password: your_password
129-
130-
So, in this case, ``wheel-uploader`` will download all wheels starting with
131-
``pyreadstat-0.4.0-`` from http://wheels.scipy.org to ``~/wheelhouse``,
132-
then upload them to PyPI.
129+
So, in this case, `wheel-uploader` will download all wheels starting with
130+
`pyreadstat-0.2.0-` from the URL in ``$CDN_URL`` above to ``~/wheelhouse``, then
131+
upload them to PyPI.
133132

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

0 commit comments

Comments
 (0)