At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/2.7/
------------------------------------------------------------
revno: 6616 [merge]
revision-id: p...@pqm.ubuntu.com-20160207185958-e04s369m88endygc
parent: p...@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
parent: v.ladeuil...@free.fr-20160207182313-jwz7z3vj4mpyjn7y
committer: Patch Queue Manager <p...@pqm.ubuntu.com>
branch nick: 2.7
timestamp: Sun 2016-02-07 18:59:58 +0000
message:
(vila) Fix for 2.7.0 pypi upload (Vincent Ladeuil)
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
MANIFEST.in manifest.in-20100109214549-ime1ec4zij1zkovi-1
Makefile Makefile-20050805140406-d96e3498bb61c5bb
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
=== modified file '.bzrignore'
--- a/.bzrignore 2012-08-07 06:32:51 +0000
+++ b/.bzrignore 2016-02-07 18:23:13 +0000
@@ -7,6 +7,7 @@
CHANGELOG
# generated documents
bzr.1
+MANIFEST
./doc/*.html
./doc/*/_build/
./doc/*/Makefile
=== modified file 'MANIFEST.in'
--- a/MANIFEST.in 2010-01-13 16:23:07 +0000
+++ b/MANIFEST.in 2016-02-07 18:23:13 +0000
@@ -1,3 +1,12 @@
-include bzr README setup.py
+include bzr README setup.py COPYING.txt
+# FIXME: Not needed, remove after 2.7.0 -- vila 2016-02-07
+include BRANCH.TODO bzr.ico INSTALL Makefile MANIFEST.in NEWS
profile_imports.py README_BDIST_RPM .rsyncexclude .testr.conf TODO
tools/bzr_epydoc tools/packaging/lp-upload-release tools/subunit-sum
bzrlib/plugins/news_merge/README bzrlib/plugins/po_merge/README
bzrlib/tests/ssl_certs/ca.key bzrlib/tests/ssl_certs/server.csr
bzrlib/plugins/grep/.bzrignore bzrlib/plugins/grep/NEWS
+# bzr export still create some empty dirs that need to be removed
+# bzrlib/plugins/weave_fmt/tests/ bzrlib/store/revision/ doc/ja/_templates/
man1/ man1
+recursive-include tools/win32 *
recursive-include bzrlib *.py *.pyx *.pxd *.txt *.c *.h
recursive-include tools *.py *.sh
+recursive-include apport *
+recursive-include contrib *
+recursive-include doc *
+recursive-include po *
=== modified file 'Makefile'
--- a/Makefile 2016-02-01 18:09:33 +0000
+++ b/Makefile 2016-02-07 18:23:13 +0000
@@ -454,9 +454,6 @@
.PHONY: dist check-dist-tarball
# build a distribution source tarball
-#
-# this method of copying the pyrex generated files is a bit ugly; it would be
-# nicer to generate it from distutils.
dist:
version=`./bzr version --short` && \
echo Building distribution of bzr $$version && \
@@ -465,10 +462,8 @@
tarball=$$PWD/../bzr-$$version.tar.gz && \
$(MAKE) clean && \
$(MAKE) && \
- bzr export $$expdir && \
- cp bzrlib/*.c bzrlib/*.h $$expdir/bzrlib/. && \
- tar cfz $$tarball -C $$expbasedir bzr-$$version && \
- gpg --detach-sign $$tarball && \
+ $(PYTHON) setup.py sdist -d $$PWD/.. && \
+ gpg --detach-sign --armor $$tarball && \
rm -rf $$expbasedir
# run all tests in a previously built tarball
=== modified file 'doc/developers/releasing.txt'
--- a/doc/developers/releasing.txt 2013-08-05 12:16:25 +0000
+++ b/doc/developers/releasing.txt 2016-02-07 18:23:13 +0000
@@ -513,7 +513,7 @@
----------------------------
#. Post to the ``baz...@lists.canonical.com`` and
- ``bzr-packag...@list.launchpad.net`` lists, saying that the source has
+ ``bzr-packag...@lists.launchpad.net`` lists, saying that the source has
been frozen. Be extra clear that this is only a *source* release targeted
at packagers and installer builders (see
<https://bugs.launchpad.net/launchpad/+bug/645084>). This is the cue for
@@ -640,17 +640,45 @@
#. Update `<http://en.wikipedia.org/wiki/Bazaar_(software)>`_ -- this should
be done for the stable and beta releases.
-#. Update the python package index: <http://pypi.python.org/pypi/bzr> - best
- done by running ::
-
- python setup.py register
+#. Update the python package index: <http://pypi.python.org/pypi/bzr>
+
+ From the tarball created and tested earlier ::
+
+ twine upload -s ../bzr-2.7.0.tar.gz
Remember to check the results afterward -- this should be done for
stable releases but not for beta releases nor SRUs.
- To be able to register the release you must create an account on
- <http://pypi.python.org/pypi> and have one of the existing owners of
- the project add you to the group.
+ If in doubt, you can test with <https://testpypi.python.org/pypi> where
+ you can register yourself, register the bzr project and upload (and then
+ remove the upload and delete the project so a new release manager can
+ enjoy the same facilities). If the project already exists, have one of
+ the existing owners of the project add you to the group.
+
+ To use the pypi test site, you need to record your credentials for an
+ existing user (the registration process is manual and starts at
+ <https://testpypi.python.org/pypi?%3Aaction=register_form>.
+
+ Once registered, you can record your crdentials in your ``~/pypirc`` file
+ with ::
+
+ [testpypi]
+ username:<login on testpypi>
+ password:<password on testpypi>
+ repository = https://testpypi.python.org/pypi
+
+ Registering the bzr project if doesn't exist is achieved with::
+
+ python setup.py -r https://testpypi.python.org/pypi register
+
+ Uploading is done with::
+
+ twine upload -r testpypi -s ../bzr-2.7.0.tar.gz
+
+ To be able to upload the release you must create an account on
+ <http://pypi.python.org/pypi> and have one of the existing owners of the
+ project add you to the group and update your ``[pypi]`` section in your
+ ``~/pypirc`` file.
Merging the released code back to trunk
--
bazaar-commits mailing list
bazaar-commits@lists.canonical.com
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
