From 2f846f433216234d4d46aff3cc7b34fd77e70b48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:15:34 +0100 Subject: [PATCH 1/8] python310Packages.python-lsp-server: add changelog to meta --- pkgs/development/python-modules/python-lsp-server/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 62e6ce951bde..5d82d797a128 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + hash = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -150,6 +150,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the Language Server Protocol"; homepage = "https://github.com/python-lsp/python-lsp-server"; + changelog = "https://github.com/python-lsp/python-lsp-server/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 91bdfd4592afee9df43cb334c4e051c8a0c5d41a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 11:21:58 +0100 Subject: [PATCH 2/8] python310Packages.rope: add changelog to meta --- pkgs/development/python-modules/rope/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index 21d5886efe21..c90dd8568a87 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,4 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, nose +}: buildPythonPackage rec { pname = "rope"; @@ -18,7 +23,10 @@ buildPythonPackage rec { }) ]; - checkInputs = [ nose ]; + checkInputs = [ + nose + ]; + checkPhase = '' # tracked upstream here https://github.com/python-rope/rope/issues/247 NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest @@ -27,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python refactoring library"; homepage = "https://github.com/python-rope/rope"; - maintainers = with maintainers; [ goibhniu ]; + changelog = "https://github.com/python-rope/rope/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ goibhniu ]; }; } From 55f9c51b62c2f06d2ae7dd4038b1b4536cba47ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:00:57 +0100 Subject: [PATCH 3/8] python310Packages.rope: 0.18.0 -> 1.6.0 Changelog: https://github.com/python-rope/rope/blob/1.6.0/CHANGELOG.md --- .../python-modules/rope/default.nix | 51 ++++++++++++------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c90dd8568a87..f831e7af40c0 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -1,36 +1,49 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch -, nose +, fetchFromGitHub +, pytest-timeout +, pytestCheckHook +, pythonOlder +, setuptools +, pytoolconfig }: buildPythonPackage rec { pname = "rope"; - version = "0.18.0"; + version = "1.6.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "786b5c38c530d4846aa68a42604f61b4e69a493390e3ca11b88df0fbfdc3ed04"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "python-rope"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-avNCti288dY9pl5AVTmUzZU/vb6WDkXEtELNlEi6L/o="; }; - patches = [ - # Python 3.9 ast changes - (fetchpatch { - url = "https://github.com/python-rope/rope/pull/333.patch"; - excludes = [ ".github/workflows/main.yml" ]; - sha256 = "1gq7n1zs18ndmv0p8jg1h5pawabi1m9m9z2w5hgidvqmpmcziky0"; - }) + nativeBuildInputs = [ + setuptools ]; + propagatedBuildInputs = [ + pytoolconfig + ]++ pytoolconfig.optional-dependencies.global; + checkInputs = [ - nose + pytest-timeout + pytestCheckHook ]; - checkPhase = '' - # tracked upstream here https://github.com/python-rope/rope/issues/247 - NOSE_IGNORE_FILES=type_hinting_test.py nosetests ropetest - ''; + pythonImportsCheck = [ + "rope" + ]; + + disabledTests = [ + "test_search_submodule" + "test_get_package_source_pytest" + "test_get_modname_folder" + ]; meta = with lib; { description = "Python refactoring library"; From c3374273d72546214c1d2a9161d4289baa424ceb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:02:31 +0100 Subject: [PATCH 4/8] python310Packages.python-lsp-server: 1.6.0 -> 1.7.0 Diff: https://github.com/python-lsp/python-lsp-server/compare/refs/tags/v1.6.0...v1.7.0 Changelog: https://github.com/python-lsp/python-lsp-server/blob/v1.7.0/CHANGELOG.md --- .../python-modules/python-lsp-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5d82d797a128..6feb98cd02ad 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.6.0"; + version = "1.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1LV8FcwQqUg+FIkrorBYlxMl4F1PkrrOWjD5M0JSp3Q="; + hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -50,7 +50,7 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "autopep8>=1.7.0,<1.7.0" "autopep8" \ --replace "flake8>=5.0.0,<5.1.0" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ From dd8026d8d5323fd75b298a0418b052f3e16bfdf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:07:51 +0100 Subject: [PATCH 5/8] python310Packages.pytoolconfig: init at 1.2.5 --- .../python-modules/pytoolconfig/default.nix | 79 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +- 2 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/pytoolconfig/default.nix diff --git a/pkgs/development/python-modules/pytoolconfig/default.nix b/pkgs/development/python-modules/pytoolconfig/default.nix new file mode 100644 index 000000000000..a3c50a44d0fc --- /dev/null +++ b/pkgs/development/python-modules/pytoolconfig/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildPythonPackage +, docutils +, fetchFromGitHub +, packaging +, pdm-pep517 +, platformdirs +, pydantic +, pytest-timeout +, pytestCheckHook +, pythonOlder +, sphinx +, tabulate +, tomli +}: + +buildPythonPackage rec { + pname = "pytoolconfig"; + version = "1.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bagel897"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-b7er/IgXr2j9dSnI87669BXWA5CXNTzwa1DTpl8PBZ4="; + }; + + postPatch = '' + # License file name doesn't match + substituteInPlace pyproject.toml \ + --replace "license = { file = 'LGPL-3.0' }" "" \ + --replace 'dynamic = ["version"]' 'version = "${version}"' \ + --replace "packaging>=22.0" "packaging" + ''; + + nativeBuildInputs = [ + pdm-pep517 + ]; + + propagatedBuildInputs = [ + packaging + ] ++ lib.optionals (pythonOlder "3.11") [ + tomli + ]; + + passthru.optional-dependencies = { + validation = [ + pydantic + ]; + global = [ + platformdirs + ]; + doc = [ + sphinx + tabulate + ]; + }; + + checkInputs = [ + docutils + pytestCheckHook + ] ++ passthru.optional-dependencies.global + ++ passthru.optional-dependencies.doc; + + pythonImportsCheck = [ + "pytoolconfig" + ]; + + meta = with lib; { + description = "Module for tool configuration"; + homepage = "https://github.com/bagel897/pytoolconfig"; + changelog = "https://github.com/bagel897/pytoolconfig/releases/tag/v${version}"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e35d915c962d..324c6a302cc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5147,8 +5147,6 @@ self: super: with self; { lcov_cobertura = callPackage ../development/python-modules/lcov_cobertura { }; - ld2410-ble = callPackage ../development/python-modules/ld2410-ble { }; - ldap3 = callPackage ../development/python-modules/ldap3 { }; ldapdomaindump = callPackage ../development/python-modules/ldapdomaindump { }; @@ -9367,6 +9365,8 @@ self: super: with self; { pytomlpp = callPackage ../development/python-modules/pytomlpp { }; + pytoolconfig = callPackage ../development/python-modules/pytoolconfig { }; + pytools = callPackage ../development/python-modules/pytools { }; pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; From 3078c90a6eecf118edcd822ecf819df4368a9e7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 12:13:03 +0100 Subject: [PATCH 6/8] python310Packages.spyder-kernels: 2.4.0 -> 2.4.1 Changelog: https://github.com/spyder-ide/spyder-kernels/blob/master/CHANGELOG.md --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index f39b03763c81..837cf0c0a520 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.4.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-O9MvvjChUKucztvVvrbd04veHZqHeNpS9+30ILv7jlE="; + hash = "sha256-eD2N+9cVzZdyjpE5FnebN8+OllZjVevaz+NBHSvrR5Y="; }; propagatedBuildInputs = [ From e0293da51a023e3a59b158fd7571057759e4cfb4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 14:41:06 +0100 Subject: [PATCH 7/8] python310Packages.python-lsp-server: update postPatch section --- .../python-modules/python-lsp-server/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 6feb98cd02ad..01dc904293e9 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -50,11 +50,11 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ - --replace "autopep8>=1.7.0,<1.7.0" "autopep8" \ - --replace "flake8>=5.0.0,<5.1.0" "flake8" \ + --replace "autopep8>=1.6.0,<1.7.0" "autopep8" \ + --replace "flake8>=5.0.0,<7" "flake8" \ --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.10.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<2.6.0" "pyflakes" + --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ + --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" ''; nativeBuildInputs = [ From 27225a861708ced2e7b0655775b2f59a82924683 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Jan 2023 14:42:46 +0100 Subject: [PATCH 8/8] python310Packages.spyder: 5.4.0 -> 5.4.1 Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index bb744b2abab4..d6d408b8c686 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -46,14 +46,14 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.4.0"; + version = "5.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-nZ+rw5qALSdu+nbaAtGA7PLW6XjcjeZvuPd4a5WtZkw="; + hash = "sha256-kQBOYRXhjz+OQk7Vlxb/UKiDi92mA8ialsFQ+QzqhlE="; }; nativeBuildInputs = [