public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/
@ 2017-09-20  9:47 Andrey Grozin
  0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2017-09-20  9:47 UTC (permalink / raw
  To: gentoo-commits

commit:     482430823384e3d81feaf4a47edcd491be65ca13
Author:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 09:45:46 2017 +0000
Commit:     Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 09:47:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48243082

dev-python/spyder: adding the forgotten patch

Bug: https://bugs.gentoo.org/613396
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-python/spyder/files/spyder-3.2.3-build.patch | 130 +++++++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/dev-python/spyder/files/spyder-3.2.3-build.patch b/dev-python/spyder/files/spyder-3.2.3-build.patch
new file mode 100644
index 00000000000..2a1fee52131
--- /dev/null
+++ b/dev-python/spyder/files/spyder-3.2.3-build.patch
@@ -0,0 +1,130 @@
+--- spyder-3.2.3.orig/setup.py	2017-08-29 00:42:56.000000000 +0200
++++ spyder-3.2.3/setup.py	2017-09-16 20:57:08.610147911 +0200
+@@ -77,13 +77,7 @@
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/pixmaps', ['img_src/spyder.png'])]
++        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -106,102 +100,6 @@
+ 
+ 
+ #==============================================================================
+-# Make Linux detect Spyder desktop file
+-#==============================================================================
+-class MyInstallData(install_data):
+-    def run(self):
+-        install_data.run(self)
+-        if sys.platform.startswith('linux'):
+-            try:
+-                subprocess.call(['update-desktop-database'])
+-            except:
+-                print("ERROR: unable to update desktop database",
+-                      file=sys.stderr)
+-CMDCLASS = {'install_data': MyInstallData}
+-
+-
+-#==============================================================================
+-# Sphinx build (documentation)
+-#==============================================================================
+-def get_html_help_exe():
+-    """Return HTML Help Workshop executable path (Windows only)"""
+-    if os.name == 'nt':
+-        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
+-        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
+-            if osp.isfile(hhc_exe):
+-                return hhc_exe
+-        else:
+-            return
+-
+-try:
+-    from sphinx import setup_command
+-
+-    class MyBuild(build):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + build.user_options
+-        def __init__(self, *args, **kwargs):
+-            build.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-        def with_doc(self):
+-            setup_dir = os.path.dirname(os.path.abspath(__file__))
+-            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
+-            install_obj = self.distribution.get_command_obj('install')
+-            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
+-        sub_commands = build.sub_commands + [('build_doc', with_doc)]
+-    CMDCLASS['build'] = MyBuild
+-
+-
+-    class MyInstall(install):
+-        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
+-                       + install.user_options
+-        def __init__(self, *args, **kwargs):
+-            install.__init__(self, *args, **kwargs)
+-            self.no_doc = False
+-    CMDCLASS['install'] = MyInstall
+-
+-
+-    class MyBuildDoc(setup_command.BuildDoc):
+-        def run(self):
+-            build = self.get_finalized_command('build')
+-            sys.path.insert(0, os.path.abspath(build.build_lib))
+-            dirname = self.distribution.get_command_obj('build').build_purelib
+-            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
+-
+-            if not osp.exists(self.builder_target_dir):
+-                os.mkdir(self.builder_target_dir)
+-
+-            hhc_exe = get_html_help_exe()
+-            self.builder = "html" if hhc_exe is None else "htmlhelp"
+-
+-            try:
+-                setup_command.BuildDoc.run(self)
+-            except UnicodeDecodeError:
+-                print("ERROR: unable to build documentation because Sphinx "\
+-                      "do not handle source path with non-ASCII characters. "\
+-                      "Please try to move the source package to another "\
+-                      "location (path with *only* ASCII characters).",
+-                      file=sys.stderr)
+-            sys.path.pop(0)
+-
+-            # Building chm doc, if HTML Help Workshop is installed
+-            if hhc_exe is not None:
+-                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
+-                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
+-                if osp.isfile(fname):
+-                    dest = osp.join(dirname, 'spyder')
+-                    try:
+-                        shutil.move(fname, dest)
+-                    except shutil.Error:
+-                        print("Unable to replace %s" % dest)
+-                    shutil.rmtree(self.builder_target_dir)
+-
+-    CMDCLASS['build_doc'] = MyBuildDoc
+-except ImportError:
+-    print('WARNING: unable to build documentation because Sphinx '\
+-          'is not installed', file=sys.stderr)
+-
+-
+-#==============================================================================
+ # Main scripts
+ #==============================================================================
+ # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
+@@ -261,8 +159,7 @@
+                    'Programming Language :: Python :: 3',
+                    'Development Status :: 5 - Production/Stable',
+                    'Topic :: Scientific/Engineering',
+-                   'Topic :: Software Development :: Widget Sets'],
+-      cmdclass=CMDCLASS)
++                   'Topic :: Software Development :: Widget Sets'])
+ 
+ 
+ #==============================================================================


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/
@ 2020-12-12 15:58 Mike Gilbert
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Gilbert @ 2020-12-12 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     9f6bf3b7c0337f5ff4f40f53bbdbdb4dca5f0d89
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec 12 08:05:26 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 15:58:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6bf3b7

dev-python/spyder: remove unused patch

Package-Manager: Portage-3.0.11, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../spyder/files/spyder-4.1.2-py3-only.patch       | 55 ----------------------
 1 file changed, 55 deletions(-)

diff --git a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch b/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
deleted file mode 100644
index afdc92a1e12..00000000000
--- a/dev-python/spyder/files/spyder-4.1.2-py3-only.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2d5d58b..4adc952 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,13 +31,6 @@ import shutil
- from distutils.core import setup
- from distutils.command.install_data import install_data
- 
--
--#==============================================================================
--# Check for Python 3
--#==============================================================================
--PY3 = sys.version_info[0] == 3
--
--
- #==============================================================================
- # Minimal Python version sanity check
- # Taken from the notebook setup.py -- Modified BSD License
-@@ -87,13 +80,8 @@ def get_subpackages(name):
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/icons', ['img_src/spyder.png'])]
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-+                      ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -131,9 +119,7 @@ CMDCLASS = {'install_data': MyInstallData}
- # See spyder-ide/spyder#1158.
- SCRIPTS = ['%s_win_post_install.py' % NAME]
- 
--if PY3 and sys.platform.startswith('linux'):
--    SCRIPTS.append('spyder3')
--else:
-+if sys.platform.startswith('linux'):
-     SCRIPTS.append('spyder')
- 
- if os.name == 'nt':
-@@ -269,8 +255,7 @@ if 'setuptools' in sys.modules:
- 
-     setup_args['entry_points'] = {
-         'gui_scripts': [
--            '{} = spyder.app.start:main'.format(
--                'spyder3' if PY3 else 'spyder')
-+            '{} = spyder.app.start:main'.format('spyder')
-         ]
-     }
- 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/
@ 2022-01-24 19:12 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2022-01-24 19:12 UTC (permalink / raw
  To: gentoo-commits

commit:     d9a33f14c3d9de55bf7c0215c9f588031cf303e5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Jan 24 19:01:36 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon Jan 24 19:12:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a33f14

dev-python/spyder: remove unused patches

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/23945
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/spyder-4.1.5-doc-theme-renamed.patch     | 13 --------
 dev-python/spyder/files/spyder-4.2.1-build.patch   | 36 ----------------------
 .../files/spyder-5.0.1-doc-theme-renamed.patch     | 13 --------
 3 files changed, 62 deletions(-)

diff --git a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
deleted file mode 100644
index 8a93662950f0..000000000000
--- a/dev-python/spyder/files/spyder-4.1.5-doc-theme-renamed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/doc/conf.py b/docs/doc/conf.py
-index fd6d5ec..3de0bad 100644
---- a/docs/doc/conf.py
-+++ b/docs/doc/conf.py
-@@ -129,7 +129,7 @@ pygments_style = "sphinx"
- #
- # CI = True
- # TRAVIS_BRANCH = 'master'
--html_theme = "pandas_sphinx_theme"
-+html_theme = "pydata_sphinx_theme"
- html_logo = '_static/spyder_logo.png'
- html_theme_options = {
-     "external_links": [

diff --git a/dev-python/spyder/files/spyder-4.2.1-build.patch b/dev-python/spyder/files/spyder-4.2.1-build.patch
deleted file mode 100644
index 38d3356b0b3d..000000000000
--- a/dev-python/spyder/files/spyder-4.2.1-build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 0c47210..20b95c0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -97,21 +97,6 @@ def get_packages():
-     return packages
- 
- 
--#==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
- #==============================================================================
- # Main scripts
- #==============================================================================
-@@ -177,8 +162,7 @@ def run(self):
-         'Intended Audience :: Developers',
-         'Topic :: Scientific/Engineering',
-         'Topic :: Software Development :: Widget Sets'
--    ],
--    cmdclass=CMDCLASS)
-+    ])
- 
- 
- #==============================================================================

diff --git a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
deleted file mode 100644
index 5edf7e854d0b..000000000000
--- a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/doc/conf.py b/doc/conf.py
-index a3dc817..f428860 100644
---- a/docs/doc/conf.py
-+++ b/docs/doc/conf.py
-@@ -143,7 +143,7 @@
- #
- # CI = True
- # TRAVIS_BRANCH = 'master'
--html_theme = "pandas_sphinx_theme"
-+html_theme = "pydata_sphinx_theme"
- html_logo = '_static/images/spyder_logo.png'
- html_theme_options = {
-     "external_links": [


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/
@ 2023-04-09 19:33 Andrew Ammerlaan
  0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2023-04-09 19:33 UTC (permalink / raw
  To: gentoo-commits

commit:     de8f90a9de644534aa798233c2e0489a13db97f8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr  8 17:15:03 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr  9 19:33:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de8f90a9

dev-python/spyder: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30520
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/spyder-5.4.0-unpin-qdarkstyle.patch      | 26 ----------------------
 1 file changed, 26 deletions(-)

diff --git a/dev-python/spyder/files/spyder-5.4.0-unpin-qdarkstyle.patch b/dev-python/spyder/files/spyder-5.4.0-unpin-qdarkstyle.patch
deleted file mode 100644
index 87b97a94b34a..000000000000
--- a/dev-python/spyder/files/spyder-5.4.0-unpin-qdarkstyle.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 1aa7f96..5345b0a 100644
---- a/setup.py
-+++ b/setup.py
-@@ -232,7 +232,7 @@ install_requires = [
-     'python-lsp-server[all]>=1.6.0,<1.7.0',
-     'pyxdg>=0.26;platform_system=="Linux"',
-     'pyzmq>=22.1.0',
--    'qdarkstyle>=3.0.2,<3.1.0',
-+    'qdarkstyle>=3.0.2',
-     'qstylizer>=0.2.2',
-     'qtawesome>=1.2.1',
-     'qtconsole>=5.4.0,<5.5.0',
-diff --git a/spyder/dependencies.py b/spyder/dependencies.py
-index 244a161..f44d045 100644
---- a/spyder/dependencies.py
-+++ b/spyder/dependencies.py
-@@ -58,7 +58,7 @@ PYLSP_BLACK_REQVER = '>=1.2.0'
- PYLS_SPYDER_REQVER = '>=0.4.0'
- PYXDG_REQVER = '>=0.26'
- PYZMQ_REQVER = '>=22.1.0'
--QDARKSTYLE_REQVER = '>=3.0.2;<3.1.0'
-+QDARKSTYLE_REQVER = '>=3.0.2'
- QSTYLIZER_REQVER = '>=0.2.2'
- QTAWESOME_REQVER = '>=1.2.1'
- QTCONSOLE_REQVER = '>=5.4.0;<5.5.0'


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/
@ 2024-10-13 13:43 Conrad Kostecki
  0 siblings, 0 replies; 5+ messages in thread
From: Conrad Kostecki @ 2024-10-13 13:43 UTC (permalink / raw
  To: gentoo-commits

commit:     c6164f8a06230161699d52bdb849cc37e4e1be00
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 12 17:38:53 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 13:40:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6164f8a

dev-python/spyder: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38957
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../spyder/files/spyder-5.2.0-doc-theme-renamed.patch       | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch
deleted file mode 100644
index 08403d90fd9d..000000000000
--- a/dev-python/spyder/files/spyder-5.2.0-doc-theme-renamed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/docs/doc/conf.py b/docs/doc/conf.py
-index 92a4b65..412fd39 100644
---- a/docs/doc/conf.py
-+++ b/docs/doc/conf.py
-@@ -145,7 +145,7 @@
- #
- # CI = True
- # TRAVIS_BRANCH = 'master'
--html_theme = "pandas_sphinx_theme"
-+html_theme = "pydata_sphinx_theme"
- html_logo = "_static/images/spyder_logo.png"
- html_theme_options = {
-     "external_links": [


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2024-10-13 13:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-12 15:58 [gentoo-commits] repo/gentoo:master commit in: dev-python/spyder/files/ Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2024-10-13 13:43 Conrad Kostecki
2023-04-09 19:33 Andrew Ammerlaan
2022-01-24 19:12 Andrew Ammerlaan
2017-09-20  9:47 Andrey Grozin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox