Merge lp:~vila/brz/prepare-3.0.0 into lp:brz

Proposed by Vincent Ladeuil on 2018-09-16
Status: Merged
Approved by: Vincent Ladeuil on 2018-09-16
Approved revision: 7121
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~vila/brz/prepare-3.0.0
Merge into: lp:brz
Diff against target: 51 lines (+6/-6)
2 files modified
Makefile (+3/-3)
doc/developers/releasing.txt (+3/-3)
To merge this branch: bzr merge lp:~vila/brz/prepare-3.0.0
Reviewer Review Type Date Requested Status
Vincent Ladeuil Approve on 2018-09-16
Review via email: mp+355010@code.launchpad.net

Commit message

Post 3.0a1 release tweaks.

Description of the change

Just a few things I fixed while following the release document /after/ the tagged commit landed.

To post a comment you must log in.
Vincent Ladeuil (vila) wrote :

RM approval, tested locally. Almost documenting only.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2018-09-14 02:27:01 +0000
3+++ Makefile 2018-09-16 15:42:48 +0000
4@@ -464,7 +464,7 @@
5 echo Building distribution of brz $$version && \
6 expbasedir=`mktemp -t -d tmp_brz_dist.XXXXXXXXXX` && \
7 expdir=$$expbasedir/brz-$$version && \
8- tarball=$$PWD/../brz-$$version.tar.gz && \
9+ tarball=$$PWD/../breezy-$$version.tar.gz && \
10 $(MAKE) clean && \
11 $(MAKE) && \
12 $(PYTHON) setup.py sdist -d $$PWD/.. && \
13@@ -475,7 +475,7 @@
14 check-dist-tarball:
15 tmpdir=`mktemp -t -d tmp_brz_check_dist.XXXXXXXXXX` && \
16 version=`./brz version --short` && \
17- tarball=$$PWD/../brz-$$version.tar.gz && \
18+ tarball=$$PWD/../breezy-$$version.tar.gz && \
19 tar Cxz $$tmpdir -f $$tarball && \
20- $(MAKE) -C $$tmpdir/brz-$$version check && \
21+ $(MAKE) -C $$tmpdir/breezy-$$version check && \
22 rm -rf $$tmpdir
23
24=== modified file 'doc/developers/releasing.txt'
25--- doc/developers/releasing.txt 2018-09-16 09:45:55 +0000
26+++ doc/developers/releasing.txt 2018-09-16 15:42:48 +0000
27@@ -585,13 +585,13 @@
28
29 From the tarball created and tested earlier ::
30
31- twine upload -s ../breezy-3.0.0.tar.gz
32+ twine upload ../breezy-3.0.0.tar.gz ../breezy-3.0.0.tar.gz.asc
33
34 Remember to check the results afterward -- this should be done for
35 stable releases but not for beta releases nor SRUs.
36
37 The ``twine`` command is provided by the ``twine`` package on Debian and
38- Ubuntu.
39+ Ubuntu. Beware that you need at least ``twine-1.10``.
40
41 If in doubt, you can test with <https://testpypi.python.org/pypi> where
42 you can register yourself, register the brz project and upload (and then
43@@ -617,7 +617,7 @@
44
45 Uploading is done with::
46
47- twine upload -r testpypi -s ../breezy-3.0.0.tar.gz
48+ twine upload -r testpypi ../breezy-3.0.0.tar.gz ../breezy-3.0.0.tar.gz.asc
49
50 To be able to upload the release you must create an account on
51 <http://pypi.python.org/pypi> and have one of the existing owners of the

Subscribers

People subscribed via source and target branches