mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-28 18:03:04 +00:00
Merge pull request #221132 from fabaff/gcsfs-bump
python310Packages.fsspec: 2022.10.0 -> 2023.1.0, python310Packages.gcsfs: 2022.10.0 -> 2023.1.0
This commit is contained in:
commit
a398193949
74
pkgs/development/python-modules/aiooss2/default.nix
Normal file
74
pkgs/development/python-modules/aiooss2/default.nix
Normal file
@ -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 ];
|
||||
};
|
||||
}
|
@ -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.4.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-qkvhmXJNxA8v+kbZ6ulxJAQr7ReQpb+JkbhOUnL59KM=";
|
||||
};
|
||||
|
||||
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
|
||||
|
@ -12,13 +12,14 @@
|
||||
, ujson
|
||||
, aiohttp
|
||||
, crcmod
|
||||
, pytest-timeout
|
||||
, pytest-vcr
|
||||
, vcrpy
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "gcsfs";
|
||||
version = "2022.10.0";
|
||||
version = "2023.4.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-FHS+g0SuYH9OPiE/+p2SHrsWfzBQ82GM6hTph8koh+o=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
@ -44,6 +45,7 @@ buildPythonPackage rec {
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-vcr
|
||||
pytest-timeout
|
||||
pytestCheckHook
|
||||
vcrpy
|
||||
];
|
||||
|
@ -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 ];
|
||||
};
|
||||
|
@ -1,16 +1,17 @@
|
||||
{ lib
|
||||
, aiooss2
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, oss2
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ossfs";
|
||||
version = "2023.1.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-5mz1OC+6kDpiLNsMwOp+bdqY2eozMpAekS6h34QiOdo=";
|
||||
hash = "sha256-xYxoEU4+XyiEZThLEyRVHNFg7Bc6jrYEEtq8o+4PtnY=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"aiooss2"
|
||||
"fsspec"
|
||||
"oss2"
|
||||
];
|
||||
@ -35,6 +37,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiooss2
|
||||
fsspec
|
||||
oss2
|
||||
];
|
||||
|
@ -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 = [
|
||||
|
@ -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 { };
|
||||
|
Loading…
Reference in New Issue
Block a user