summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--debian/changelog9
-rw-r--r--debian/control80
-rw-r--r--debian/copyright36
-rw-r--r--debian/patches/0004-Removed-pylint-dependency.patch26
-rw-r--r--debian/patches/Always-use-setuptools.patch4
-rw-r--r--debian/patches/Customize-paths-for-Debian.patch4
-rw-r--r--debian/patches/Remove-pyqt5-from-install-requires.patch8
-rw-r--r--debian/patches/help_images_static.patch63
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules2
-rw-r--r--debian/spyder-common.install2
-rw-r--r--setup.py5
12 files changed, 93 insertions, 148 deletions
diff --git a/debian/changelog b/debian/changelog
index 614fb03..d362d7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+spyder (3.3.6+dfsg1-2) unstable; urgency=medium
+
+ * Fixed by upstream in a previous release (Closes: #932987)
+ * d/copyright: MIT -> Expat (the real variant used)
+ * d/control: removed pylint3 build depends.
+ * d/patches: Added 0004-Removed-pylint-dependency.patch
+
+ -- Picca Frédéric-Emmanuel <picca@debian.org> Sun, 01 Sep 2019 14:44:51 +0200
+
spyder (3.3.6+dfsg1-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 0a9f664..4e12ee4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,7 @@ Section: science
Priority: optional
Build-Depends: debhelper-compat (= 12),
dh-python,
- python3-docutils,
pylint,
- pylint3,
python-all,
python-chardet,
python-cloudpickle,
@@ -19,17 +17,18 @@ Build-Depends: debhelper-compat (= 12),
python-psutil,
python-pycodestyle,
python-pyflakes,
- python-pygments (>= 2.0),
+ python-pygments,
python-qtawesome,
python-qtconsole,
python-qtpy,
python-rope (>= 0.10.5),
python-setuptools,
- python-zmq,
python-spyder-kernels,
+ python-zmq,
python3-all,
python3-chardet,
python3-cloudpickle,
+ python3-docutils,
python3-jedi (>= 0.9.0),
python3-keyring,
python3-nbconvert,
@@ -38,14 +37,14 @@ Build-Depends: debhelper-compat (= 12),
python3-psutil,
python3-pycodestyle,
python3-pyflakes,
- python3-pygments (>= 2.0),
+ python3-pygments,
python3-qtawesome,
python3-qtconsole,
python3-qtpy,
python3-rope,
python3-setuptools,
- python3-zmq,
- python3-spyder-kernels
+ python3-spyder-kernels,
+ python3-zmq
Standards-Version: 4.4.0
Vcs-Browser: https://salsa.debian.org/science-team/spyder
Vcs-Git: https://salsa.debian.org/science-team/spyder.git
@@ -54,12 +53,10 @@ Homepage: https://github.com/spyder-ide/spyder
Package: spyder
Architecture: all
Section: devel
-Depends: ${misc:Depends},
- ${python:Depends},
- python-spyder (= ${binary:Version})
-Breaks: ${python-Breaks},
- python-spyderlib (<< 2.3.0+dfsg-2)
-Replaces: python-spyderlib (<< 2.3.0+dfsg-2)
+Depends: python-spyder (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Breaks: ${python-Breaks}
Description: Python IDE for scientists (Python 2)
Spyder (previously known as Pydee) is a free open-source Python
development environment providing MATLAB-like features in a simple
@@ -70,8 +67,7 @@ Description: Python IDE for scientists (Python 2)
Package: python-spyderlib
Architecture: all
Section: oldlibs
-Depends: ${misc:Depends},
- python-spyder
+Depends: python-spyder, ${misc:Depends}
Description: transitional dummy package for python-spyder
This is a transitional package to ease upgrades to the
python-spyder package. It can be safely removed.
@@ -79,25 +75,22 @@ Description: transitional dummy package for python-spyder
Package: python-spyder
Architecture: all
Section: python
-Depends: ${misc:Depends},
- ${python:Depends},
- libjs-jquery,
+Depends: libjs-jquery,
libjs-mathjax,
- spyder-common (= ${binary:Version})
+ pylint,
+ spyder-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Suggests: cython,
python-matplotlib,
python-numpy,
python-pandas,
python-pil,
python-scipy,
- python-sympy,
-Breaks: ${python:Breaks},
- python-spyderlib (<< 3.0.0+dfsg1-1~),
- spyder (<< 2.3.0+dfsg-2)
-Provides: ${python:Provides},
- python-spyderlib
-Replaces: python-spyderlib (<< 3.0.0+dfsg1-1~),
- spyder (<< 2.0.12-1)
+ python-sympy
+Breaks: python-spyderlib (<< 3.0.0+dfsg1-1~), ${python:Breaks}
+Provides: python-spyderlib, ${python:Provides}
+Replaces: python-spyderlib (<< 3.0.0+dfsg1-1~)
Description: public modules for spyder (Python 2)
Originally written to design Spyder (the Scientific PYthon
Development EnviRonment), the spyderlib Python library provides
@@ -112,12 +105,10 @@ Description: public modules for spyder (Python 2)
Package: spyder3
Architecture: all
Section: devel
-Depends: ${misc:Depends},
- ${python3:Depends},
- python3-spyder (= ${binary:Version})
-Breaks: ${python3-Breaks},
- python3-spyderlib (<< 2.3.0+dfsg-2)
-Replaces: python3-spyderlib (<< 2.3.0+dfsg-2)
+Depends: python3-spyder (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends}
+Breaks: ${python3-Breaks}
Description: Python IDE for scientists (Python 3)
Spyder (previously known as Pydee) is a free open-source Python
development environment providing MATLAB-like features in a simple
@@ -128,8 +119,7 @@ Description: Python IDE for scientists (Python 3)
Package: python3-spyderlib
Architecture: all
Section: oldlibs
-Depends: ${misc:Depends},
- python3-spyder
+Depends: python3-spyder, ${misc:Depends}
Description: transitional dummy package for python3-spyder
This is a transitional package to ease upgrades to the
python3-spyder package. It can be safely removed.
@@ -137,24 +127,22 @@ Description: transitional dummy package for python3-spyder
Package: python3-spyder
Architecture: all
Section: python
-Depends: ${misc:Depends},
- ${python3:Depends},
- python3-keyring,
- libjs-jquery,
+Depends: libjs-jquery,
libjs-mathjax,
- spyder-common (= ${binary:Version})
+ pylint,
+ python3-keyring,
+ spyder-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends}
Suggests: cython3,
python3-matplotlib,
python3-numpy,
python3-pandas,
python3-pil,
python3-scipy,
- python3-sympy,
-Breaks: ${python3:Breaks},
- python3-spyderlib (<< 3.0.0+dfsg1-1~),
- spyder3 (<< 2.3.0+dfsg-2)
-Provides: ${python3:Provides},
- python3-spyderlib
+ python3-sympy
+Breaks: python3-spyderlib (<< 3.0.0+dfsg1-1~), ${python3:Breaks}
+Provides: python3-spyderlib, ${python3:Provides}
Replaces: python3-spyderlib (<< 3.0.0+dfsg1-1~)
Description: public modules for spyder (Python 3)
Originally written to design Spyder (the Scientific PYthon
diff --git a/debian/copyright b/debian/copyright
index 6e12e7b..2d52725 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,10 +7,10 @@ Files-Excluded: spyder/utils/help/js/mathjax
Files: *
Copyright: © 2009- Spyder Project Contributors:
- Pierre Raybaut <pierre.raybaut@gmail.com> (Main Spyder author)
- Carlos Cordoba <ccordoba12@gmail.com> (Current maintainer)
- and others (see AUTHORS.txt)
-License: MIT
+ Pierre Raybaut <pierre.raybaut@gmail.com> (Main Spyder author)
+ Carlos Cordoba <ccordoba12@gmail.com> (Current maintainer)
+ and others (see AUTHORS.txt)
+License: Expat
Files: debian/*
Copyright: © 2009-2010 Ludovic Aubry <laubrycomm@free.fr>
@@ -82,7 +82,7 @@ Files: spyder/images/arredit.png
spyder/images/console/ipython_console.png
spyder/images/console/ipython_console_t.png
Copyright: © 2009-2013 Pierre Raybaut
-License: MIT
+License: Expat
Files: spyder/images/advanced.png
spyder/images/arrow.png
@@ -1389,7 +1389,7 @@ License: PSFL
alone or in any derivative version, provided, however, that PSF's
License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version
+ Reserved" are retained in Python alone or in any derivative version
prepared by Licensee.
.
3. In the event Licensee prepares a derivative work that is based on
@@ -1568,30 +1568,6 @@ License: PSFL
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-License: MIT
- MIT License
- .
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the "Software"), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
License: zlib
The zlib/libpng License
.
diff --git a/debian/patches/0004-Removed-pylint-dependency.patch b/debian/patches/0004-Removed-pylint-dependency.patch
new file mode 100644
index 0000000..77fb4c0
--- /dev/null
+++ b/debian/patches/0004-Removed-pylint-dependency.patch
@@ -0,0 +1,26 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@debian.org>
+Date: Sun, 1 Sep 2019 14:41:46 +0200
+Subject: Removed pylint dependency
+
+dh_python3 generate a pylint3 dependency. So we need to remove it, until
+it is fixed by the dh-python upstream
+---
+ setup.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 63393c7..539c812 100644
+--- a/setup.py
++++ b/setup.py
+@@ -224,7 +224,10 @@ install_requires = [
+ 'nbconvert',
+ 'sphinx',
+ 'pycodestyle',
+- 'pylint',
++ # dh_python3 automatically convert pylint dependency into pylin3.
++ # until it is fixed by dh_python3, just remote it and add it byhand in
++ # the control file
++ #'pylint',
+ 'psutil',
+ 'qtawesome>=0.5.7',
+ 'qtpy>=1.5.0',
diff --git a/debian/patches/Always-use-setuptools.patch b/debian/patches/Always-use-setuptools.patch
index 504aedc..d302295 100644
--- a/debian/patches/Always-use-setuptools.patch
+++ b/debian/patches/Always-use-setuptools.patch
@@ -6,9 +6,11 @@ Subject: Always use setuptools
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/setup.py b/setup.py
+index 37b3a0a..c0948d1 100644
--- a/setup.py
+++ b/setup.py
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ import subprocess
import sys
import shutil
diff --git a/debian/patches/Customize-paths-for-Debian.patch b/debian/patches/Customize-paths-for-Debian.patch
index 187e671..365c90c 100644
--- a/debian/patches/Customize-paths-for-Debian.patch
+++ b/debian/patches/Customize-paths-for-Debian.patch
@@ -7,9 +7,11 @@ Subject: Customize paths for Debian
spyder/__init__.py | 5 +++++
1 file changed, 5 insertions(+)
+diff --git a/spyder/__init__.py b/spyder/__init__.py
+index 890ecbc..aee35ea 100644
--- a/spyder/__init__.py
+++ b/spyder/__init__.py
-@@ -42,6 +42,11 @@
+@@ -42,6 +42,11 @@ __website_url__ = 'https://www.spyder-ide.org/'
# Dear (Debian, RPM, ...) package makers, please feel free to customize the
# following path to module's data (images) and translations:
DATAPATH = LOCALEPATH = DOCPATH = MATHJAXPATH = JQUERYPATH = ''
diff --git a/debian/patches/Remove-pyqt5-from-install-requires.patch b/debian/patches/Remove-pyqt5-from-install-requires.patch
index bd48021..f7caa33 100644
--- a/debian/patches/Remove-pyqt5-from-install-requires.patch
+++ b/debian/patches/Remove-pyqt5-from-install-requires.patch
@@ -3,12 +3,14 @@ Date: Sun, 4 Mar 2018 16:48:14 +0000
Subject: Remove pyqt5 from install requires
---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/setup.py b/setup.py
+index c0948d1..63393c7 100644
--- a/setup.py
+++ b/setup.py
-@@ -238,10 +238,10 @@
+@@ -238,10 +238,10 @@ install_requires = [
'keyring;sys_platform!="linux2"',
# Packages for pyqt5 are only available in
# Python 3
diff --git a/debian/patches/help_images_static.patch b/debian/patches/help_images_static.patch
deleted file mode 100644
index b04e404..0000000
--- a/debian/patches/help_images_static.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: spyder/spyder/utils/help/tutorial.rst
-===================================================================
---- spyder.orig/spyder/utils/help/tutorial.rst
-+++ spyder/spyder/utils/help/tutorial.rst
-@@ -142,7 +142,7 @@ The Spyder environment also provides a :
-
- While the cursor is on the name of an object, press :kbd:`Ctrl-I` (or :kbd:`Command-I` on macOS), and you should find that the same information as we obtained from ``help(hello)`` is provided automatically in the :guilabel:`Help` pane:
-
--.. image:: images/spyder-hello-docstring.png
-+.. image:: static/images/spyder-hello-docstring.png
- :align: center
-
- This works in the :guilabel:`Console` and in the :guilabel:`Editor`.
-@@ -331,7 +331,7 @@ You'll need to have SymPy installed for
-
- We can now use the variables ``x`` and ``y``, for example like this:
-
--.. image:: images/spyder-sympy-example.png
-+.. image:: static/images/spyder-sympy-example.png
- :align: center
-
-
-@@ -557,7 +557,7 @@ If you follow those guidelines, you can
-
- For example, to get an ``average()`` function look like this in the Spyder :guilabel:`Help` pane:
-
--.. image:: images/spyder-nice-docstring-rendering.png
-+.. image:: static/images/spyder-nice-docstring-rendering.png
- :align: center
-
- you need to format the documentation string as follows:
-@@ -611,19 +611,19 @@ The :guilabel:`Editor` pane will then hi
-
- After entering debug mode, you can execute the code line by line using the ``Step`` button of the :guilabel:`Debug` toolbar:
-
--.. image:: images/debug-step-over.png
-+.. image:: static/images/debug-step-over.png
- :align: center
-
- or the shortcut :kbd:`Ctrl-F10`.
- You can also inspect how a particular function is working by stepping into it with the ``Step Into`` button
-
--.. image:: images/debug-step-in.png
-+.. image:: static/images/debug-step-in.png
- :align: center
-
- or the shortcut :kbd:`Ctrl-F11`.
- Finally, to get out of a function and continue with the next line you need to use the ``Step Return`` button
-
--.. image:: images/debug-step-out.png
-+.. image:: static/images/debug-step-out.png
- :align: center
-
- or the shortcut :kbd:`Ctrl-Shift-F12`.
-@@ -634,7 +634,7 @@ A red dot in this position indicates a b
-
- After entering the Debugger, you can press the ``Continue`` button
-
--.. image:: images/debug-continue.png
-+.. image:: static/images/debug-continue.png
- :align: center
-
- to stop the execution at the first breakpoint.
diff --git a/debian/patches/series b/debian/patches/series
index d8a6170..cce59a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
Customize-paths-for-Debian.patch
Always-use-setuptools.patch
Remove-pyqt5-from-install-requires.patch
-#help_images_static.patch
+0004-Removed-pylint-dependency.patch
diff --git a/debian/rules b/debian/rules
index e841acb..98f9616 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
export PYBUILD_NAME=spyder
export PYBUILD_DESTDIR_python2=debian/python-$(PYBUILD_NAME)
diff --git a/debian/spyder-common.install b/debian/spyder-common.install
index 2a60535..4d6d73c 100644
--- a/debian/spyder-common.install
+++ b/debian/spyder-common.install
@@ -1,2 +1,2 @@
-spyder/locale usr/share/spyder
spyder/images usr/share/spyder
+spyder/locale usr/share/spyder
diff --git a/setup.py b/setup.py
index 63393c7..539c812 100644
--- a/setup.py
+++ b/setup.py
@@ -224,7 +224,10 @@ install_requires = [
'nbconvert',
'sphinx',
'pycodestyle',
- 'pylint',
+ # dh_python3 automatically convert pylint dependency into pylin3.
+ # until it is fixed by dh_python3, just remote it and add it byhand in
+ # the control file
+ #'pylint',
'psutil',
'qtawesome>=0.5.7',
'qtpy>=1.5.0',
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:35:36 +0000