diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-06-22 15:01:47 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-06-22 16:57:59 +0000 |
| commit | 633cab0ecb07627706c6b523e219490f019eaab5 (patch) | |
| tree | 4fb472bdfe2723037dad53dc1b8a87c939015f5e /nixpkgs/pkgs/development/python-modules/pipx | |
| parent | ffb691c199e7e0cbc4e45e5310779c9e3f7c2a73 (diff) | |
| parent | 432fc2d9a67f92e05438dff5fdc2b39d33f77997 (diff) | |
| download | nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.gz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.bz2 nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.lz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.xz nixlib-633cab0ecb07627706c6b523e219490f019eaab5.tar.zst nixlib-633cab0ecb07627706c6b523e219490f019eaab5.zip | |
Merge commit '432fc2d9a67f92e05438dff5fdc2b39d33f77997'
# Conflicts: # nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix # nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix # nixpkgs/pkgs/applications/window-managers/sway/default.nix # nixpkgs/pkgs/build-support/rust/default.nix # nixpkgs/pkgs/development/go-modules/generic/default.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pipx')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/pipx/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 34a7bc6b31a1..c49601786732 100644 --- a/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -6,13 +6,12 @@ , argcomplete , packaging , importlib-metadata -, colorama , pytestCheckHook }: buildPythonPackage rec { pname = "pipx"; - version = "0.16.1.0"; + version = "0.16.3"; disabled = pythonOlder "3.6"; @@ -21,14 +20,13 @@ buildPythonPackage rec { owner = "pipxproject"; repo = pname; rev = version; - sha256 = "081raqsaq7i2x4yxhxppv930jhajdwmngin5wazy7vqhiy3xc669"; + sha256 = "1w5pzn5mgl9rr9zbmqza5is4mvjvcgjps1q9qa1mvbnyvakdkr4c"; }; propagatedBuildInputs = [ userpath argcomplete packaging - colorama ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -39,9 +37,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # disable tests, which require internet connection - pytestFlagsArray = [ "--ignore=tests/test_install_all_packages.py" ]; + pytestFlagsArray = [ + "--ignore=tests/test_install_all_packages.py" + # start local pypi server and use in tests + "--net-pypiserver" + ]; disabledTests = [ + # disable tests which are difficult to emulate due to shell manipulations + "path_warning" + "script_from_internet" + "ensure_null_pythonpath" + # disable tests, which require internet connection "install" "inject" "ensure_null_pythonpath" @@ -54,6 +60,7 @@ buildPythonPackage rec { "suffix" "legacy_venv" "determination" + "json" ]; meta = with lib; { |