From 39bcf885917b131f08cc385b91e9f52e6b46db8a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:46:38 +0100 Subject: [PATCH 1/9] python310Packages.fsspec: 2022.10.0 -> 2023.1.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2023.1.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 37adb4c8b533..68e342c21949 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -13,8 +13,6 @@ , requests , smbprotocol , tqdm - -# optionals , adlfs , dask , distributed @@ -31,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2022.10.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-+lPt/zqI3Mkt+QRNXq+Dxm3h/ryZJsfrmayVi/BTtbg="; + hash = "sha256-SvqIgHFka/xTgFCoBnDPiL4tvwzA8LbvDvXPxW3IGvI="; }; propagatedBuildInputs = [ @@ -137,6 +135,9 @@ buildPythonPackage rec { # test accesses this remote ftp server: # https://ftp.fau.de/debian-cd/current/amd64/log/success "test_find" + # Tests want to access S3 + "test_urlpath_inference_errors" + "test_mismatch" ] ++ lib.optionals (stdenv.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution From 8643ea7e10204d2817048ce21a4107ce458cf271 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Mar 2023 09:48:48 +0100 Subject: [PATCH 2/9] python310Packages.gcsfs: 2022.10.0 -> 2023.1.0 Changelog: https://github.com/fsspec/gcsfs/raw/2023.1.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 3c0ad627b00a..284f1407272b 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -12,13 +12,14 @@ , ujson , aiohttp , crcmod +, pytest-timeout , pytest-vcr , vcrpy }: buildPythonPackage rec { pname = "gcsfs"; - version = "2022.10.0"; + version = "2023.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fsspec"; repo = pname; - rev = version; - hash = "sha256-+S4AziibYWos/hZ1v3883b1Vv3y4xjIDUrQ8c2XJ1MQ="; + rev = "refs/tags/${version}"; + hash = "sha256-HkpK7Dbp9myKtl/kWnFi0CmrM5PnuOKriTBeHg1Zd5c="; }; propagatedBuildInputs = [ @@ -44,6 +45,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytest-vcr + pytest-timeout pytestCheckHook vcrpy ]; From 085b06f4aa23b1cfb829eed35ff95c65f06cc729 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Apr 2023 08:29:36 +0200 Subject: [PATCH 3/9] python310Packages.ossfs: 2023.1.0 -> 2023.3.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.3.0 --- pkgs/development/python-modules/ossfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index f78ed6dd5adf..f149920afb7a 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ossfs"; - version = "2023.1.0"; + version = "2023.3.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo="; + hash = "sha256-E+SVH4MUTHHhvopEydiPKTmzazHm6mzjEWd2zp4XGvs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From ac22ea44ff4cc67521facb39e4f7cd5451d07fda Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:27:58 +0200 Subject: [PATCH 4/9] python310Packages.fsspec: 2023.1.0 -> 2023.4.0 Diff: https://github.com/fsspec/filesystem_spec/compare/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/filesystem_spec/raw/2023.4.0/docs/source/changelog.rst --- pkgs/development/python-modules/fsspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 68e342c21949..970f04be62eb 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "fsspec"; - version = "2023.1.0"; + version = "2023.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "filesystem_spec"; rev = version; - hash = "sha256-SvqIgHFka/xTgFCoBnDPiL4tvwzA8LbvDvXPxW3IGvI="; + hash = "sha256-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM="; }; propagatedBuildInputs = [ From 0a197a4a1e471ec5d3ed8b6a3b49a372e8a33ec9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:28:29 +0200 Subject: [PATCH 5/9] python310Packages.gcsfs: 2023.1.0 -> 2023.4.0 Diff: https://github.com/fsspec/gcsfs/compare/refs/tags/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/gcsfs/raw/2023.4.0/docs/source/changelog.rst --- pkgs/development/python-modules/gcsfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix index 284f1407272b..04af8e58ef79 100644 --- a/pkgs/development/python-modules/gcsfs/default.nix +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "gcsfs"; - version = "2023.1.0"; + version = "2023.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-HkpK7Dbp9myKtl/kWnFi0CmrM5PnuOKriTBeHg1Zd5c="; + hash = "sha256-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o="; }; propagatedBuildInputs = [ From 2fb1be6b1e1d16b77432ef4c8403fa9090934233 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 09:58:06 +0200 Subject: [PATCH 6/9] python310Packages.aiooss2: init at 0.2.5 --- .../python-modules/aiooss2/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/aiooss2/default.nix diff --git a/pkgs/development/python-modules/aiooss2/default.nix b/pkgs/development/python-modules/aiooss2/default.nix new file mode 100644 index 000000000000..e1f5758377e1 --- /dev/null +++ b/pkgs/development/python-modules/aiooss2/default.nix @@ -0,0 +1,74 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, oss2 +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, pythonOlder +, pythonRelaxDepsHook +, requests +, setuptools +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "aiooss2"; + version = "0.2.5"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "karajan1001"; + repo = "aiooss2"; + rev = "refs/tags/${version}"; + hash = "sha256-NYr8i5OAYRaRnDkNmnw1IWXnSp7HAovNaSV79xcwyHo="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + pythonRelaxDeps = [ + "aiohttp" + "oss2" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + oss2 + ]; + + nativeCheckInputs = [ + pytest-mock + pytest-asyncio + pytestCheckHook + requests + ]; + + pythonImportsCheck = [ + "aiooss2" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/func/test_bucket.py" + "tests/func/test_object.py" + "tests/func/test_resumable.py" + "tests/unit/test_adapter.py" + ]; + + meta = with lib; { + description = "Library for aliyun OSS (Object Storage Service)"; + homepage = "https://github.com/karajan1001/aiooss2"; + changelog = "https://github.com/karajan1001/aiooss2/blob/${version}/CHANGES.txt"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d7bc0412d94..cd53c300c42a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -284,6 +284,8 @@ self: super: with self; { aioopenssl = callPackage ../development/python-modules/aioopenssl { }; + aiooss2 = callPackage ../development/python-modules/aiooss2 { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; From 3fa9a5467ac7e734b3244aa0594961e1e68c208b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 10:31:37 +0200 Subject: [PATCH 7/9] python310Packages.tifffile: 20232.2.3 -> 2023.4.12 Changelog: https://github.com/cgohlke/tifffile/blob/v2023.4.12/CHANGES.rst --- pkgs/development/python-modules/tifffile/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 343d1b5b0185..c3a56f5c64ca 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2023.2.3"; + version = "2023.4.12"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-RY31rZpSF/Zo7dY23Bn7xzYGK/eKrII6uEzbrp3o6qY="; + hash = "sha256-L6mfmJDKq5GdkyoKyqnQ9YQ9wu81lOISljky4gcTut0="; }; propagatedBuildInputs = [ @@ -47,6 +47,8 @@ buildPythonPackage rec { "test_write_imagej_raw" # https://github.com/cgohlke/tifffile/issues/142 "test_func_bitorder_decode" + # Test file is missing + "test_issue_invalid_predictor" ]; pythonImportsCheck = [ From 02f05bbf9207253b26737a9f175b6a496a018265 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 11:45:38 +0200 Subject: [PATCH 8/9] python310Packages.ossfs: 2023.1.0 -> 2023.4.0 Diff: fsspec/ossfs@refs/tags/2023.1.0...2023.4.0 Changelog: https://github.com/fsspec/ossfs/releases/tag/2023.4.0 --- pkgs/development/python-modules/ossfs/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ossfs/default.nix b/pkgs/development/python-modules/ossfs/default.nix index f149920afb7a..d43d6663c48f 100644 --- a/pkgs/development/python-modules/ossfs/default.nix +++ b/pkgs/development/python-modules/ossfs/default.nix @@ -1,16 +1,17 @@ { lib +, aiooss2 , buildPythonPackage , fetchFromGitHub , fsspec , oss2 , pythonOlder -, setuptools-scm , pythonRelaxDepsHook +, setuptools-scm }: buildPythonPackage rec { pname = "ossfs"; - version = "2023.3.0"; + version = "2023.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,12 +20,13 @@ buildPythonPackage rec { owner = "fsspec"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-E+SVH4MUTHHhvopEydiPKTmzazHm6mzjEWd2zp4XGvs="; + hash = "sha256-xYxoEU4+XyiEZThLEyRVHNFg7Bc6jrYEEtq8o+4PtnY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; pythonRelaxDeps = [ + "aiooss2" "fsspec" "oss2" ]; @@ -35,6 +37,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiooss2 fsspec oss2 ]; From 96a3364aa01e7ac051fb21aff91a9c43f9a1ab26 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 May 2023 11:47:07 +0200 Subject: [PATCH 9/9] python310Packages.oss2: 2.16.0 -> 2.17.0 Changelog: https://github.com/aliyun/aliyun-oss-python-sdk/releases/tag/2.17.0 --- pkgs/development/python-modules/oss2/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/oss2/default.nix b/pkgs/development/python-modules/oss2/default.nix index e7f2856771a3..54427f03897c 100644 --- a/pkgs/development/python-modules/oss2/default.nix +++ b/pkgs/development/python-modules/oss2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "oss2"; - version = "2.16.0"; + version = "2.17.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-oss-python-sdk"; - rev = version; - hash = "sha256-Q8U7zMlqpKSoW99MBm9p0AnrGZY7M9oRNImMNJaEjSw="; + rev = "refs/tags/${version}"; + hash = "sha256-EL6qbtVyOJ2RGw3sZiRJouqVNLBMUKGycAZl31M1+oQ="; }; nativeBuildInputs = [ @@ -57,10 +57,13 @@ buildPythonPackage rec { # Tests require network access "tests/test_api_base.py" "tests/test_async_fetch_task.py" + "tests/test_bucket_access_monitor.py" "tests/test_bucket_cname.py" "tests/test_bucket_inventory.py" "tests/test_bucket_meta_query.py" "tests/test_bucket_replication.py" + "tests/test_bucket_resource_group.py" + "tests/test_bucket_style.py" "tests/test_bucket_transfer_acceleration.py" "tests/test_bucket_versioning.py" "tests/test_bucket_worm.py" @@ -105,6 +108,7 @@ buildPythonPackage rec { meta = with lib; { description = "Alibaba Cloud OSS SDK for Python"; homepage = "https://github.com/aliyun/aliyun-oss-python-sdk"; + changelog = "https://github.com/aliyun/aliyun-oss-python-sdk/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; };