git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #122734 from fabaff/fix-dependency-injector

python3Packages.dependency-injector: 4.31.1 -> 4.32.2

commit77523d2c66ebc2628032fda4bb0318e211c4214a authorFabian Affolter <fabian@affolter-engineering.ch> dateThu 13 May 2021, 11:11 (6 years ago) parente948a04d8438b8
7 files changed+275−17
compare with master
unifiedsplit
pkgs/development/python-modules/dependency-injector/default.nix+43−17 pkgs/development/python-modules/fpyutils/default.nix+46 pkgs/development/python-modules/md-toc/default.nix+43 pkgs/development/python-modules/mdformat/default.nix+49 pkgs/development/python-modules/mypy-boto3-builder/default.nix+49 pkgs/development/python-modules/mypy-boto3-s3/default.nix+35 pkgs/top-level/python-packages.nix+10
pkgs/development/python-modules/dependency-injector/default.nix+43−17
@@ -1,27 +1,53 @@
1−{ lib, buildPythonPackage, fetchPypi, isPy3k, six, unittest2, pyyaml, flask }:
2−
3−let
4− testPath =
5− if isPy3k
6− then "test_*_py3.py"
7− else "test_*_py2_py3.py";
8−in
1+{ lib
2+, aiohttp
3+, buildPythonPackage
4+, fastapi
5+, fetchFromGitHub
6+, flask
7+, httpx
8+, mypy-boto3-s3
9+, numpy
10+, scipy
11+, pydantic
12+, pytestCheckHook
13+, pyyaml
14+, six
15+}:
916
1017buildPythonPackage rec {
1118 pname = "dependency-injector";
12− version = "4.31.1";
19+ version = "4.32.2";
1320
14− src = fetchPypi {
15− inherit pname version;
16− sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad";
21+ src = fetchFromGitHub {
22+ owner = "ets-labs";
23+ repo = "python-dependency-injector";
24+ rev = version;
25+ sha256 = "1gkkka0hl2hl4axf3gfm58mzv92bg0frr5jikw8g32hd4q4aagcg";
1726 };
1827
19− propagatedBuildInputs = [ six ];
20− checkInputs = [ unittest2 pyyaml flask ];
28+ propagatedBuildInputs = [
29+ six
30+ ];
31+
32+ checkInputs = [
33+ aiohttp
34+ fastapi
35+ flask
36+ httpx
37+ mypy-boto3-s3
38+ numpy
39+ pydantic
40+ scipy
41+ pytestCheckHook
42+ pyyaml
43+ ];
44+
45+ disabledTestPaths = [
46+ # There is no unique identifier to disable the one failing test
47+ "tests/unit/ext/test_aiohttp_py35.py"
48+ ];
2149
22− checkPhase = ''
23− unit2 discover -s tests/unit -p "${testPath}"
24− '';
50+ pythonImportsCheck = [ "dependency_injector" ];
2551
2652 meta = with lib; {
2753 description = "Dependency injection microframework for Python";
pkgs/development/python-modules/fpyutils/default.nixnew file+46
@@ -0,0 +1,46 @@
1+{ lib
2+, atomicwrites
3+, buildPythonPackage
4+, fetchFromGitHub
5+, pytestCheckHook
6+, pythonOlder
7+, requests
8+}:
9+
10+buildPythonPackage rec {
11+ pname = "fpyutils";
12+ version = "2.0.0";
13+ disabled = pythonOlder "3.5";
14+
15+ src = fetchFromGitHub {
16+ owner = "frnmst";
17+ repo = pname;
18+ rev = version;
19+ sha256 = "1n15fvd6191ixxsza49fdd8j43hs0agagg8k9v6rc7by1ffqnl2b";
20+ };
21+
22+ propagatedBuildInputs = [
23+ atomicwrites
24+ requests
25+ ];
26+
27+ checkInputs = [
28+ pytestCheckHook
29+ ];
30+
31+ pytestFlagsArray = [ "fpyutils/tests/*.py" ];
32+
33+ disabledTests = [
34+ # Don't run test which requires bash
35+ "test_execute_command_live_output"
36+ ];
37+
38+ pythonImportsCheck = [ "fpyutils" ];
39+
40+ meta = with lib; {
41+ description = "Collection of useful non-standard Python functions";
42+ homepage = "https://github.com/frnmst/fpyutils";
43+ license = with licenses; [ gpl3Plus ];
44+ maintainers = with maintainers; [ fab ];
45+ };
46+}
pkgs/development/python-modules/md-toc/default.nixnew file+43
@@ -0,0 +1,43 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, fpyutils
5+, pytestCheckHook
6+, pythonOlder
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "md-toc";
11+ version = "7.2.0";
12+ disabled = pythonOlder "3.5";
13+
14+ src = fetchFromGitHub {
15+ owner = "frnmst";
16+ repo = pname;
17+ rev = version;
18+ sha256 = "1v74iddfk5d6170frg89vzrkz9xrycl1f50g59imc7x7g50i6c2x";
19+ };
20+
21+ propagatedBuildInputs = [
22+ fpyutils
23+ ];
24+
25+ checkInputs = [
26+ pytestCheckHook
27+ ];
28+
29+ postPatch = ''
30+ substituteInPlace setup.py --replace "fpyutils>=1.2,<1.3" "fpyutils>=1.2"
31+ '';
32+
33+ pytestFlagsArray = [ "md_toc/tests/*.py" ];
34+
35+ pythonImportsCheck = [ "md_toc" ];
36+
37+ meta = with lib; {
38+ description = "Table of contents generator for Markdown";
39+ homepage = "https://docs.franco.net.eu.org/md-toc/";
40+ license = with licenses; [ gpl3Plus ];
41+ maintainers = with maintainers; [ fab ];
42+ };
43+}
pkgs/development/python-modules/mdformat/default.nixnew file+49
@@ -0,0 +1,49 @@
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+, importlib-metadata
5+, markdown-it-py
6+, poetry-core
7+, pytestCheckHook
8+, pythonOlder
9+, typing-extensions
10+}:
11+
12+buildPythonPackage rec {
13+ pname = "mdformat";
14+ version = "0.7.6";
15+ format = "pyproject";
16+ disabled = pythonOlder "3.6";
17+
18+ src = fetchFromGitHub {
19+ owner = "executablebooks";
20+ repo = pname;
21+ rev = version;
22+ sha256 = "0mnbi3vp7zgllpcpf6vrjw9y6jas95shphn99ayr8b8wgxsaqkif";
23+ };
24+
25+ nativeBuildInputs = [
26+ poetry-core
27+ ];
28+
29+ propagatedBuildInputs = [
30+ markdown-it-py
31+ ] ++ lib.optionals (pythonOlder "3.10") [
32+ importlib-metadata
33+ ] ++ lib.optionals (pythonOlder "3.7") [
34+ typing-extensions
35+ ];
36+
37+ checkInputs = [
38+ pytestCheckHook
39+ ];
40+
41+ pythonImportsCheck = [ "mdformat" ];
42+
43+ meta = with lib; {
44+ description = "CommonMark compliant Markdown formatter";
45+ homepage = "https://mdformat.rtfd.io/";
46+ license = with licenses; [ mit ];
47+ maintainers = with maintainers; [ fab ];
48+ };
49+}
pkgs/development/python-modules/mypy-boto3-builder/default.nixnew file+49
@@ -0,0 +1,49 @@
1+{ lib
2+, black
3+, boto3
4+, buildPythonPackage
5+, fetchFromGitHub
6+, jinja2
7+, md-toc
8+, isort
9+, mdformat
10+, pyparsing
11+, pytestCheckHook
12+, pythonOlder
13+}:
14+
15+buildPythonPackage rec {
16+ pname = "mypy-boto3-builder";
17+ version = "4.12.0";
18+ disabled = pythonOlder "3.6";
19+
20+ src = fetchFromGitHub {
21+ owner = "vemel";
22+ repo = "mypy_boto3_builder";
23+ rev = version;
24+ sha256 = "09kbmrpnph5kbxlqqavpxg3l85dmk3vzmwawa4s09y9gknxxkcv9";
25+ };
26+
27+ propagatedBuildInputs = [
28+ black
29+ boto3
30+ isort
31+ jinja2
32+ md-toc
33+ mdformat
34+ pyparsing
35+ ];
36+
37+ checkInputs = [
38+ pytestCheckHook
39+ ];
40+
41+ pythonImportsCheck = [ "mypy_boto3_builder" ];
42+
43+ meta = with lib; {
44+ description = "Type annotations builder for boto3";
45+ homepage = "https://vemel.github.io/mypy_boto3_builder/";
46+ license = with licenses; [ bsd3 ];
47+ maintainers = with maintainers; [ fab ];
48+ };
49+}
pkgs/development/python-modules/mypy-boto3-s3/default.nixnew file+35
@@ -0,0 +1,35 @@
1+{ lib
2+, boto3
3+, buildPythonPackage
4+, fetchPypi
5+, pythonOlder
6+, typing-extensions
7+}:
8+
9+buildPythonPackage rec {
10+ pname = "mypy-boto3-s3";
11+ version = "1.17.71";
12+ disabled = pythonOlder "3.6";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "0zgx3f41j80xy203jwms7j72svxy10ry5v9w3ql817ai4lcrspnn";
17+ };
18+
19+ propagatedBuildInputs = [
20+ boto3
21+ ] ++ lib.optionals (pythonOlder "3.8") [
22+ typing-extensions
23+ ];
24+
25+ # Project has no tests
26+ doCheck = false;
27+ pythonImportsCheck = [ "mypy_boto3_s3" ];
28+
29+ meta = with lib; {
30+ description = "Type annotations for boto3";
31+ homepage = "https://vemel.github.io/boto3_stubs_docs/mypy_boto3_s3/";
32+ license = with licenses; [ bsd3 ];
33+ maintainers = with maintainers; [ fab ];
34+ };
35+}
pkgs/top-level/python-packages.nix+10
@@ -2565,6 +2565,8 @@ in {
25652565
25662566 fpylll = callPackage ../development/python-modules/fpylll { };
25672567
2568+ fpyutils = callPackage ../development/python-modules/fpyutils { };
2569+
25682570 freebox-api = callPackage ../development/python-modules/freebox-api { };
25692571
25702572 freetype-py = callPackage ../development/python-modules/freetype-py { };
@@ -4121,8 +4123,12 @@ in {
41214123
41224124 mcstatus = callPackage ../development/python-modules/mcstatus { };
41234125
4126+ md-toc = callPackage ../development/python-modules/md-toc { };
4127+
41244128 md2gemini = callPackage ../development/python-modules/md2gemini { };
41254129
4130+ mdformat = callPackage ../development/python-modules/mdformat { };
4131+
41264132 mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
41274133
41284134 MDP = callPackage ../development/python-modules/mdp { };
@@ -4367,6 +4373,10 @@ in {
43674373
43684374 mypy = callPackage ../development/python-modules/mypy { };
43694375
4376+ mypy-boto3-builder = callPackage ../development/python-modules/mypy-boto3-builder { };
4377+
4378+ mypy-boto3-s3 = callPackage ../development/python-modules/mypy-boto3-s3 { };
4379+
43704380 mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { };
43714381
43724382 mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { };