git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140766 from fabaff/bump-gcsfs
commit7e38e25f920289355c893037bdfe7e43b4fb9c78 authorSandro <sandro.jaeckel@gmail.com> dateThu 7 Oct 2021, 11:36 (5 years ago) parentb5b042b4c5d270
7 files changed+53−40
pkgs/development/python-modules/clifford/default.nix+18−20 pkgs/development/python-modules/dask-jobqueue/default.nix+25−10 pkgs/development/python-modules/dask/default.nix+2−2 pkgs/development/python-modules/distributed/default.nix+2−2 pkgs/development/python-modules/fsspec/default.nix+2−2 pkgs/development/python-modules/gcsfs/default.nix+2−2 pkgs/development/python-modules/s3fs/default.nix+2−2
pkgs/development/python-modules/clifford/default.nix+18−20
@@ -1,9 +1,7 @@
11{ lib
22, buildPythonPackage
33, fetchPypi
4−, fetchpatch
5−, isPy27
6−, future
4+, pythonOlder
75, h5py
86, ipython
97, numba
@@ -15,25 +13,16 @@
1513
1614buildPythonPackage rec {
1715 pname = "clifford";
18− version = "1.3.1";
19− disabled = isPy27;
16+ version = "1.4.0";
17+
18+ disabled = pythonOlder "3.5";
2019
2120 src = fetchPypi {
2221 inherit pname version;
23− sha256 = "ade11b20d0631dfc9c2f18ce0149f1e61e4baf114108b27cfd68e5c1619ecc0c";
22+ sha256 = "sha256-eVE8FrD0YHoRreY9CrNb8v4v4KrG83ZU0oFz+V+p+Q0=";
2423 };
2524
26− patches = [
27− (fetchpatch {
28− # Compatibility with h5py 3.
29− # Will be included in the next releasse after 1.3.1
30− url = "https://github.com/pygae/clifford/pull/388/commits/955d141662c68d3d61aa50a162b39e656684c208.patch";
31− sha256 = "0pkpwnk0kfdxsbzsxqlqh8kgif17l5has0mg31g3kyp8lncj89b1";
32− })
33− ];
34−
3525 propagatedBuildInputs = [
36− future
3726 h5py
3827 numba
3928 numpy
@@ -55,15 +44,24 @@ buildPythonPackage rec {
5544 "veryslow"
5645 "test_algebra_initialisation"
5746 "test_cga"
58− "test_estimate_rotor_sequential[random_sphere]"
47+ "test_grade_projection"
48+ "test_multiple_grade_projection"
49+ "test_inverse"
50+ "test_inv_g4"
5951 ];
6052
53+ disabledTestPaths = [
54+ # Disable failing tests
55+ "test_g3c_tools.py"
56+ "test_multivector_inverse.py"
57+ ];
58+
59+ pythonImportsCheck = [ "clifford" ];
60+
6161 meta = with lib; {
6262 description = "Numerical Geometric Algebra Module";
6363 homepage = "https://clifford.readthedocs.io";
6464 license = licenses.bsd3;
65− maintainers = [ maintainers.costrouc ];
66− # many TypeError's in tests
67− broken = true;
65+ maintainers = with maintainers; [ costrouc ];
6866 };
6967}
pkgs/development/python-modules/dask-jobqueue/default.nix+25−10
@@ -1,10 +1,11 @@
11{ lib
22, buildPythonPackage
3−, fetchPypi
43, dask
54, distributed
65, docrep
7−, pytest
6+, fetchPypi
7+, pytest-asyncio
8+, pytestCheckHook
89}:
910
1011buildPythonPackage rec {
@@ -16,19 +17,33 @@ buildPythonPackage rec {
1617 sha256 = "682d7cc0e6b319b6ab83a7a898680c12e9c77ddc77df380b40041290f55d4e79";
1718 };
1819
19− checkInputs = [ pytest ];
20− propagatedBuildInputs = [ dask distributed docrep ];
20+ propagatedBuildInputs = [
21+ dask
22+ distributed
23+ docrep
24+ ];
25+
26+ checkInputs = [
27+ pytest-asyncio
28+ pytestCheckHook
29+ ];
30+
31+ pytestFlagsArray = [
32+ # Do not run entire tests suite (requires slurm, sge, etc.)
33+ "dask_jobqueue/tests/test_jobqueue_core.py"
34+ ];
35+
36+ disabledTests = [
37+ "test_import_scheduler_options_from_config"
38+ "test_security"
39+ ];
2140
22− # do not run entire tests suite (requires slurm, sge, etc.)
23− checkPhase = ''
24− py.test dask_jobqueue/tests/test_jobqueue_core.py
25− '';
41+ pythonImportsCheck = [ "dask_jobqueue" ];
2642
2743 meta = with lib; {
2844 homepage = "https://github.com/dask/dask-jobqueue";
2945 description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE";
3046 license = licenses.bsd3;
31− maintainers = [ maintainers.costrouc ];
32− broken = true;
47+ maintainers = with maintainers; [ costrouc ];
3348 };
3449}
pkgs/development/python-modules/dask/default.nix+2−2
@@ -22,7 +22,7 @@
2222
2323buildPythonPackage rec {
2424 pname = "dask";
25− version = "2021.09.0";
25+ version = "2021.09.1";
2626 format = "setuptools";
2727
2828 disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
3131 owner = "dask";
3232 repo = pname;
3333 rev = version;
34− sha256 = "sha256-Gb6eQ5Hebx3mBNGvgB5yvM4dPsIxJl9ka++yYC/Zf7Q=";
34+ sha256 = "sha256-+UkbXbWV5R/QtVb5rWm/5SA+IoWsIfBciL3vg138jkc=";
3535 };
3636
3737 propagatedBuildInputs = [
pkgs/development/python-modules/distributed/default.nix+2−2
@@ -19,13 +19,13 @@
1919
2020buildPythonPackage rec {
2121 pname = "distributed";
22− version = "2021.9.0";
22+ version = "2021.9.1";
2323 disabled = pythonOlder "3.6";
2424
2525 # get full repository need conftest.py to run tests
2626 src = fetchPypi {
2727 inherit pname version;
28− sha256 = "sha256-IiKc0rJYODCtGC9AAOkjbww/VG7PdfrqJ32IHU9xWbo=";
28+ sha256 = "sha256-9N65ap2+9bBK0DCrkF3+1xuJPXmjaL1Xh7ISaLTtX/g=";
2929 };
3030
3131 propagatedBuildInputs = [
pkgs/development/python-modules/fsspec/default.nix+2−2
@@ -14,14 +14,14 @@
1414
1515buildPythonPackage rec {
1616 pname = "fsspec";
17− version = "2021.08.1";
17+ version = "2021.10.0";
1818 disabled = pythonOlder "3.6";
1919
2020 src = fetchFromGitHub {
2121 owner = "intake";
2222 repo = "filesystem_spec";
2323 rev = version;
24− sha256 = "0xxzcp69div1sy975x82k754snbsksyqr73h6jiasdxj8wka49s0";
24+ sha256 = "sha256-zvOSenK63jFC9vMLsuZT8P9NCXGdkYAB5AxvptROKes=";
2525 };
2626
2727 propagatedBuildInputs = [
pkgs/development/python-modules/gcsfs/default.nix+2−2
@@ -17,14 +17,14 @@
1717
1818buildPythonPackage rec {
1919 pname = "gcsfs";
20− version = "2021.08.1";
20+ version = "2021.10.0";
2121 disabled = pythonOlder "3.6";
2222
2323 src = fetchFromGitHub {
2424 owner = "dask";
2525 repo = pname;
2626 rev = version;
27− sha256 = "sha256-SPQcSdEEbU791oqkvuwmvyvQ6HglvoWKMi5SdnRcEZI=";
27+ sha256 = "sha256-GDVIENtNpo8cg7pplOgoDMVguZmxoUUSs860WNfhmfM=";
2828 };
2929
3030 propagatedBuildInputs = [
pkgs/development/python-modules/s3fs/default.nix+2−2
@@ -8,11 +8,11 @@
88
99buildPythonPackage rec {
1010 pname = "s3fs";
11− version = "2021.8.1";
11+ version = "2021.10.0";
1212
1313 src = fetchPypi {
1414 inherit pname version;
15− sha256 = "0zwy2fr95s5wzrr2iwbayjh9xh421p6wf0m75szl7rw930v1kb2y";
15+ sha256 = "sha256-mSdMmP5b6pu954GQxBrb0bEghyLLKtSGd6aPhHPwOV0=";
1616 };
1717
1818 buildInputs = [