diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 9eff8e2d29d4..f22d92d7bfb1 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -1,17 +1,20 @@ { lib +, buildPythonPackage , fetchFromGitHub , fetchpatch -, buildPythonPackage -, pythonOlder -, pycodestyle , glibcLocales -, tomli +, pycodestyle , pytestCheckHook +, pythonOlder +, tomli }: buildPythonPackage rec { pname = "autopep8"; version = "2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "hhatto"; @@ -20,6 +23,15 @@ buildPythonPackage rec { hash = "sha256-YEPSsUzJG4MPiiloVAf9m/UiChkhkN0+lK6spycpSvo="; }; + patches = [ + # Ignore DeprecationWarnings to fix tests on Python 3.11, https://github.com/hhatto/autopep8/pull/665 + (fetchpatch { + name = "ignore-deprecation-warnings.patch"; + url = "https://github.com/hhatto/autopep8/commit/75b444d7cf510307ef67dc2b757d384b8a241348.patch"; + hash = "sha256-5hcJ2yAuscvGyI7zyo4Cl3NEFG/fZItQ8URstxhzwzE="; + }) + ]; + propagatedBuildInputs = [ pycodestyle ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix index 5f2574eb9c06..a026eb15fa27 100644 --- a/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/pkgs/development/python-modules/python-lsp-server/default.nix @@ -18,6 +18,7 @@ , pylint , pyqt5 , pytestCheckHook +, pythonRelaxDepsHook , python-lsp-jsonrpc , pythonOlder , rope @@ -32,7 +33,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.7.0"; + version = "1.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -41,7 +42,7 @@ buildPythonPackage rec { owner = "python-lsp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9cyzJxyCris7FsVni5IZCCL6IAcsN8tMakNoKPeWv7s="; + hash = "sha256-Rx8mHBmJw4gh0FtQBVMmOlQklODplrhnWwzsEhQm4NE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -49,15 +50,20 @@ buildPythonPackage rec { postPatch = '' 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 "flake8>=5.0.0,<7" "flake8" \ - --replace "mccabe>=0.7.0,<0.8.0" "mccabe" \ - --replace "pycodestyle>=2.9.0,<2.11.0" "pycodestyle" \ - --replace "pyflakes>=2.5.0,<3.1.0" "pyflakes" + --replace "--cov pylsp --cov test" "" ''; + pythonRelaxDeps = [ + "autopep8" + "flake8" + "mccabe" + "pycodestyle" + "pydocstyle" + "pyflakes" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools-scm ]; @@ -130,6 +136,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # Don't run lint tests + "test_pydocstyle" # https://github.com/python-lsp/python-lsp-server/issues/243 "test_numpy_completions" "test_workspace_loads_pycodestyle_config"