summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-12-31 21:55:40 +0100
committerMichael Vogt <mvo@debian.org>2014-01-05 20:04:20 +0100
commiteac4d047d8774def55b03cb82d505d237d93ea55 (patch)
tree782e384696538aa77a2233b537192c03f4bcda20
parentf861cb59ee7682ae65f5d0743d07b093143e1baa (diff)
downloadpython-apt-eac4d047d8774def55b03cb82d505d237d93ea55.tar.gz
add .travis.yml & update python3 dependency to 3.3
This patch adds support for the travis-ci.org CI system. The "C" environment in .travis.yml is used to avoid having PPA python versions installed in the travis chroot. python3.3 is needed so that test_paths.py runs The tests_paths.py will only work with python3.3 as it uses the u"" prefix
-rw-r--r--.travis.yml19
-rw-r--r--debian/control6
-rw-r--r--po/python-apt.pot57
3 files changed, 49 insertions, 33 deletions
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..832b69e2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,19 @@
+# This provides integration into the travis-ci.org CI system. For a overview
+# check http://about.travis-ci.org/docs/user/getting-started/
+#
+# Some notes:
+# - language is "C" because the travis chroot for python installs a non-repo
+# python3.3 from a PPA
+# - we need to add the current stable ubuntu (or even the current development
+# ubuntu because we need a recent version of apt to build the python-apt
+# - we use ubuntu instead of debian because the travis chroot is ubuntu based
+# - ./debian/rules build-arch will build the package and run the tests
+language: c
+before_install:
+ - sudo apt-get update -q
+ - sudo apt-get install distro-info
+ - echo "deb http://archive.ubuntu.com/ubuntu $(distro-info --stable) main"|sudo tee -a /etc/apt/sources.list.d/added.list
+ - sudo apt-get update -q
+ - sudo apt-get install -q --no-install-recommends gdebi-core
+ - sudo apt-get install -q build-essential $(gdebi -q --apt-line ./debian/control)
+script: ./debian/rules build-arch
diff --git a/debian/control b/debian/control
index f4f52119..8fdb3941 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
Standards-Version: 3.9.4
XS-Python-Version: >= 2.6
-X-Python3-Version: >= 3.1
+X-Python3-Version: >= 3.3
Build-Depends: apt (>= 0.9.6),
apt-utils,
debhelper (>= 9),
@@ -13,8 +13,8 @@ Build-Depends: apt (>= 0.9.6),
libapt-pkg-dev (>= 0.8.11),
python-all-dev (>= 2.6.6-3~),
python-all-dbg,
- python3-all-dev (>= 3.1.2-10~),
- python3-all-dbg (>= 3.1.2-6~),
+ python3-all-dev (>= 3.3),
+ python3-all-dbg (>= 3.3),
python-distutils-extra (>= 2.0),
python-sphinx (>= 0.5),
python-debian,
diff --git a/po/python-apt.pot b/po/python-apt.pot
index 2d4f8250..8d8b1261 100644
--- a/po/python-apt.pot
+++ b/po/python-apt.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-31 22:31+0100\n"
+"POT-Creation-Date: 2014-01-01 09:20+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -465,7 +465,7 @@ msgid "Non-DFSG-compatible Software"
msgstr ""
#. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:211 ../aptsources/distro.py:441
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:442
#, python-format
msgid "Server for %s"
msgstr ""
@@ -505,16 +505,16 @@ msgstr ""
msgid "Complete"
msgstr ""
-#: ../apt/package.py:337
+#: ../apt/package.py:328
#, python-format
msgid "Invalid unicode in description for '%s' (%s). Please report."
msgstr ""
-#: ../apt/package.py:910 ../apt/package.py:1016
+#: ../apt/package.py:901 ../apt/package.py:1007
msgid "The list of changes is not available"
msgstr ""
-#: ../apt/package.py:1022
+#: ../apt/package.py:1013
#, python-format
msgid ""
"The list of changes is not available yet.\n"
@@ -523,94 +523,91 @@ msgid ""
"until the changes become available or try again later."
msgstr ""
-#: ../apt/package.py:1029
+#: ../apt/package.py:1020
msgid ""
"Failed to download the list of changes. \n"
"Please check your Internet connection."
msgstr ""
-#: ../apt/debfile.py:85
+#: ../apt/debfile.py:87
#, python-format
msgid "List of files for '%s' could not be read"
msgstr ""
-#: ../apt/debfile.py:96
+#: ../apt/debfile.py:99
#, python-format
msgid "List of control files for '%s' could not be read"
msgstr ""
-#: ../apt/debfile.py:217
+#: ../apt/debfile.py:224
#, python-format
msgid "Dependency is not satisfiable: %s\n"
msgstr ""
-#: ../apt/debfile.py:238
+#: ../apt/debfile.py:247
#, python-format
msgid "Conflicts with the installed package '%s'"
msgstr ""
-#. TRANSLATORS: the first '%s' is the package that breaks, the second the dependency that makes it break, the third the relation (e.g. >=) and the latest the version for the releation
-#: ../apt/debfile.py:379
+#: ../apt/debfile.py:394
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' dependency %(depname)s "
"(%(deprelation)s %(depversion)s)"
msgstr ""
-#. TRANSLATORS: the first '%s' is the package that conflicts, the second the packagename that it conflicts with (so the name of the deb the user tries to install), the third is the relation (e.g. >=) and the last is the version for the relation
-#: ../apt/debfile.py:395
+#: ../apt/debfile.py:421
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' conflict: %(targetpkg)s (%(comptype)s "
"%(targetver)s)"
msgstr ""
-#: ../apt/debfile.py:405
+#: ../apt/debfile.py:435
#, python-format
msgid ""
"Breaks existing package '%(pkgname)s' that conflict: '%(targetpkg)s'. But "
"the '%(debfile)s' provides it via: '%(provides)s'"
msgstr ""
-#: ../apt/debfile.py:453
+#: ../apt/debfile.py:486
msgid "No Architecture field in the package"
msgstr ""
-#: ../apt/debfile.py:463
+#: ../apt/debfile.py:496
#, python-format
msgid "Wrong architecture '%s'"
msgstr ""
-#. the deb is older than the installed
-#: ../apt/debfile.py:470
+#: ../apt/debfile.py:504
msgid "A later version is already installed"
msgstr ""
-#: ../apt/debfile.py:495
+#: ../apt/debfile.py:529
msgid "Failed to satisfy all dependencies (broken cache)"
msgstr ""
-#: ../apt/debfile.py:525
+#: ../apt/debfile.py:558
#, python-format
msgid "Cannot install '%s'"
msgstr ""
-#: ../apt/debfile.py:599
+#: ../apt/debfile.py:634
msgid ""
"Automatically decompressed:\n"
"\n"
msgstr ""
-#: ../apt/debfile.py:605
+#: ../apt/debfile.py:640
msgid "Automatically converted to printable ascii:\n"
msgstr ""
-#: ../apt/debfile.py:695
+#: ../apt/debfile.py:731
#, python-format
msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
msgstr ""
-#: ../apt/debfile.py:706
+#: ../apt/debfile.py:742
msgid "An essential package would be removed"
msgstr ""
@@ -635,11 +632,11 @@ msgstr ""
msgid "Get:"
msgstr ""
-#: ../apt/progress/text.py:203
+#: ../apt/progress/text.py:204
msgid " [Working]"
msgstr ""
-#: ../apt/progress/text.py:214
+#: ../apt/progress/text.py:215
#, python-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -648,16 +645,16 @@ msgid ""
msgstr ""
#. Trick for getting a translation from apt
-#: ../apt/progress/text.py:223
+#: ../apt/progress/text.py:224
#, python-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr ""
-#: ../apt/progress/text.py:239
+#: ../apt/progress/text.py:240
msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
msgstr ""
-#: ../apt/progress/text.py:255
+#: ../apt/progress/text.py:256
msgid "Please insert a Disc in the drive and press enter"
msgstr ""