jenkins-launchpad-plugin

Merge ~paride/jenkins-launchpad-plugin:packaging into jenkins-launchpad-plugin:master

  1. Git
  2. lp:~paride/jenkins-launchpad-plugin
  3. packaging
  4. Merge into master
Proposed by Paride Legovini
Status: Merged
Merged at revision: 7688565718317943f6a652c7597506826af8a486
Proposed branch: ~paride/jenkins-launchpad-plugin:packaging
Merge into: jenkins-launchpad-plugin:master
Diff against target: 363 lines (+89/-58)
17 files modified
debian/.gitignore (+1/-0)
debian/changelog (+9/-1)
debian/clean (+3/-0)
debian/control (+47/-26)
debian/copyright (+2/-3)
debian/gbp.conf (+2/-0)
debian/jenkins-launchpad-plugin-doc.doc-base (+7/-0)
debian/jenkins-launchpad-plugin-doc.docs (+1/-0)
debian/jenkins-launchpad-plugin.docs (+0/-3)
debian/jenkins-launchpad-plugin.examples (+1/-0)
debian/jenkins-launchpad-plugin.install (+1/-0)
debian/rules (+4/-11)
debian/source/format (+1/-0)
debian/source/lintian-overrides (+2/-0)
dev/null (+0/-9)
jlp/__init__.py (+5/-3)
setup.py (+3/-2)
Reviewer Review Type Date Requested Status
Joshua Powers (community) Approve
Review via email: mp+376841@code.launchpad.net

Commit message

Update the packaging for the Py3 version

Changes:
 - Install the templates in /usr/share
 - Delete the scrips/ directory (not needed)
 - Rename the 'dput' tool to 'jlp-dput'
 - Update debian/*

To post a comment you must log in.
Revision history for this message
Joshua Powers (powersj) :
review: Approve
Revision history for this message
Paride Legovini (paride) wrote :

This will go in the same PPA where I'm putting the Tarmac test builds, as jlp has tarmac as a dependency:

  sudo add-apt-repository ppa:legovini/tarmac-test

The package is currently being built.

On the version number: I'm planning to apply the same format we decide for Tarmac (YYYYMMDD.n or a similar date based version string).

NOTE that I renamed the 'dput' tool to 'jlp-dput'. Was there a reason to chose the same name as the "real" dput tool? Thoughts?

Revision history for this message
Paride Legovini (paride) wrote :

I'd like to have a final "approve" given that I explicitly pointed out the dput rename after the approval commentl

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/.gitignore b/debian/.gitignore
0new file mode 1006440new file mode 100644
index 0000000..4ba9e3e
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
1*.debhelper.log
diff --git a/debian/changelog b/debian/changelog
index 3896a16..6182378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
1jenkins-launchpad-plugin (19.1-1) UNRELEASED; urgency=medium
2
3 * Switch to Python 3.
4 * Refactoring of the packaging.
5 * Rename 'dput' to 'jlp-dput' to avoid the file name clash.
6
7 -- Paride Legovini <paride.legovini@canonical.com> Mon, 16 Dec 2019 15:59:31 +0100
8
1jenkins-launchpad-plugin (0.1.1) trusty; urgency=medium9jenkins-launchpad-plugin (0.1.1) trusty; urgency=medium
210
3 * Add support for patching URLs when reading jenkins data behind a proxy. 11 * Add support for patching URLs when reading jenkins data behind a proxy.
412
5 -- Francis Ginther <francis.ginther@canonical.com> Mon, 14 Dec 2015 10:08:24 -060013 -- Francis Ginther <francis.ginther@canonical.com> Mon, 14 Dec 2015 10:08:24 -0600
614
diff --git a/debian/clean b/debian/clean
7new file mode 10064415new file mode 100644
index 0000000..3badde7
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,3 @@
1*.egg-info/
2docs/_static/
3dist/
diff --git a/debian/compat b/debian/compat
0deleted file mode 1006444deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
19
diff --git a/debian/control b/debian/control
index ea975c9..ebea72a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,35 +2,56 @@ Source: jenkins-launchpad-plugin
2Section: misc2Section: misc
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Martin Mrazik <martin.mrazik@canonical.com>5XSBC-Original-Maintainer: Paride Legovini <paride.legovini@canonical.com>
6Build-Depends: debhelper (>= 9),6Build-Depends: debhelper-compat (= 12),
7 tarmac,7 dh-python,
8 python-launchpadlib,8 python3-all,
9 python-bzrlib,9 python3-autopilot,
10 python-mock,10 python3-breezy,
11 python-testtools,11 python3-git,
12 python-jenkins,12 python3-jinja2,
13 python-lockfile,13 python3-launchpadlib,
14 python-testscenarios,14 python3-testtools,
15 python-setuptools,15 python3-jenkins,
16 python-junitxml,16 python3-lockfile,
17 python-coverage,17 python3-testscenarios,
18 python-autopilot,18 python3-setuptools,
19 python-yaml,19 python3-tarmac,
20 python-sphinx,20 python3-yaml,
21Standards-Version: 3.9.421 python3-sphinx,
22Standards-Version: 4.4.1
22Homepage: https://launchpad.net/jenkins-launchpad-plugin23Homepage: https://launchpad.net/jenkins-launchpad-plugin
24Rules-Requires-Root: no
2325
24Package: jenkins-launchpad-plugin26Package: jenkins-launchpad-plugin
25Architecture: all27Architecture: all
28Multi-Arch: foreign
26Depends: ${misc:Depends},29Depends: ${misc:Depends},
27 ${python:Depends},30 ${python3:Depends},
28 python-minimal,31 python3-git,
29 tarmac,32 python3-breezy,
30 python-jenkins,33 python3-jenkins,
31 python-launchpadlib,34 python3-launchpadlib,
32 python-lockfile,35 python3-lockfile,
33 python-bzrlib,36 python3-tarmac,
34 python-yaml,37 python3-yaml,
35Description: Scripts for integrating launchpad merge proposals workflow with jenkins38Suggests: jenkins-launchpad-plugin-doc,
39 tarmac,
40Description: Scripts for integrating Launchpad merge proposals workflow Jenkins
41 jenkins-launchpad-plugin is a set of scripts for polling Launchpad (looking
42 for new merge proposals) and for updating launchpad merge proposals with
43 different messages and votes in a CI workflow based on Jenkins.
3644
45Package: jenkins-launchpad-plugin-doc
46Section: doc
47Architecture: all
48Multi-Arch: foreign
49Depends: ${misc:Depends},
50 ${sphinxdoc:Depends},
51Built-Using: ${sphinxdoc:Built-Using}
52Description: Scripts for integrating Launchpad merge proposals with Jenkins (documentation)
53 jenkins-launchpad-plugin is a set of scripts for polling Launchpad (looking
54 for new merge proposals) and for updating launchpad merge proposals with
55 different messages and votes in a CI workflow based on Jenkins.
56 .
57 This package contains the HTML documentation.
diff --git a/debian/copyright b/debian/copyright
index 3bc456a..a949755 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,9 @@
1Format: http://dep.debian.net/deps/dep51Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: jenkins-launchpad-plugin2Upstream-Name: jenkins-launchpad-plugin
3Source: https://launchpad.net/jenkins-launchpad-plugin3Source: https://launchpad.net/jenkins-launchpad-plugin
44
5Files: *5Files: *
6Copyright: 2013 Canonical6Copyright: 2013-2019 Canonical Ltd.
7License: GPL-3.07License: GPL-3.0
88
9License: GPL-3.09License: GPL-3.0
@@ -21,4 +21,3 @@ License: GPL-3.0
21 .21 .
22 On Debian systems, the complete text of the GNU General22 On Debian systems, the complete text of the GNU General
23 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".23 Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
24
diff --git a/debian/gbp.conf b/debian/gbp.conf
25new file mode 10064424new file mode 100644
index 0000000..1aff5b7
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
1[DEFAULT]
2upstream-tree=SLOPPY
diff --git a/debian/jenkins-launchpad-plugin-doc.doc-base b/debian/jenkins-launchpad-plugin-doc.doc-base
0new file mode 1006443new file mode 100644
index 0000000..5f4101b
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin-doc.doc-base
@@ -0,0 +1,7 @@
1Document: jenkins-launchpad-plugin-doc
2Title: Jenkins Launchpad Plugin documentation
3Section: Programming/Project Management
4
5Format: HTML
6Index: /usr/share/doc/jenkins-launchpad-plugin/html/index.html
7Files: /usr/share/doc/jenkins-launchpad-plugin/html/*
diff --git a/debian/jenkins-launchpad-plugin-doc.docs b/debian/jenkins-launchpad-plugin-doc.docs
0new file mode 1006448new file mode 100644
index 0000000..6d28621
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin-doc.docs
@@ -0,0 +1 @@
1build/html
diff --git a/debian/jenkins-launchpad-plugin.docs b/debian/jenkins-launchpad-plugin.docs
index 39b99d0..e845566 100644
--- a/debian/jenkins-launchpad-plugin.docs
+++ b/debian/jenkins-launchpad-plugin.docs
@@ -1,4 +1 @@
1docs/_build/html
2README1README
3HACKING
4jlp.config
diff --git a/debian/jenkins-launchpad-plugin.examples b/debian/jenkins-launchpad-plugin.examples
5new file mode 1006442new file mode 100644
index 0000000..db740e4
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin.examples
@@ -0,0 +1 @@
1jlp.config
diff --git a/debian/jenkins-launchpad-plugin.install b/debian/jenkins-launchpad-plugin.install
0new file mode 1006442new file mode 100644
index 0000000..73752c9
--- /dev/null
+++ b/debian/jenkins-launchpad-plugin.install
@@ -0,0 +1 @@
1usr
diff --git a/debian/rules b/debian/rules
index 0b8a99b..2aabdd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,9 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2
2%:3%:
3 dh $@ --with python24 dh $@ --with python3,sphinxdoc --buildsystem=pybuild
45
5override_dh_auto_build:6override_dh_auto_build:
6 sphinx-build -b html -W docs/ docs/_build/html
7 dh_auto_build7 dh_auto_build
88 mkdir docs/_static
9override_dh_auto_test:9 sphinx-build -W -b html docs/ build/html
10 python -m coverage run -p /usr/bin/autopilot run -o test_results.xml -f xml tests
11 python -m coverage combine
12 python -m coverage xml --omit '/usr*,tests*'
13
14
15override_dh_install:
16 dh_install --fail-missing
diff --git a/debian/source/format b/debian/source/format
17new file mode 10064410new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
13.0 (quilt)
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
0new file mode 1006442new file mode 100644
index 0000000..2c3bf10
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
1# The pakage format switched from native to quilt.
2jenkins-launchpad-plugin source: odd-historical-debian-changelog-version 0.1*
diff --git a/jlp/__init__.py b/jlp/__init__.py
index 9802aea..7dd8434 100644
--- a/jlp/__init__.py
+++ b/jlp/__init__.py
@@ -8,7 +8,7 @@ jlp
8"""8"""
99
10__name__ = 'jlp'10__name__ = 'jlp'
11__version__ = '3.1'11__version__ = '19.1'
12__author__ = 'Martin Mrazik'12__author__ = 'Martin Mrazik'
1313
14import jinja214import jinja2
@@ -87,8 +87,10 @@ def set_log_level(logger, stdout_handler):
8787
8888
89def get_jinja_environment(extra_dir=None):89def get_jinja_environment(extra_dir=None):
90 default_templates = '/'.join(__file__.split('/')[0:-2]) + '/templates'90 default_templates = '/usr/share/jenkins-launchpad-plugin/templates'
91 templates = [default_templates]91 dist_templates = '/'.join(__file__.split('/')[0:-2]) + '/templates'
92
93 templates = [dist_templates, default_templates]
92 if extra_dir:94 if extra_dir:
93 # we load the arg templates first95 # we load the arg templates first
94 # then add in any missing templates from the defaults96 # then add in any missing templates from the defaults
diff --git a/scripts/autoland b/scripts/autoland
95deleted file mode 10075597deleted file mode 100755
index 6279088..0000000
--- a/scripts/autoland
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env python3
2import sys
3# this is to keep backwards compatibility with deployments directly from
4# bzr branch
5sys.path.append('.') # add local directory
6from jlp.commands.autoland import autoland
7
8if __name__ == "__main__":
9 sys.exit(autoland())
diff --git a/scripts/dput b/scripts/dput
10deleted file mode 1007550deleted file mode 100755
index 7bef560..0000000
--- a/scripts/dput
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env python3
2import sys
3# this is to keep backwards compatibility with deployments directly from
4# bzr branch
5sys.path.append('.') # add local directory
6from jlp.commands.dput import dput
7
8if __name__ == "__main__":
9 sys.exit(dput())
diff --git a/scripts/getMergeProposals b/scripts/getMergeProposals
10deleted file mode 1007550deleted file mode 100755
index c2b072b..0000000
--- a/scripts/getMergeProposals
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env python3
2import sys
3# this is to keep backwards compatibility with deployments directly from
4# bzr branch
5sys.path.append('.') # add local directory
6from jlp.commands.getMergeProposals import getMergeProposals
7
8if __name__ == "__main__":
9 sys.exit(getMergeProposals())
diff --git a/scripts/launchpadTrigger b/scripts/launchpadTrigger
10deleted file mode 1007550deleted file mode 100755
index 28aa2e3..0000000
--- a/scripts/launchpadTrigger
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env python3
2import sys
3# this is to keep backwards compatibility with deployments directly from
4# bzr branch
5sys.path.append('.') # add local directory
6from jlp.commands.launchpadTrigger import launchpadTrigger
7
8if __name__ == "__main__":
9 sys.exit(launchpadTrigger())
diff --git a/scripts/voteOnMergeProposal b/scripts/voteOnMergeProposal
10deleted file mode 1007550deleted file mode 100755
index 61f099c..0000000
--- a/scripts/voteOnMergeProposal
+++ /dev/null
@@ -1,9 +0,0 @@
1#!/usr/bin/env python3
2import sys
3# this is to keep backwards compatibility with deployments directly from
4# bzr branch
5sys.path.append('.') # add local directory
6from jlp.commands.voteOnMergeProposal import voteOnMergeProposal
7
8if __name__ == "__main__":
9 sys.exit(voteOnMergeProposal())
diff --git a/setup.py b/setup.py
index 346810d..33b744c 100644
--- a/setup.py
+++ b/setup.py
@@ -8,12 +8,13 @@ setup(
8 url='https://launchpad.net/jenkins-launchpad-plugin',8 url='https://launchpad.net/jenkins-launchpad-plugin',
9 packages=find_packages(),9 packages=find_packages(),
10 include_package_data=True,10 include_package_data=True,
11 data_files=[('templates', glob.glob('templates/*.j2'))],11 data_files=[('share/jenkins-launchpad-plugin/templates',
12 glob.glob('templates/*.j2'))],
12 test_suite='tests',13 test_suite='tests',
13 entry_points="""\14 entry_points="""\
14 [console_scripts]15 [console_scripts]
15 autoland = jlp.commands.autoland:autoland16 autoland = jlp.commands.autoland:autoland
16 dput = jlp.commands.dput:dput17 jlp-dput = jlp.commands.dput:dput
17 getMergeProposals = jlp.commands.getMergeProposals:getMergeProposals18 getMergeProposals = jlp.commands.getMergeProposals:getMergeProposals
18 launchpadTrigger = jlp.commands.launchpadTrigger:launchpadTrigger19 launchpadTrigger = jlp.commands.launchpadTrigger:launchpadTrigger
19 voteOnMergeProposal = \20 voteOnMergeProposal = \

Subscribers

People subscribed via source and target branches