diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 7788bd00fb05..58dffe94a66b 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "tldextract"; - version = "5.1.0"; + version = "5.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "john-kurkowski"; repo = "tldextract"; rev = "refs/tags/${version}"; - hash = "sha256-x5SJcbTUrqG7mMUPXIhR1rEu3PZ+VA00dFYeoGnX5l0="; + hash = "sha256-/VBbU8FuB8MEuX6MgGO44+gfqVjl1aHHDHncHY2Jo38="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/development/python-modules/warcio/default.nix b/pkgs/development/python-modules/warcio/default.nix index 935a538222bd..fe9f7bdeb0f1 100644 --- a/pkgs/development/python-modules/warcio/default.nix +++ b/pkgs/development/python-modules/warcio/default.nix @@ -2,18 +2,22 @@ , buildPythonPackage , fetchFromGitHub , fetchpatch -, six -, setuptools -, pytestCheckHook , httpbin -, requests -, wsgiprox , multidict +, pytestCheckHook +, pythonOlder +, requests +, setuptools +, six +, wsgiprox }: buildPythonPackage rec { pname = "warcio"; version = "1.7.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "webrecorder"; @@ -24,6 +28,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { + # Add offline mode to skip tests that require an internet connection, https://github.com/webrecorder/warcio/pull/135 name = "add-offline-option.patch"; url = "https://github.com/webrecorder/warcio/pull/135/commits/2546fe457c57ab0b391764a4ce419656458d9d07.patch"; hash = "sha256-3izm9LvAeOFixiIUUqmd5flZIxH92+NxL7jeu35aObQ="; @@ -36,20 +41,30 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytestCheckHook httpbin + multidict # Optional. Without this, one test in test/test_utils.py is skipped. + pytestCheckHook requests wsgiprox - multidict # Optional. Without this, one test in test/test_utils.py is skipped. ]; - pytestFlagsArray = [ "--offline" ]; + pytestFlagsArray = [ + "--offline" + ]; - pythonImportsCheck = [ "warcio" ]; + disabledTests = [ + # Tests require network access, see above + "test_get_cache_to_file" + ]; + + pythonImportsCheck = [ + "warcio" + ]; meta = with lib; { description = "Streaming WARC/ARC library for fast web archive IO"; homepage = "https://github.com/webrecorder/warcio"; + changelog = "https://github.com/webrecorder/warcio/blob/master/CHANGELIST.rst"; license = licenses.asl20; maintainers = with maintainers; [ Luflosi ]; };