diff --git a/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 611474d85df6..64dc8a69aa37 100644 --- a/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -1,27 +1,28 @@ { lib, - fetchFromGitHub, - pythonAtLeast, buildPythonPackage, - importlib-resources, + fetchFromGitHub, + + # build-system + setuptools-scm, + + # dependencies pyyaml, requests, - setuptools-scm, - pythonOlder, + pythonAtLeast, + importlib-resources, }: buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.48"; + version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "scikit-hep"; repo = "scikit-hep-testdata"; rev = "refs/tags/v${version}"; - hash = "sha256-B0YmO48aGDRsQ56+q7/Z6xquCNjbAQ55fkY6auvwB90="; + hash = "sha256-FIv3yC5Q3H1RXl0n32YH1UqaZiMuWHNcMPTSKLN+IkA="; }; build-system = [ setuptools-scm ]; @@ -37,11 +38,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "skhep_testdata" ]; - meta = with lib; { + meta = { homepage = "https://github.com/scikit-hep/scikit-hep-testdata"; description = "Common package to provide example files (e.g., ROOT) for testing and developing packages against"; changelog = "https://github.com/scikit-hep/scikit-hep-testdata/releases/tag/v${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ veprbl ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ veprbl ]; }; } diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 2fea117b29aa..196879d2e17e 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, @@ -26,14 +27,14 @@ buildPythonPackage rec { pname = "uproot"; - version = "5.5.0"; + version = "5.5.1"; pyproject = true; src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot5"; rev = "refs/tags/v${version}"; - hash = "sha256-letdC246I9LDqEnLCOTz51cBnQGbkrsR/i7UN6EMcDA="; + hash = "sha256-a5gCsv8iBUUASHCJIpxFbgBXTSm/KJOTt6fvSvP/Lio="; }; build-system = [ @@ -63,45 +64,49 @@ buildPythonPackage rec { export HOME="$(mktemp -d)" ''; - disabledTests = [ - # Tests that try to download files - "test_descend_into_path_classname_of" - "test_fallback" - "test_file" - "test_fsspec_cache_http" - "test_fsspec_cache_http_directory" - "test_fsspec_chunks" - "test_fsspec_globbing_http" - "test_fsspec_writing_http" - "test_fsspec_writing_memory" - "test_fsspec_writing_ssh" - "test_http" - "test_http_fallback" - "test_http_multipart" - "test_http_port" - "test_http_size" - "test_http_size_port" - "test_issue_1054_filename_colons" - "test_multiple_page_lists" - "test_no_multipart" - "test_open_fsspec_github" - "test_open_fsspec_http" - "test_open_fsspec_ss" - "test_pickle_roundtrip_http" - "test_split_ranges_if_large_file_in_http" - # Cyclic dependency with dask-awkward - "test_dask_duplicated_keys" - "test_decompression_executor_for_dask" - "test_decompression_threadpool_executor_for_dask" - ]; + disabledTests = + [ + # Tests that try to download files + "test_descend_into_path_classname_of" + "test_fallback" + "test_fsspec_cache_http" + "test_fsspec_cache_http_directory" + "test_fsspec_chunks" + "test_fsspec_globbing_http" + "test_http" + "test_http_fallback_workers" + "test_http_multipart" + "test_http_port" + "test_http_size" + "test_http_size_port" + "test_http_workers" + "test_issue176" + "test_issue176_again" + "test_issue_1054_filename_colons" + "test_no_multipart" + "test_open_fsspec_github" + "test_open_fsspec_http" + "test_pickle_roundtrip_http" + + # Cyclic dependency with dask-awkward + "test_dask_duplicated_keys" + "test_decompression_executor_for_dask" + "test_decompression_threadpool_executor_for_dask" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # Tries to connect to localhost:22 + # PermissionError: [Errno 1] Operation not permitted + "test_open_fsspec_ssh" + ]; disabledTestPaths = [ # Tests that try to download files "tests/test_0066_fix_http_fallback_freeze.py" - "tests/test_0088_read_with_http.py" "tests/test_0220_contiguous_byte_ranges_in_http.py" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "uproot" ]; meta = {