chiark / gitweb /
git-buildpackage.git
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [7]
Ian Jackson [Sun, 14 Oct 2018 13:11:49 +0000 (14:11 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [7]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [6]
Ian Jackson [Sun, 14 Oct 2018 12:58:04 +0000 (13:58 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [6]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [5]
Ian Jackson [Sun, 14 Oct 2018 12:56:02 +0000 (13:56 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [5]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [4]
Ian Jackson [Sun, 14 Oct 2018 12:55:13 +0000 (13:55 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [4]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing doublings of \ in for-replacement strings
Ian Jackson [Sun, 14 Oct 2018 12:54:47 +0000 (13:54 +0100)]
Escape: Add missing doublings of \ in for-replacement strings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add two missing doublings of \ in some docstrings.
Ian Jackson [Sun, 14 Oct 2018 12:50:41 +0000 (13:50 +0100)]
Escape: Add two missing doublings of \ in some docstrings.

The \\\\ in the source text inside """...""" turn into \\:

 >>> print("""
 ...  >>> DebianGitRepository.version_to_tag("%(version%-%\\\\%)s", "0-1.2.3")
 ... """)

  >>> DebianGitRepository.version_to_tag("%(version%-%\\%)s", "0-1.2.3")

 >>>

The \\ inside the quoted source text turn into \ when received by
version_to_tag.

Detected by flake8:
  ./gbp/deb/git.py:171:-37: W605 invalid escape sequence '\%'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [3]
Ian Jackson [Sun, 14 Oct 2018 12:44:15 +0000 (13:44 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [3]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [2]
Ian Jackson [Sun, 14 Oct 2018 12:42:21 +0000 (13:42 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [2]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoEscape: Add missing r in regexp literals ('...' => r'...') [1]
Ian Jackson [Sun, 14 Oct 2018 12:41:54 +0000 (13:41 +0100)]
Escape: Add missing r in regexp literals ('...' => r'...') [1]

Detected by flake8, eg
 ./gbp/deb/git.py:35:6: W605 invalid escape sequence '\)'

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoStyle: Remove a spurious blank line
Ian Jackson [Sun, 14 Oct 2018 12:41:57 +0000 (13:41 +0100)]
Style: Remove a spurious blank line

Weirdly, detected by flake8 as a missing blank line.

  ./gbp/git/repository.py:1890:5: E301 expected 1 blank line, found 0

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agosetup.cfg: Ignore flake8 W503/W504 operator before/after newline
Ian Jackson [Sun, 14 Oct 2018 12:37:06 +0000 (13:37 +0100)]
setup.cfg: Ignore flake8 W503/W504 operator before/after newline

This is in the default ignore list.  Unfortunately setting the list
overrides the default ignores.

Some discussion of this here:
 https://github.com/PyCQA/pycodestyle/issues/498

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agoMakefile: Set HOME when running tests
Ian Jackson [Sun, 14 Oct 2018 13:52:28 +0000 (14:52 +0100)]
Makefile: Set HOME when running tests

A nonexistent directory is sufficient.

Otherwise the tests can pick up the user's git configuration, which is
undesirable.  For example, I have

    [branch]
            autoSetupMerge = false

which causes this test

    >>> clone.create_branch('foo', 'origin/foo')
    >>> clone.get_merge_branch('foo')
    'origin/foo'

to fail.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agorfc822_date_to_git: Fix docstring for new dateutil.parser.parse
Ian Jackson [Sun, 14 Oct 2018 13:32:32 +0000 (14:32 +0100)]
rfc822_date_to_git: Fix docstring for new dateutil.parser.parse

dateutil.parser.parse now, on failure, throws ValueError containing a
tuple - now it has the troublesome string too.

This causes the tests to fail in Debian sid.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years ago.gitignore: Add .pybuild
Ian Jackson [Sun, 14 Oct 2018 12:36:50 +0000 (13:36 +0100)]
.gitignore: Add .pybuild

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years ago.gitignore: Fetch from vcs-git (upstream)
Ian Jackson [Sun, 14 Oct 2018 12:34:04 +0000 (13:34 +0100)]
.gitignore: Fetch from vcs-git (upstream)

  https://git.sigxcpu.org/cgit/git-buildpackage/plain/.gitignore

This file was left out of the source package due to this bug:
  #908747 Default -I and -i option should not exclude .<vcs>ignore

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
5 years agogit-buildpackage (0.9.10) unstable; urgency=medium
Guido Günther [Sun, 19 Aug 2018 06:29:47 +0000 (07:29 +0100)]
git-buildpackage (0.9.10) unstable; urgency=medium

  [ Ken Dreyer ]
  * [f0b1bbe] deb.git: fix duplicate "tarball" in docstring.
    Fix the docstring for create_pristine_tar_commits()
  * [29b9f2c] deb.git: fix spelling of "described" in docstring.
    Fix the docstring for _sanitize_version() and _unsanitize_version()

  [ Guido Günther ]
  * [62e0102] push: Allow to skip upstream and debian branch and tag push.
    Push of tag and or branch can be skipped by setting
    --{upstream,debian}-{branch,tag}='' . (Closes: #899234)
  * [28a950a] tests: Check help output of tag and push too
  * [a287bf6] config: allow to override default values via
    add_config_file_option
  * [b8221b8] pull: Check that repo is clean before fetching anything
  * [6dda2da] pull: allow to set up branch tracking for missing branches.
    If the remote branch does not exist at all that's currently not fatal.
    (Closes: #882187)
  * [d69006d] Depend on sensible-utils. gbp-dch uses sensible-editor.

  [ Chris Lamb ]
  * [6c30ac9] import-{dsc,orig}: Make --download deprecation text more useful.
    Point to the manpages for usage examples. (Closes: #900606)

  [ Guus Sliepen ]
  * [48ef0ec] changelog: try iso8859-1 when utf-8 fails.
    Fall back to iso8859-1 when opening the changelog. Helps when importing
    old versions. (Closes: #900841)

  [ Carsten Schoenert ]
  * [50b9223] create_remote_repo: import urllib.parse
    urllib.parse did not get imported in packaegs without changelog.

  [ Iain Lane ]
  * [5fedb2b] Ignore merge commits when looking at the pristine-tar branch.
    (Closes: #906331)

[dgit import package git-buildpackage 0.9.10]