aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-10-20 12:37:58 +0200
committerGuido Günther <agx@sigxcpu.org>2017-10-20 12:37:58 +0200
commitccfa5631aac53f2f4198f8064a290354cd07bcef (patch)
tree5766fe62e52255b7d08651b9e01955048a750c8c
parentf55ba3f8281d5a37d2aa51d9b4b3a8a9e5da5aa5 (diff)
No need to depend on six anymore
-rw-r--r--debian/control2
-rw-r--r--packaging/git-buildpackage.spec1
-rw-r--r--requirements.txt1
-rwxr-xr-xsetup.py3
4 files changed, 1 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index dd58b4d4..49a3bd7e 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
python3-nosexcover,
python3-pkg-resources,
python3-rpm,
- python3-six,
python3-setuptools,
xsltproc,
# For the testsuite
@@ -51,7 +50,6 @@ Depends: ${python3:Depends},
man-db,
python3-dateutil,
python3-pkg-resources,
- python3-six,
Recommends: pristine-tar (>= 0.5),
cowbuilder | pbuilder | sbuild,
python3-requests
diff --git a/packaging/git-buildpackage.spec b/packaging/git-buildpackage.spec
index f9f36824..7c27ed62 100644
--- a/packaging/git-buildpackage.spec
+++ b/packaging/git-buildpackage.spec
@@ -83,7 +83,6 @@ This package contains the original Debian tools.
Summary: Common files for git-buildpackage debian and rpm tools
Group: Development/Tools/Building
Requires: git-core
-Requires: python3-six
Requires: %{man_pkg_name}
Requires: %{python_pkg_name}
Requires: python3-setuptools
diff --git a/requirements.txt b/requirements.txt
index 3730135c..0f08daac 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
python-dateutil
-six>=1.9.0
diff --git a/setup.py b/setup.py
index bf4f7bb7..6107ca71 100755
--- a/setup.py
+++ b/setup.py
@@ -73,10 +73,9 @@ setup(name="gbp",
'bin/gbp-builder-mock'],
packages=find_packages(exclude=['tests', 'tests.*']),
data_files=[("share/git-buildpackage/", ["gbp.conf"]), ],
- requires=["six", 'dateutil'],
+ requires=['dateutil'],
install_requires=[
'python-dateutil',
- 'six>=1.9.0',
],
setup_requires=setup_requires(),
entry_points={