[Git][reproducible-builds/reprotest][master] 15 commits: Update release documentation to also remember to push to PyPI

Mattia Rizzolo gitlab at salsa.debian.org
Mon Jul 9 15:38:23 CEST 2018 

Mattia Rizzolo pushed to branch master at Reproducible Builds / reprotest


Commits:
5c2a7199 by Mattia Rizzolo at 2018-07-09T14:55:39+02:00
Update release documentation to also remember to push to PyPI

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
2e18eb4c by Mattia Rizzolo at 2018-07-09T14:55:56+02:00
Revert "Add Holger to Uploaders to avoid spurious "NMU" Lintian warnings."

I'm a fan of keeping Uploaders "real", i.e. add yourself only if you are
actually working on the package.

This reverts commit 3eed0f9d3e6dc3eaf1ca3a58b80a13ba029a619c.

- - - - -
08efd240 by Mattia Rizzolo at 2018-07-09T14:57:46+02:00
draft an initial changelog.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
878af2e8 by Mattia Rizzolo at 2018-07-09T14:58:11+02:00
d/control: Bump Standards-Version to 4.1.5, no changes needed.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
7c36fe87 by Mattia Rizzolo at 2018-07-09T14:59:15+02:00
d/control: Drop Build-Depends on old version of dpkg-dev that is garanteed to exist.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
50d5ce35 by Mattia Rizzolo at 2018-07-09T15:00:54+02:00
make -C over cd && make

Gbp-Dch: Ignore
Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
fcc07e36 by Mattia Rizzolo at 2018-07-09T15:01:22+02:00
Bump debhelper compat level to 11.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
f32a30c1 by Mattia Rizzolo at 2018-07-09T15:05:32+02:00
d/control: Recommend diffoscope by itself instead as an alternative to diffutils

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
823d5432 by Mattia Rizzolo at 2018-07-09T15:06:06+02:00
d/control: Do not Recommend diffutils, that is an Essential:yes package.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
ee3e0379 by Mattia Rizzolo at 2018-07-09T15:08:11+02:00
d/tests/control: Add missing dependency on fakeroot on the second test.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
2e3a1ef3 by Mattia Rizzolo at 2018-07-09T15:16:47+02:00
d/control: drop trailing full stop from the package synopsis

the synopsis is not meant to be a full sentence

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
d08174fc by Mattia Rizzolo at 2018-07-09T15:17:22+02:00
d/rules: Use /usr/share/dpkg/pkg-info to avoid shelling out to dpkg-parsechangelog

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
7173f938 by Mattia Rizzolo at 2018-07-09T15:17:50+02:00
Fix spelling errors in documentation strings.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
c614a3c2 by Mattia Rizzolo at 2018-07-09T15:27:51+02:00
d/watch: Update to look at our new release archive.

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -
6dfd7521 by Mattia Rizzolo at 2018-07-09T15:34:34+02:00
Changelog for 0.7.8

Signed-off-by: Mattia Rizzolo <mattia at debian.org>

- - - - -


9 changed files:

- README-dev.rst
- debian/changelog
- debian/compat
- debian/control
- debian/rules
- debian/tests/control
- debian/watch
- reprotest/__init__.py
- reprotest/mdiffconf.py


Changes:

=====================================
README-dev.rst
=====================================
--- a/README-dev.rst
+++ b/README-dev.rst
@@ -61,11 +61,19 @@ Now, finally run the tests:
 Releasing
 =========
 
-After releasing (with ``gbp buildpackage``), please upload a signed tarball:
-
-::
+When uploading to the Debian archive as usual, please also release a
+signed tarball::
 
     $ TARBALL=$(dpkg-parsechangelog -SSource)_$(dpkg-parsechangelog -SVersion).tar.xz
     $ gpg --detach-sign --armor --output=../${TARBALL}.asc < ../${TARBALL}
 
 And commit them to our LFS repository at https://salsa.debian.org/reproducible-builds/reproducible-lfs
+
+After uploading, please also update the version on PyPI using::
+
+   $ python3 setup.py sdist upload --sign
+
+Once the tracker.debian.org entry appears, consider tweeting the release on
+``#reproducible-builds`` with::
+
+  %twitter reprotest $VERSION has been released. Check out the changelog here: $URL


=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,35 @@
-reprotest (0.7.8) UNRELEASED; urgency=medium
+reprotest (0.7.8) unstable; urgency=medium
 
-  * d/control: Declare that reprotest doesn't need root to build
-    (after confirming this is the case).
+  * Team upload.
 
- -- Holger Levsen <holger at debian.org>  Mon, 18 Dec 2017 21:16:25 +0000
+  [ Holger Levsen ]
+  * d/control: Declare that reprotest doesn't need root to build.
+
+  [ Chris Lamb ]
+  * Drop executable bit on doc/Makefile.
+  * Add a bin/reprotest to match diffoscope.
+  * Use our bin/reprotest wrapper in manpage generation to ensure we are
+    using the local version of reprotest.
+  * Update Vcs-{Git,Browser} as repository has been migrated to Salsa.
+  * Update "Source" location in debian/copyright to point to new URI.
+  * Update upstream "url" kwarg in setup.py.
+
+  [ Mattia Rizzolo ]
+  * Update README with updated instructions on how to release the tarball.
+  * Update release documentation to also remember to push to PyPI.
+  * d/control:
+    + Bump Standards-Version to 4.1.5, no changes needed.
+    + Drop Build-Depends on old version of dpkg-dev that is garanteed to exist.
+    + Recommend diffoscope by itself instead as an alternative to diffutils.
+    + Do not Recommend diffutils, that is an Essential:yes package.
+    + Drop trailing full stop from the package synopsis.
+  * Bump debhelper compat level to 11.
+  * d/tests/control: Add missing dependency on fakeroot on the second test.
+  * d/rules: Use dpkg's pkg-info.mk instead of dpkg-parsechangelog.
+  * Fix spelling errors in documentation strings.
+  * d/watch: Update to look at our new release archive.
+
+ -- Mattia Rizzolo <mattia at debian.org>  Mon, 09 Jul 2018 15:33:05 +0200
 
 reprotest (0.7.7) unstable; urgency=medium
 


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
 Source: reprotest
 Maintainer: Reproducible builds folks <reproducible-builds at lists.alioth.debian.org>
-Uploaders: Ceridwen <ceridwenv at gmail.com>, Ximin Luo <infinity0 at debian.org>, Holger Levsen <holger at debian.org>
+Uploaders: Ceridwen <ceridwenv at gmail.com>, Ximin Luo <infinity0 at debian.org>
 Section: devel
 Priority: optional
-Standards-Version: 4.1.2
+Standards-Version: 4.1.5
 Rules-Requires-Root: no
-Build-Depends: debhelper (>= 10),
- dpkg-dev (>= 1.17.14),
+Build-Depends:
+ debhelper (>= 11),
  dh-python,
  python3-all,
  python3-setuptools,
@@ -39,13 +39,14 @@ Depends: ${python3:Depends},
  python3-pkg-resources,
  python3-rstr,
  ${misc:Depends}
-Recommends: diffutils | diffoscope (>= 84),
+Recommends:
+ diffoscope (>= 84),
  disorderfs (>= 0.5.2),
  faketime,
  locales-all,
  sudo,
 Suggests: autodep8, schroot, qemu-system, qemu-utils
-Description: Build software and check it for reproducibility.
+Description: Build software and check it for reproducibility
  reprotest builds the same source code twice in different environments, and
  then checks the binaries produced by each build for differences. If any are
  found, then diffoscope (or if unavailable then diff) is used to display them


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #! /usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 #export DH_VERBOSE = 1
 export PYBUILD_NAME = reprotest
 
@@ -18,12 +20,12 @@ export PYBUILD_NAME = reprotest
 export REPROTEST_TEST_DONTVARY = fileordering,user_group,domain_host$(if $(shell nproc | grep --color=no -Fx 1),$(,)num_cpus,)
 
 override_dh_auto_configure:
-	test $$(python3 setup.py --version) = $$(dpkg-parsechangelog -SVersion)
+	test $$(python3 setup.py --version) = $(DEB_VERSION)
 	dh_auto_configure
 
 override_dh_auto_build:
 	dh_auto_build
-	cd doc && $(MAKE)
+	$(MAKE) -C doc
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -46,4 +48,4 @@ autopkgtest-pytest:
 
 override_dh_auto_clean:
 	dh_auto_clean
-	cd doc && $(MAKE) clean
+	$(MAKE) -C doc clean


=====================================
debian/tests/control
=====================================
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,4 +2,4 @@ Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="not need_builddep
 Depends: @, python3-pytest, faketime, locales-all, fakeroot
 
 Test-Command: debian/rules autopkgtest-pytest PYTEST_MARKEXPR="need_builddeps"
-Depends: @, @builddeps@
+Depends: @, @builddeps@, fakeroot


=====================================
debian/watch
=====================================
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,3 @@
-version=3
-opts=pgpsigurlmangle=s/$/.asc/ https://reproducible.alioth.debian.org/releases/reprotest/reprotest[-_](.+)\.tar\..*
+version=4
+opts=pgpmode=auto \
+https://reproducible-builds.org/_lfs/releases/reprotest/ @PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@


=====================================
reprotest/__init__.py
=====================================
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -575,7 +575,7 @@ def cli_parser():
     group1_0.add_argument('--extra-build', metavar='VARIATIONS', default=[], action='append',
         help='Perform another build with the given VARIATIONS (which may be '
         'empty) to be applied on top of what was given for --variations and '
-        '--vary. Each occurence of this flag specifies another build, so e.g. '
+        '--vary. Each occurrence of this flag specifies another build, so e.g. '
         'given twice this will make reprotest perform 4 builds in total.')
     group1_0.add_argument('--auto-build', default=False, action='store_true',
         help='Automatically perform builds to try to determine which specific '


=====================================
reprotest/mdiffconf.py
=====================================
--- a/reprotest/mdiffconf.py
+++ b/reprotest/mdiffconf.py
@@ -98,7 +98,7 @@ def parse(d, action, one, zero=None, aliases={}):
     obj: The top-level object to apply the action to.
 
     action: The action to apply, specified as a string. The string is split on
-        the leftmost occurence of any supported $operator; everything to the
+        the leftmost occurrence of any supported $operator; everything to the
         left of it is the $attribute and to the right of it is the $operand.
 
         $attribute is in dotted-notation and specifies which $target attribute



View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/compare/11406708acfee4feb0888a7e98871946f23f8d7d...6dfd75219de4c6abc5ec4f1d59d0ba17c194b9c3

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reprotest/compare/11406708acfee4feb0888a7e98871946f23f8d7d...6dfd75219de4c6abc5ec4f1d59d0ba17c194b9c3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20180709/d96fe909/attachment.html>

More information about the rb-commits mailing list