Merge pull request #253252 from GaetanLepage/sypder-update
spyder: 5.4.2 -> 5.4.5
This commit is contained in:
commit
e7b8c1190e
|
@ -16,14 +16,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "qtconsole";
|
||||
version = "5.4.0";
|
||||
version = "5.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-V3SOov0mMgoLd626IBMc+7E4GMfJbYP6/LEQ/1X1izU=";
|
||||
hash = "sha256-t/+1PXTyPO4p9M21Xdb6vI7DEtlPPEa6OOHd5FhpPfs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "QtPy";
|
||||
version = "2.3.0";
|
||||
version = "2.4.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-BgPJyDzMA1pHF6EpCL9rxssiUJgn6i7A6Uwtp8ntV8U=";
|
||||
hash = "sha256-2y1QgWeqYQZ4FWXI2lxvFIfeusujNRnO3DX6iZfUJNQ=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder-kernels";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0aNkq4nacW2RZxup2J748ZZgaLug5HB5ekiWU4KcqvM=";
|
||||
hash = "sha256-NjuwoOFZTLaRY3RkGS9PGZaQlUaSUiQrQ8CSvzBaJd0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
@ -7,19 +7,16 @@
|
|||
, cloudpickle
|
||||
, cookiecutter
|
||||
, diff-match-patch
|
||||
, flake8
|
||||
, intervaltree
|
||||
, jedi
|
||||
, jellyfish
|
||||
, keyring
|
||||
, matplotlib
|
||||
, mccabe
|
||||
, nbconvert
|
||||
, numpy
|
||||
, numpydoc
|
||||
, psutil
|
||||
, pygments
|
||||
, pylint
|
||||
, pylint-venv
|
||||
, pyls-spyder
|
||||
, pyopengl
|
||||
|
@ -28,7 +25,6 @@
|
|||
, python-lsp-server
|
||||
, pyxdg
|
||||
, pyzmq
|
||||
, pycodestyle
|
||||
, qdarkstyle
|
||||
, qstylizer
|
||||
, qtawesome
|
||||
|
@ -45,14 +41,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "spyder";
|
||||
version = "5.4.2";
|
||||
version = "5.4.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-L8zgT7M7N+P5/9FQgf6ab7afUQXC1afzwUjAp6yKxC8=";
|
||||
hash = "sha256-/9p/8avjy1c3Dwos9Byx03kfVrRofVQus+Ae5beFnmo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
|
@ -1,24 +1,25 @@
|
|||
Don't remove sys.path entries that come from PYTHONPATH, or else the app cannot
|
||||
be used in Nixpkgs.
|
||||
|
||||
Author: Bjørn Forsman <bjorn.forsman@gmail.com>
|
||||
diff -uNr spyder-5.4.0.orig/spyder/app/start.py spyder-5.4.0/spyder/app/start.py
|
||||
--- spyder-5.4.0.orig/spyder/app/start.py 2022-08-30 02:02:28.000000000 +0200
|
||||
+++ spyder-5.4.0/spyder/app/start.py 2023-01-02 11:38:28.138744879 +0100
|
||||
@@ -6,16 +6,8 @@
|
||||
diff --git a/spyder/app/start.py b/spyder/app/start.py
|
||||
index 97b08a600..66486e510 100644
|
||||
--- a/spyder/app/start.py
|
||||
+++ b/spyder/app/start.py
|
||||
@@ -6,20 +6,8 @@
|
||||
# (see spyder/__init__.py for details)
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
|
||||
-# Remove PYTHONPATH paths from sys.path before other imports to protect against
|
||||
-# shadowed standard libraries.
|
||||
import os
|
||||
import sys
|
||||
-if os.environ.get('PYTHONPATH'):
|
||||
- for path in os.environ['PYTHONPATH'].split(os.pathsep):
|
||||
- try:
|
||||
- sys.path.remove(path.rstrip(os.sep))
|
||||
- except ValueError:
|
||||
- pass
|
||||
|
||||
- if os.name == 'nt' and 'pkgs' in path:
|
||||
- # Don't remove pynsist installer entry for 'pkgs' directory
|
||||
- continue
|
||||
- else:
|
||||
- try:
|
||||
- sys.path.remove(path.rstrip(os.sep))
|
||||
- except ValueError:
|
||||
- pass
|
||||
|
||||
# Standard library imports
|
||||
import ctypes
|
||||
|
|
Loading…
Reference in a new issue