summaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* setup.py: Fix gbp problem when installed with pipKiss György2018-11-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | when installed with "pip install gbp" it will be installed as version "0.0" because the released version doesn't have a debian/changelog file, so it will be installed with a warning: balabit-bbos-tools 1.0.0 has requirement gbp==0.9.8, but you'll have gbp 0.0 which is incompatible. and will cause an Exception when using gbp from a setuptools entrypoint script: File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 574, in _build_master ws.require(__requires__) File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 892, in require needed = self.resolve(parse_requirements(requirements)) File "/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages/pkg_resources/__init__.py", line 783, in resolve raise VersionConflict(dist, req).with_context(dependent_req) pkg_resources.ContextualVersionConflict: (gbp 0.0 (/home/walkman/stew/projects/platform/source/balabit-os-tools/.venv/lib/python3.6/site-packages), Requirement.parse('gbp==0.9.8'), {'requiresgbp'}) This is because pkg_resources checks every dependency version and if it doesn't match with the egg-info, it raises this Exception. Instead, we try to parse the debian/changelog first, then load the version, or if the debian/changelog file doesn't exists (this is the case at pip install) we read the gbp/version.py and parse the version from it. There is a "round trip check", which means the parsed version is written, then it will be read back immediately to see if there is any problem.
* builpackage-rpm: Use GBP_TMP_DIR instead f GBP_BUILD_DIRGuido Günther2018-10-28
| | | | | | This is consistent with --git-post-export and unbreaks tests/component/rpm/test_buildpackage_rpm.py:TestGbpRpm.test_hook_options
* buildpackage{,-rpm}: add preexport hookLuca Boccassi2018-10-28
| | | | | | | | | | | | | | | Sometimes it is necessary to perform operations before preparing the tarballs and exporting to the build directory. One such case is when having to handle extremely large binary assets in the orig tarball and at the same time complex packaging code, which makes it desirable to separate the two into different repositories for easier handling. A pre-export hook allows to ensure that the tarball repository is present and checked out at the correct branch. Closes: #909266 Signed-off-by: Luca Boccassi <bluca@debian.org>
* Fix flake8's W605 (invalid escape sequence)Guido Günther2018-10-15
| | | | | | See also https://docs.python.org/3/whatsnew/3.6.html#deprecated-python-behavior
* Ignore flake8's 'W504 line break after binary operator'Guido Günther2018-10-15
| | | | | | | | | | | | | | With flake8's other warnings this doesn't make much sense since indentation accoding to https://hg.python.org/peps/rev/3857909d7956 does not work. It triggers - 'W503 line break before binary operator' - 'E129 visually indented line with same indent as next logical line' If one want to align the operators one hits - 'E127 continuation line over-indented for visual indent' So let's leave things as is for the moment.
* repository: Remove superfluous blank lineGuido Günther2018-10-15
| | | | | | to make flake8 happy Gbp-Dch: Ignore
* PkgPolicy.symlink_orig: also remove dangling symlinksAndreas Beckmann2018-09-21
|
* hook: Fix harmless typoAndreas Beckmann2018-09-21
| | | | Gbp-Dch: Ignore
* debian.source: Enumerate components only onceAndreas Beckmann2018-09-21
|
* buildpackage: Unify 'extract' messagesAndreas Beckmann2018-09-21
| | | | Gbp-Dch: Ignore
* tests: small fix for import-orig-rpm component testMarkus Lehtonen2018-09-20
| | | | | | | | | | | | Merge behaviour in newer git versions (> v2.16) is slightly different. This broke one test with an error something like: Traceback (most recent call last): File "tests/component/rpm/test_import_orig_rpm.py", line 243, in test_misc_options eq_(len(repo.get_commits(until='pack')), 3) AssertionError: 2 != 3 Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* travisci: Test Python 3.7 as wellGuido Günther2018-09-17
| | | | | | | | Use the workaround from https://github.com/travis-ci/travis-ci/issues/9815 since Python 3.7 is not yet supported by the default image.
* gbp.git: fix doctest with recent python-dateutil.Markus Lehtonen2018-09-17
| | | | | | Traceback format has changed in recent python-dateutil. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
* pq: Fix testcaseGuido Günther2018-08-24
| | | | Pseudo headers are now moved to the top of the patch.
* pq import: Always put DEP-3 headers as pseudo-headersBen Hutchings2018-08-24
| | | | | | If there are any non-git DEP-3 header fields, put them at the top of the body text, regardless of whether Description or Subject is used. Also put a blank line between them and the rest of the message body.
* pq import: Look for DEP-3 header fields even if git mailimport succeedsBen Hutchings2018-08-24
| | | | Closes: #905934
* Add test case for bug #905934Ben Hutchings2018-08-24
|
* Add test case for conversion of extra DEP-3 headers to pseudo-headersGuido Günther2018-08-24
| | | | | Currently the extra DEP-3 headers may end up as trailers instead of should be pseudo-headers.
* import-orig: Allow to import the requested version with --uscanMathieu Parent2018-08-24
| | | | Closes: #741148
* New command to merge in changes from a upstream using gitGuido Günther2018-08-19
| | | | This reverts commit 3384a0f7a763144e5d627c454d7d76c2841e553b.
* Document changes and release 0.9.10debian/0.9.10Guido Günther2018-08-19
|
* Depend on sensible-utilsGuido Günther2018-08-19
| | | | gbp-dch uses sensible-editor.
* Make flak8 happyGuido Günther2018-08-19
| | | | Gbp-Dch: Ignore
* Revert "gbp import-ref: New command to merge in changes from a upstream ↵Guido Günther2018-08-19
| | | | | | | | using git" This reverts commit 1592882c38fcbb107332d9a0a63b8da4e0bf8a48. It's not ready yet.
* GitRepository.grep_log: Switch to GitArgsGuido Günther2018-08-17
| | | | Gbp-Dch: Ignore
* Ignore merge commits when looking at the pristine-tar branchIain Lane2018-08-17
| | | | | | | | | | | | | | | | When there is a merge commit in this branch, we currently get the warning: gbp:warning: Unknown compression type of Merge branch 'pristine-tar' into 'pristine-tar', assuming gzip because we're grepping the commit logs to find out the compression type of the tarballs in there. For now, we can just use `git log ... --no-merges' to not see these commits. Signed-off-by: Guido Günther <agx@sigxcpu.org> Closes: #906331
* pull: allow to set up branch tracking for missing branchesGuido Günther2018-08-08
| | | | | | If the remote branch does not exist at all that's currently not fatal. Closes: #882187
* pull: allow to set up branch tracking for missing branchesGuido Günther2018-08-08
| | | | If the remote branch does not exist at all that's currently not fatal.
* clone: split out remote name logicGuido Günther2018-08-08
| | | | Gbp-Dch: Ignore
* tests: clarify test namesGuido Günther2018-08-08
| | | | Gbp-Dch: Ignore
* GitRepository: api doc fixesGuido Günther2018-08-08
| | | | Gbp-Dch: Ignore
* pull: Check that repo is clean before fetching anythingGuido Günther2018-08-08
|
* create_remote_repo: import urllib.parseCarsten Schoenert2018-06-10
| | | | | | urllib.parse did not get imported in packaegs without changelog. Signed-off-by: Guido Günther <agx@sigxcpu.org>
* changelog: try iso8859-1 when utf-8 failsGuus Sliepen2018-06-07
| | | | | | | | Fall back to iso8859-1 when opening the changelog. Helps when importing old versions. Closes: #900841 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* import-{dsc,orig}: Make --download deprecation text more usefulChris Lamb2018-06-05
| | | | | | | | Point to the manpages for usage examples. Closes: #900606 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* Don't try to install non existent manpageGuido Günther2018-05-24
| | | | Gbp-Dch: Ignore
* gbp import-ref: New command to merge in changes from a upstream using gitGuido Günther2018-05-24
|
* config: allow to override default values via add_config_file_optionGuido Günther2018-05-24
|
* tests: Check help output of tag and push tooGuido Günther2018-05-24
|
* push: Allow to skip upstream and debian branch and tag pushGuido Günther2018-05-22
| | | | | | | Push of tag and or branch can be skipped by setting --{upstream,debian}-{branch,tag}='' . Closes: #899234
* deb.git: fix spelling of "described" in docstringKen Dreyer2018-05-22
| | | | | | Fix the docstring for _sanitize_version() and _unsanitize_version() Signed-off-by: Guido Günther <agx@sigxcpu.org>
* deb.git: fix duplicate "tarball" in docstringKen Dreyer2018-05-22
| | | | | | Fix the docstring for create_pristine_tar_commits() Signed-off-by: Guido Günther <agx@sigxcpu.org>
* Document changes and release 0.9.9debian/0.9.9Guido Günther2018-05-21
|
* docs: document how to use GBP_CONF_FILES to override debian/gbp.confGuido Günther2018-05-21
| | | | Closes: #898613
* docs: reindent cfgfile.xmlGuido Günther2018-05-21
| | | | Gbp-Dch: Ignore
* bin: drop umlaut again for setuptoolsKen Dreyer2018-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | setuptools cannot handle non-ascii characters in files declared in "scripts". $ python setup.py develop [snip] File "setuptools/command/easy_install.py", line 726, in process_distribution self.install_egg_scripts(dist) File "setuptools/command/develop.py", line 188, in install_egg_scripts self.install_script(dist, script_name, script_text, script_path) File "setuptools/command/easy_install.py", line 805, in install_script self.write_script(script_name, _to_ascii(script_text), 'b') File "setuptools/command/easy_install.py", line 108, in _to_ascii return s.encode('ascii') UnicodeEncodeError: 'ascii' codec can't encode character '\xfc' in position 785: ordinal not in range(128) Commit 4424008f6aaa7ce93d02f0c4948ad50542284ece fixed this, and 23874c2c50ebd57426797d38f4f9c6c40dc336ec added the umlaut back in. Take it out again so "setup.py develop" and "setup.py install" succeeds again. See https://github.com/pypa/setuptools/issues/761 Signed-off-by: Guido Günther <agx@sigxcpu.org>
* config: when printing a single value only print the valueGuido Günther2018-04-26
| | | | | This is more in line with what `git config` does and eases usage in scripts.
* import-orig: Better error message when vcs-tag is not foundGuido Günther2018-04-23
| | | | Closes: #896654
* docs: options in [DEFAULT] apply to all gbp commandsGuido Günther2018-04-05
|
* Fix typosGuido Günther2018-04-03
| | | | spotted by lintian
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 21:14:36 +0000