diff options
| -rw-r--r-- | pkgs/development/python-modules/cachecontrol/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/tools/package-management/poetry/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/package-management/poetry/unwrapped.nix | 50 |
3 files changed, 18 insertions, 57 deletions
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 99a128b0496b2..c40d0b8d4ee5e 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -14,27 +14,20 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.13.1"; - format = "pyproject"; + version = "0.14.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; __darwinAllowLocalNetworking = true; src = fetchFromGitHub { owner = "ionrock"; - repo = pname; + repo = "cachecontrol"; rev = "refs/tags/v${version}"; - hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; + hash = "sha256-myyqiUGna+5S2GJGnwZTOfLh49NhjfHAvpUB49dQbgY="; }; - postPatch = '' - # https://github.com/ionrock/cachecontrol/issues/297 - substituteInPlace tests/test_etag.py --replace \ - "requests.adapters.HTTPResponse.from_httplib" \ - "urllib3.response.HTTPResponse.from_httplib" - ''; - nativeBuildInputs = [ flit-core ]; @@ -69,6 +62,6 @@ buildPythonPackage rec { homepage = "https://github.com/ionrock/cachecontrol"; changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index 75cede5df7d35..d7442d74674f4 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -12,12 +12,12 @@ let # We keep the override around even when the versions match, as # it's likely to become relevant again after the next Poetry update. poetry-core = super.poetry-core.overridePythonAttrs (old: rec { - version = "1.8.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "python-poetry"; repo = "poetry-core"; - rev = version; - hash = "sha256-RnCJ67jaL2knwv+Uo7p0zOejHAT73f40weaJnfqOYoM="; + rev = "refs/tags/${version}"; + hash = "sha256-vvwKbzGlvv2LTbXfJxQVM3nUXFGntgJxsku6cbRxCzw="; }; }); } // (plugins self); diff --git a/pkgs/tools/package-management/poetry/unwrapped.nix b/pkgs/tools/package-management/poetry/unwrapped.nix index f13a7715464be..cf4b0334dcd61 100644 --- a/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/pkgs/tools/package-management/poetry/unwrapped.nix @@ -4,7 +4,6 @@ , pythonOlder , fetchFromGitHub , installShellFiles -, pythonRelaxDepsHook , build , cachecontrol , cleo @@ -29,41 +28,30 @@ , xattr , tomli , importlib-metadata -, cachy , deepdiff -, flatdict , pytestCheckHook , httpretty , pytest-mock , pytest-xdist -, pythonAtLeast , darwin }: buildPythonPackage rec { pname = "poetry"; - version = "1.7.1"; + version = "1.8.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "python-poetry"; - repo = pname; + repo = "poetry"; rev = "refs/tags/${version}"; - hash = "sha256-PM3FIZYso7p0Oe0RpiPuxHrQrgnMlkT5SVeaJPK/J94="; + hash = "sha256-tHtd5vO3TMjO0gqyECuS0FUAcE90nkKZwOm3ne6poFQ="; }; nativeBuildInputs = [ installShellFiles - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c - "platformdirs" - # xattr 1.0 is backwards compatible modulo dropping Python 2 support: https://github.com/xattr/xattr/compare/v0.10.0...v1.0.0 - "xattr" ]; propagatedBuildInputs = [ @@ -104,9 +92,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - cachy deepdiff - flatdict pytestCheckHook httpretty pytest-mock @@ -127,32 +113,14 @@ buildPythonPackage rec { ''; disabledTests = [ + "test_builder_should_execute_build_scripts" "test_env_system_packages_are_relative_to_lib" + "test_executor_known_hashes" "test_install_warning_corrupt_root" - "test_installer_with_pypi_repository" - # touches network - "git" - "solver" - "load" - "vcs" - "prereleases_if_they_are_compatible" - "test_builder_setup_generation_runs_with_pip_editable" - "test_executor" - # requires git history to work correctly - "default_with_excluded_data" - # toml ordering has changed - "lock" - # fs permission errors - "test_builder_should_execute_build_scripts" - # poetry.installation.chef.ChefBuildError: Backend 'poetry.core.masonry.api' is not available. - "test_isolated_env_install_success" - "test_prepare_sdist" - "test_prepare_directory" - "test_prepare_directory_with_extensions" - "test_prepare_directory_editable" - ] ++ lib.optionals (pythonAtLeast "3.10") [ - # RuntimeError: 'auto_spec' might be a typo; use unsafe=True if this is intended - "test_info_setup_complex_pep517_error" + ]; + + pytestFlagsArray = [ + "-m 'not network'" ]; # Allow for package to use pep420's native namespaces |