diff options
author | OTABI Tomoya <tomoya.otabi@gmail.com> | 2023-11-20 17:26:25 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-20 17:26:25 +0900 |
commit | ae03901e1aa89caad3e04a883ebf39cc7caeb472 (patch) | |
tree | ffa59724a04debf049948f377da9711bda832341 | |
parent | 4ce484e288d624d0256df7f6b0d82e2571a14199 (diff) | |
parent | 2cca81b2adcc1541410e7e56756186fcb6a0c4e4 (diff) |
Merge pull request #267482 from natsukium/python-fedora
python311Packages.python-fedora: rename from python_fedora
-rw-r--r-- | pkgs/development/python-modules/python-fedora/default.nix (renamed from pkgs/development/python-modules/python_fedora/default.nix) | 25 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
3 files changed, 20 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python-fedora/default.nix index 7f4e6e2a4fd57..01c79c39ea1c5 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python-fedora/default.nix @@ -1,15 +1,16 @@ { lib , beautifulsoup4 , buildPythonPackage -, bunch , fetchPypi , kitchen , lockfile , munch +, nose , openidc-client -, paver +, pytestCheckHook , pythonOlder , requests +, setuptools , six , urllib3 }: @@ -17,7 +18,7 @@ buildPythonPackage rec { pname = "python-fedora"; version = "1.1.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,20 +27,30 @@ buildPythonPackage rec { hash = "sha256-VrnYQaObQDDjiOkMe3fazUefHOXi/5sYw5VNl9Vwmhk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ beautifulsoup4 - bunch kitchen lockfile munch openidc-client - paver requests six urllib3 ]; - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + nose + ]; + + disabledTestPaths = [ + # requires network access + "tests/functional/test_openidbaseclient.py" + ]; pythonImportsCheck = [ "fedora" @@ -48,7 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to interact with the infrastructure of the Fedora Project"; homepage = "https://github.com/fedora-infra/python-fedora"; - changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/1.1.1"; + changelog = "https://github.com/fedora-infra/python-fedora/releases/tag/${version}"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c6514dbdc63c0..94898d9db8929 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -350,6 +350,7 @@ mapAliases ({ python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05 python-igraph = igraph; # added 2021-11-11 python_docs_theme = python-docs-theme; # added 2023-11-04 + python_fedora = python-fedora; # added 2023-11-15 python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16 python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f4d0fdaaa4296..c35fe1f8d7931 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11451,7 +11451,7 @@ self: super: with self; { python-ev3dev2 = callPackage ../development/python-modules/python-ev3dev2 { }; - python_fedora = callPackage ../development/python-modules/python_fedora { }; + python-fedora = callPackage ../development/python-modules/python-fedora { }; python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; |