HyperWinX/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

python3Packages.click: 8.1.8 -> 8.2.1 (#448189)

Browse Source
This commit is contained in:
dotlambda
2025-10-07 15:37:22 +02:00
committed by GitHub
parent b9cf6e439c 349bee348e
commit 1a4bf1acc6
10 changed files with 129 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/to/todoman/package.nix
+5 -3
View File
@@ -32,18 +32,20 @@ python3.pkgs.buildPythonApplication rec {
];
dependencies = with python3.pkgs; [
atomicwrites
click
click-log
click-repl
humanize
icalendar
parsedatetime
python-dateutil
pyxdg
tabulate
urwid
];
optional-dependencies = with python3.pkgs; {
repl = [ click-repl ];
};
nativeCheckInputs = with python3.pkgs; [
freezegun
hypothesis
pkgs/development/python-modules/celery/default.nix
+12 -1
View File
@@ -9,6 +9,7 @@
click-plugins,
click-repl,
click,
cryptography,
fetchFromGitHub,
gevent,
google-cloud-firestore,
@@ -29,6 +30,9 @@
pyyaml,
setuptools,
vine,
# The AMQP REPL depends on click-repl, which is incompatible with our version
# of click.
withAmqpRepl ? false,
}:
buildPythonPackage rec {
@@ -43,6 +47,10 @@ buildPythonPackage rec {
hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w=";
};
patches = lib.optionals (!withAmqpRepl) [
./remove-amqp-repl.patch
];
build-system = [ setuptools ];
dependencies = [
@@ -50,13 +58,16 @@ buildPythonPackage rec {
click
click-didyoumean
click-plugins
click-repl
kombu
python-dateutil
vine
]
++ lib.optionals withAmqpRepl [
click-repl
];
optional-dependencies = {
auth = [ cryptography ];
azureblockblob = [
azure-identity
azure-storage-blob
pkgs/development/python-modules/celery/remove-amqp-repl.patch
+32
View File
@@ -0,0 +1,32 @@
diff --git a/celery/bin/celery.py b/celery/bin/celery.py
index e1fae1a77..cf05a927a 100644
--- a/celery/bin/celery.py
+++ b/celery/bin/celery.py
@@ -12,7 +12,6 @@ from click_plugins import with_plugins
from celery import VERSION_BANNER
from celery.app.utils import find_app
-from celery.bin.amqp import amqp
from celery.bin.base import CeleryCommand, CeleryOption, CLIContext
from celery.bin.beat import beat
from celery.bin.call import call
@@ -186,7 +185,6 @@ celery.add_command(control)
celery.add_command(graph)
celery.add_command(upgrade)
celery.add_command(logtool)
-celery.add_command(amqp)
celery.add_command(shell)
celery.add_command(multi)
diff --git a/requirements/default.txt b/requirements/default.txt
index 185b6eddd..fbfc59fd7 100644
--- a/requirements/default.txt
+++ b/requirements/default.txt
@@ -3,7 +3,6 @@ kombu>=5.6.0rc1,<5.7
vine>=5.1.0,<6.0
click>=8.1.2,<9.0
click-didyoumean>=0.3.0
-click-repl>=0.2.0
click-plugins>=1.1.1
backports.zoneinfo[tzdata]>=0.2.1; python_version < '3.9'
python-dateutil>=2.8.2
pkgs/development/python-modules/click-repl/default.nix
+2
View File
@@ -42,6 +42,8 @@ buildPythonPackage rec {
];
meta = with lib; {
# https://github.com/click-contrib/click-repl/issues/128
broken = lib.versionAtLeast click.version "8.2.0";
homepage = "https://github.com/click-contrib/click-repl";
description = "Subcommand REPL for click apps";
license = licenses.mit;
pkgs/development/python-modules/click/default.nix
+9 -9
View File
@@ -1,7 +1,6 @@
{
lib,
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
importlib-metadata,
pytestCheckHook,
@@ -17,24 +16,24 @@
buildPythonPackage rec {
pname = "click";
version = "8.1.8";
version = "8.2.1";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "pallets";
repo = "click";
tag = version;
hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M=";
hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps=";
};
build-system = [ flit-core ];
dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
nativeCheckInputs = [ pytestCheckHook ];
disabledTests = [
# for some reason the tests fail to execute cat, even though they run with less just fine,
# even adding coreutils to nativeCheckInputs explicitly does not change anything
"test_echo_via_pager"
# test fails with filename normalization on zfs
"test_file_surrogates"
];
@@ -49,14 +48,15 @@ buildPythonPackage rec {
;
};
meta = with lib; {
meta = {
changelog = "https://github.com/pallets/click/blob/${src.tag}/CHANGES.rst";
homepage = "https://click.palletsprojects.com/";
description = "Create beautiful command line interfaces in Python";
longDescription = ''
A Python package for creating beautiful command line interfaces in a
composable way, with as little code as necessary.
'';
license = licenses.bsd3;
maintainers = with maintainers; [ nickcao ];
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ nickcao ];
};
}
pkgs/development/python-modules/flasgger/default.nix
+10
View File
@@ -2,6 +2,7 @@
lib,
buildPythonPackage,
fetchFromGitHub,
fetchpatch,
# build-system
setuptools,
@@ -31,6 +32,15 @@ buildPythonPackage rec {
hash = "sha256-ULEf9DJiz/S2wKlb/vjGto8VCI0QDcm0pkU5rlOwtiE=";
};
patches = [
# https://github.com/flasgger/flasgger/pull/633
(fetchpatch {
name = "fix-tests-with-click-8.2.patch";
url = "https://github.com/flasgger/flasgger/commit/08591b60e988c0002fcf1b1e9f98b78e041d2732.patch";
hash = "sha256-DHaaY9W+cta3M2VA8S+ZQWacmgSpeyP03SKTiIlfBRM=";
})
];
build-system = [ setuptools ];
dependencies = [
pkgs/development/python-modules/greynoise/default.nix
+14 -1
View File
@@ -17,6 +17,9 @@
pytestCheckHook,
mock,
pythonOlder,
# The REPL depends on click-repl, which is incompatible with our version of
# click.
withRepl ? false,
}:
buildPythonPackage rec {
@@ -33,22 +36,32 @@ buildPythonPackage rec {
hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
};
patches = lib.optionals (!withRepl) [
./remove-repl.patch
];
build-system = [
hatchling
];
pythonRelaxDeps = [
"click"
];
dependencies = [
click
ansimarkup
cachetools
colorama
click-default-group
click-repl
dict2xml
jinja2
more-itertools
requests
six
]
++ lib.optionals withRepl [
click-repl
];
nativeCheckInputs = [
pkgs/development/python-modules/greynoise/remove-repl.patch
+37
View File
@@ -0,0 +1,37 @@
diff --git a/pyproject.toml b/pyproject.toml
index 9c5950e..f19a5db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -33,7 +33,6 @@ dependencies = [
"cachetools",
"colorama",
"click-default-group",
- "click-repl",
"dict2xml",
"jinja2",
"more-itertools>=8.14.0",
@@ -53,4 +52,4 @@ greynoise = "greynoise.cli:main"
packages = ["src/greynoise"]
[tool.hatch.build.targets.wheel.shared-data]
-"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates"
\ No newline at end of file
+"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates"
diff --git a/src/greynoise/cli/__init__.py b/src/greynoise/cli/__init__.py
index a7c22ea..9d26d3e 100644
--- a/src/greynoise/cli/__init__.py
+++ b/src/greynoise/cli/__init__.py
@@ -2,7 +2,6 @@
import click
from click_default_group import DefaultGroup
-from click_repl import register_repl
from greynoise.cli import subcommand
@@ -24,5 +23,3 @@ SUBCOMMAND_FUNCTIONS = [
for subcommand_function in SUBCOMMAND_FUNCTIONS:
main.add_command(subcommand_function)
-
-register_repl(main)
pkgs/development/python-modules/pytest-celery/default.nix
+6 -5
View File
@@ -11,7 +11,6 @@
pytest-docker-tools,
pytest,
pythonOlder,
setuptools,
tenacity,
}:
@@ -37,21 +36,23 @@ buildPythonPackage rec {
pythonRelaxDeps = [
"debugpy"
"setuptools"
];
pythonRemoveDeps = [
"celery" # cyclic dependency
"setuptools" # https://github.com/celery/pytest-celery/pull/464
];
build-system = [ poetry-core ];
buildInput = [ pytest ];
buildInputs = [ pytest ];
dependencies = [
(celery.overridePythonAttrs { doCheck = false; })
debugpy
docker
kombu
psutil
pytest-docker-tools
setuptools
tenacity
];
pkgs/development/python-modules/typer/default.nix
+2 -8
View File
@@ -28,14 +28,14 @@
buildPythonPackage rec {
pname = package;
version = "0.17.4";
version = "0.19.2";
pyproject = true;
src = fetchFromGitHub {
owner = "fastapi";
repo = "typer";
tag = version;
hash = "sha256-gd4GgoRnQVVmwmW5DprmNRxgjFiRRa8HB6xO9U9wHI8=";
hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
};
env.TIANGOLO_BUILD_PACKAGE = package;
@@ -80,12 +80,6 @@ buildPythonPackage rec {
"test_install_completion"
];
disabledTestPaths = [
# likely click 8.2 compat issue
"tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002_an.py"
"tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002.py"
];
pythonImportsCheck = [ "typer" ];
meta = {