Skip to content

Commit

Permalink
python312Packages: remove some old backport modules (NixOS#355418)
Browse files Browse the repository at this point in the history
  • Loading branch information
mweinelt authored Nov 18, 2024
2 parents 40641d0 + a45548f commit d43eaad
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 250 deletions.
5 changes: 0 additions & 5 deletions pkgs/development/python-modules/astral/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
# build
poetry-core,

# runtime
backports-zoneinfo,

# tests
pytestCheckHook,
freezegun,
Expand All @@ -29,8 +26,6 @@ buildPythonPackage rec {

nativeBuildInputs = [ poetry-core ];

propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];

nativeCheckInputs = [
freezegun
pytestCheckHook
Expand Down

This file was deleted.

This file was deleted.

30 changes: 0 additions & 30 deletions pkgs/development/python-modules/backports-shutil-which/default.nix

This file was deleted.

80 changes: 0 additions & 80 deletions pkgs/development/python-modules/backports-zoneinfo/default.nix

This file was deleted.

17 changes: 0 additions & 17 deletions pkgs/development/python-modules/backports-zoneinfo/zoneinfo.patch

This file was deleted.

3 changes: 1 addition & 2 deletions pkgs/development/python-modules/curtsies/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
lib,
stdenv,
backports-cached-property,
blessed,
buildPythonPackage,
cwcwidth,
Expand Down Expand Up @@ -29,7 +28,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
blessed
cwcwidth
] ++ lib.optionals (pythonOlder "3.8") [ backports-cached-property ];
];

nativeCheckInputs = [
pyte
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/python-modules/icalendar/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
buildPythonPackage,
fetchFromGitHub,
replaceVars,
pythonOlder,
hatch-vcs,
hatchling,
backports-zoneinfo,
python-dateutil,
tzdata,
hypothesis,
Expand Down Expand Up @@ -39,7 +37,7 @@ buildPythonPackage rec {
dependencies = [
python-dateutil
tzdata
] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
];

nativeCheckInputs = [
hypothesis
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/kombu/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
azure-identity,
azure-servicebus,
azure-storage-queue,
backports-zoneinfo,
boto3,
buildPythonPackage,
confluent-kafka,
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/python-modules/libagent/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
unidecode,
mock,
pytestCheckHook,
backports-shutil-which,
configargparse,
python-daemon,
pymsgbox,
Expand Down Expand Up @@ -43,9 +42,11 @@ buildPythonPackage rec {

build-system = [ setuptools ];

# https://github.com/romanz/trezor-agent/pull/481
pythonRemoveDeps = [ "backports.shutil-which" ];

dependencies = [
unidecode
backports-shutil-which
configargparse
python-daemon
pymsgbox
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/python-modules/pelican/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
typogrify,

# dependencies
backports-zoneinfo,
blinker,
docutils,
feedgenerator,
Expand Down
2 changes: 0 additions & 2 deletions pkgs/development/python-modules/pendulum/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
iconv,

# dependencies
backports-zoneinfo,
importlib-resources,
python-dateutil,
time-machine,
Expand Down Expand Up @@ -69,7 +68,6 @@ buildPythonPackage rec {
]
++ lib.optional (!isPyPy) [ time-machine ]
++ lib.optionals (pythonOlder "3.9") [
backports-zoneinfo
importlib-resources
];

Expand Down
3 changes: 1 addition & 2 deletions pkgs/development/python-modules/psycopg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
setuptools,

# propagates
backports-zoneinfo,
typing-extensions,

# psycopg-c
Expand Down Expand Up @@ -153,7 +152,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
psycopg-c
typing-extensions
] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
];

pythonImportsCheck = [
"psycopg"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
fetchPypi,
pythonAtLeast,
pythonOlder,
backports-zoneinfo,
python-dateutil,
setuptools,
tzdata,
Expand All @@ -28,8 +27,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools ];

propagatedBuildInputs =
(lib.optionals (pythonAtLeast "3.6" && pythonOlder "3.9") [ backports-zoneinfo ])
++ (lib.optionals (pythonOlder "3.6") [ python-dateutil ])
(lib.optionals (pythonOlder "3.6") [ python-dateutil ])
++ (lib.optionals (pythonAtLeast "3.6") [ tzdata ]);

nativeCheckInputs = [
Expand Down
17 changes: 6 additions & 11 deletions pkgs/development/python-modules/urllib3/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,8 @@
pysocks,

# tests
backports-zoneinfo,
pytestCheckHook,
pytest-timeout,
pythonOlder,
tornado,
trustme,
}:
Expand All @@ -43,15 +41,12 @@ let
socks = [ pysocks ];
};

nativeCheckInputs =
[
pytest-timeout
pytestCheckHook
tornado
trustme
]
++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ]
++ lib.flatten (builtins.attrValues optional-dependencies);
nativeCheckInputs = [
pytest-timeout
pytestCheckHook
tornado
trustme
] ++ lib.flatten (builtins.attrValues optional-dependencies);

# Tests in urllib3 are mostly timeout-based instead of event-based and
# are therefore inherently flaky. On your own machine, the tests will
Expand Down
2 changes: 1 addition & 1 deletion pkgs/servers/home-assistant/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ let
--replace-fail "poetry>=1.0.0b1" "poetry-core" \
--replace-fail "poetry.masonry" "poetry.core.masonry"
'';
propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [
propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ [
self.pytz
];
});
Expand Down
Loading

0 comments on commit d43eaad

Please sign in to comment.