diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2023-10-15 09:44:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-15 09:44:20 +0200 |
commit | 1368bd4241a648fa2a2660c5549c51f4fdb38901 (patch) | |
tree | 8fb8d06cbac7478a6d90f67d5ea943c081853a64 | |
parent | f1e433beb824b1a537bf682ca408cfb4d1b25ff5 (diff) | |
parent | de3e87205ecc6ae7d1c2f7fcd2f95315b34674b2 (diff) |
Merge pull request #260895 from natsukium/devpi-common/fix
python311Packages.devpi-common: 3.7.2 -> 4.0.0; unbreak
5 files changed, 89 insertions, 28 deletions
diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 0a05e08435871..9204401b3a79f 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -1,45 +1,47 @@ { lib, buildPythonPackage, fetchPypi +, pythonOlder +, setuptools +, setuptools-changelog-shortener , requests -, py , pytestCheckHook , lazy }: buildPythonPackage rec { pname = "devpi-common"; - version = "3.7.2"; + version = "4.0.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kHiYknmteenBgce63EpzhGBEUYcQHrDLreZ1k01eRkQ="; + hash = "sha256-N4f43B1Dg1mCnDF3Sj2341vVXNdjlDzF1vn7ORoLWJ8="; }; - postPatch = '' - substituteInPlace tox.ini \ - --replace "--flake8" "" - ''; + nativeBuildInputs = [ + setuptools + setuptools-changelog-shortener + ]; propagatedBuildInputs = [ requests - py lazy ]; nativeCheckInputs = [ - py pytestCheckHook ]; + pythonImportsCheck = [ + "devpi_common" + ]; + meta = with lib; { homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; + changelog = "https://github.com/devpi/devpi/blob/common-${version}/common/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; - # It fails to build because it depends on packaging <22 while we - # use packaging >22. - # See the following issues for details: - # - https://github.com/NixOS/nixpkgs/issues/231346 - # - https://github.com/devpi/devpi/issues/939 - broken = true; }; } diff --git a/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix b/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix new file mode 100644 index 0000000000000..fef62dfbfbb92 --- /dev/null +++ b/pkgs/development/python-modules/setuptools-changelog-shortener/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools +, tomli +, wheel +}: + +buildPythonPackage rec { + pname = "setuptools-changelog-shortener"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "fschulze"; + repo = "setuptools-changelog-shortener"; + rev = "refs/tags/${version}"; + hash = "sha256-K8oVcX40K5j2CwQnulK55HykkEXAmOiUg4mZPg5T+YI="; + }; + + nativeBuildInputs = [ + setuptools + tomli + wheel + ]; + + # upstream has no tests + doCheck = false; + + pythonImportsCheck = [ "setuptools_changelog_shortener" ]; + + meta = with lib; { + description = "Setuptools-changelog-shortener: add only newest changelog entries to long_description"; + homepage = "https://github.com/fschulze/setuptools-changelog-shortener"; + changelog = "https://github.com/fschulze/setuptools-changelog-shortener/blob/${src.rev}/README.rst#changelog"; + license = licenses.mit; + maintainers = with maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index 8f103fd628618..9a7c8dcccd973 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -8,13 +8,12 @@ python3.pkgs.buildPythonApplication rec { pname = "devpi-client"; - version = "6.0.3"; - - format = "setuptools"; + version = "7.0.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-csdQUxnopH+kYtoqdvyXKNW3fGkQNSREJYxjes9Dgi8="; + hash = "sha256-AI/GNubb7+nwz/vM6v/JoUtWup6rBJieKXtFQzrdPkE="; }; postPatch = '' @@ -22,22 +21,24 @@ python3.pkgs.buildPythonApplication rec { --replace "--flake8" "" ''; + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-changelog-shortener + wheel + ]; + buildInputs = [ glibcLocales ]; propagatedBuildInputs = with python3.pkgs; [ - argon2-cffi-bindings build check-manifest devpi-common iniconfig - pep517 pkginfo pluggy platformdirs - py - setuptools ]; nativeCheckInputs = [ @@ -67,6 +68,10 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "devpi" + ]; + meta = with lib; { description = "Client for devpi, a pypi index server and packaging meta tool"; homepage = "http://doc.devpi.net"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index f3de637823148..c705848c2053c 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -1,4 +1,5 @@ -{ lib, fetchFromGitHub, buildPythonApplication, isPy27 +{ lib, fetchFromGitHub, buildPythonApplication +, pythonOlder , aiohttp , appdirs , beautifulsoup4 @@ -24,16 +25,16 @@ buildPythonApplication rec { pname = "devpi-server"; - version = "6.7.0"; - format = "setuptools"; + version = "6.9.2"; + pyproject = true; - disabled = isPy27; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; rev = "server-${version}"; - hash = "sha256-tevQ/Ocusz2PythGnedP6r4xARgetVosAc8uTD49H3M="; + hash = "sha256-HnxWLxOK+6B8O/7lpNjuSUQ0Z7NOmV2n01WFyjow6oU="; }; sourceRoot = "${src.name}/server"; @@ -43,6 +44,10 @@ buildPythonApplication rec { --replace "--flake8" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp appdirs @@ -87,13 +92,21 @@ buildPythonApplication rec { disabledTests = [ "root_passwd_hash_option" "TestMirrorIndexThings" + "test_auth_mirror_url_no_hash" + "test_auth_mirror_url_with_hash" + "test_auth_mirror_url_hidden_in_logs" ]; __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ + "devpi_server" + ]; + meta = with lib;{ homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; + changelog = "https://github.com/devpi/devpi/blob/${src.rev}/server/CHANGELOG"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a7165dc4a0606..a19ab106cbf6c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12649,6 +12649,8 @@ self: super: with self; { setupmeta = callPackage ../development/python-modules/setupmeta { }; + setuptools-changelog-shortener = callPackage ../development/python-modules/setuptools-changelog-shortener { }; + setuptools-declarative-requirements = callPackage ../development/python-modules/setuptools-declarative-requirements { }; setuptools-generate = callPackage ../development/python-modules/setuptools-generate { }; |