[spyder] 03/05: Let dh-python populate the spyder dependencies
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue May 16 17:18:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch experimental
in repository spyder.
commit 78ae95ec379cf6a5a5828acb460a1907f400913d
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Sat May 13 15:50:38 2017 +0100
Let dh-python populate the spyder dependencies
- Upstream added the necessary setuptools metadata
- Build depends on the corresponding packages
- Drop manual listing of the install dependencies
- New patch Always-use-setuptools.patch, ensure setuptools is used
for all builds
- New patch Fixup-rope-dependency.patch, allow Python 3 builds with a
recent version of rope instead of rope_py3k
Gbp-Dch: full
---
debian/control | 66 ++++++++++++++----------------
debian/patches/Always-use-setuptools.patch | 21 ++++++++++
debian/patches/Fixup-rope-dependency.patch | 21 ++++++++++
debian/patches/series | 2 +
4 files changed, 74 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index 4e3863d..47c8243 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,42 @@ Section: science
Priority: extra
Build-Depends: debhelper (>= 10),
dh-python,
+ pylint,
+ pylint3,
python-all,
+ python-chardet (>= 2.0.0),
+ python-jedi,
+ python-nbconvert,
+ python-numpydoc,
+ python-pickleshare,
+ python-psutil,
+ python-pycodestyle,
+ python-pyflakes,
+ python-pygments (>= 2.0),
+ python-qtawesome (>= 0.4.1),
+ python-qtconsole (>= 4.2.0),
+ python-qtpy,
+ python-rope,
python-setuptools,
python-sphinx,
+ python-zmq,
python3-all,
+ python3-chardet (>= 2.0.0),
+ python3-jedi,
+ python3-nbconvert,
+ python3-numpydoc,
+ python3-pickleshare,
+ python3-psutil,
+ python3-pycodestyle,
+ python3-pyflakes,
+ python3-pygments (>= 2.0),
+ python3-qtawesome (>= 0.4.1),
+ python3-qtconsole (>= 4.2.0),
+ python3-qtpy,
+ python3-rope,
python3-setuptools,
python3-sphinx,
- xsltproc
+ python3-zmq
Standards-Version: 3.9.8
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/spyder.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/spyder.git
@@ -52,23 +81,6 @@ Depends: ${misc:Depends},
${python:Depends},
libjs-jquery,
libjs-mathjax,
- pep8,
- pylint,
- python-bs4,
- python-chardet,
- python-jedi,
- python-nbconvert,
- python-numpydoc,
- python-pep8,
- python-pickleshare,
- python-psutil,
- python-pyflakes,
- python-pygments,
- python-qtawesome (>= 0.4.1),
- python-qtconsole,
- python-qtpy (>= 1.1.0),
- python-sphinx,
- python-zmq,
spyder-common (= ${binary:Version})
Recommends: python-matplotlib,
python-numpy,
@@ -76,7 +88,6 @@ Recommends: python-matplotlib,
python-scipy,
spyder-doc (= ${binary:Version})
Suggests: gitk,
- python-rope,
tortoisehg
Breaks: ${python:Breaks},
python-spyderlib (<< 3.0.0+dfsg1-1~),
@@ -157,23 +168,6 @@ Depends: ${misc:Depends},
${python3:Depends},
libjs-jquery,
libjs-mathjax,
- pep8,
- pylint,
- python3-bs4,
- python3-chardet,
- python3-jedi,
- python3-nbconvert,
- python3-numpydoc,
- python3-pep8,
- python3-pickleshare,
- python3-psutil,
- python3-pyflakes,
- python3-pygments,
- python3-qtawesome (>= 0.4.1),
- python3-qtconsole,
- python3-qtpy (>= 1.1.0),
- python3-sphinx,
- python3-zmq,
spyder-common (= ${binary:Version})
Recommends: python3-matplotlib,
python3-numpy,
diff --git a/debian/patches/Always-use-setuptools.patch b/debian/patches/Always-use-setuptools.patch
new file mode 100644
index 0000000..2da0ea9
--- /dev/null
+++ b/debian/patches/Always-use-setuptools.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sat, 13 May 2017 18:08:39 +0100
+Subject: Always use setuptools
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 9d022d0..86ded99 100644
+--- a/setup.py
++++ b/setup.py
+@@ -19,7 +19,7 @@ import subprocess
+ import sys
+ import shutil
+
+-from distutils.core import setup
++from setuptools import setup
+ from distutils.command.build import build
+ from distutils.command.install import install
+ from distutils.command.install_data import install_data
diff --git a/debian/patches/Fixup-rope-dependency.patch b/debian/patches/Fixup-rope-dependency.patch
new file mode 100644
index 0000000..c8d763b
--- /dev/null
+++ b/debian/patches/Fixup-rope-dependency.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Sat, 13 May 2017 18:15:47 +0100
+Subject: Fixup rope dependency
+
+---
+ setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 86ded99..d84d77b 100644
+--- a/setup.py
++++ b/setup.py
+@@ -272,7 +272,7 @@ if any(arg == 'bdist_wheel' for arg in sys.argv):
+ import setuptools # analysis:ignore
+
+ install_requires = [
+- 'rope_py3k' if PY3 else 'rope>=0.9.4',
++ 'rope>=0.10.5' if PY3 else 'rope>=0.9.4',
+ 'jedi>=0.9.0',
+ 'pyflakes',
+ 'pygments>=2.0',
diff --git a/debian/patches/series b/debian/patches/series
index ba8e634..9c48a63 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
0001-fix-spyderlib-path.patch
+Always-use-setuptools.patch
+Fixup-rope-dependency.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git
More information about the debian-science-commits
mailing list