diff options
author | Robert Schütz <rschuetz17@gmail.com> | 2019-04-11 18:23:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-11 18:23:33 +0200 |
commit | 5908a0244f493a9c26568d723a77ff3ea417e6d3 (patch) | |
tree | 930cce282ec32c2e48636efd3dfccdcf85ab6957 /pkgs/development/python-modules | |
parent | 993e2b4ec2e670b3bb02b0ad19c83f0ae365c198 (diff) | |
parent | b716b4d7324a215c4f65e9b0ceb64e7124bbb73e (diff) | |
download | nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar.gz nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar.bz2 nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar.lz nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar.xz nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.tar.zst nixpkgs-5908a0244f493a9c26568d723a77ff3ea417e6d3.zip |
Merge pull request #57469 from r-ryantm/auto-update/python3.7-zeep
python37Packages.zeep: 3.2.0 -> 3.3.0
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/aioresponses/default.nix | 47 | ||||
-rw-r--r-- | pkgs/development/python-modules/zeep/default.nix | 59 |
2 files changed, 66 insertions, 40 deletions
diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix new file mode 100644 index 00000000000..55120ad5803 --- /dev/null +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, pbr +, aiohttp +, ddt +, asynctest +, pytest +}: + +buildPythonPackage rec { + pname = "aioresponses"; + version = "0.6.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ii1jiwb8qa2y8cqa1zqn7mjax9l8bpf16k4clv616mxw1l0bvs6"; + }; + + nativeBuildInputs = [ + pbr + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + asynctest + ddt + pytest + ]; + + # Skip a test which makes requests to httpbin.org + checkPhase = '' + pytest -k "not test_address_as_instance_of_url_combined_with_pass_through" + ''; + + meta = { + description = "A helper to mock/fake web requests in python aiohttp package"; + homepage = https://github.com/pnuckowski/aioresponses; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ rvl ]; + }; +} diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index c4d9222e817..0513183d484 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -1,88 +1,67 @@ { fetchPypi , lib , buildPythonPackage -, python , isPy3k , appdirs +, attrs , cached-property , defusedxml , isodate , lxml -, pytz +, requests , requests_toolbelt , six +, pytz +, tornado +, aiohttp # test dependencies , freezegun , mock -, nose , pretend -, pytest +, pytest_3 , pytestcov , requests-mock -, tornado -, attrs +, aioresponses }: buildPythonPackage rec { pname = "zeep"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0bfpdy3hi8aa45piwg5gj0xxa187v13d66qr1ki73qn7c6rbizp5"; + sha256 = "144dk7gw93l4amrwmp5vzxxkcjsgkx6fjqzvsawx2iap23j605j9"; }; propagatedBuildInputs = [ - attrs appdirs + attrs cached-property defusedxml isodate lxml - pytz + requests requests_toolbelt six - ]; - - # testtools dependency not supported for py3k - doCheck = !isPy3k; + pytz - checkInputs = [ + # optional requirements tornado - ]; + ] ++ lib.optional isPy3k aiohttp; - buildInputs = if isPy3k then [] else [ + checkInputs = [ freezegun mock - nose pretend - pytest pytestcov + pytest_3 requests-mock - ]; - - patchPhase = '' - # remove overly strict bounds and lint requirements - sed -e "s/freezegun==.*'/freezegun'/" \ - -e "s/pytest-cov==.*'/pytest-cov'/" \ - -e "s/'isort.*//" \ - -e "s/'flake8.*//" \ - -i setup.py - - # locale.preferredencoding() != 'utf-8' - sed -e "s/xsd', 'r')/xsd', 'r', encoding='utf-8')/" -i tests/*.py - - # cache defaults to home directory, which doesn't exist - sed -e "s|SqliteCache()|SqliteCache(path='./zeeptest.db')|" \ - -i tests/test_transports.py - - # requires xmlsec python module - rm tests/test_wsse_signature.py - ''; + ] ++ lib.optional isPy3k aioresponses; checkPhase = '' runHook preCheck - ${python.interpreter} -m pytest tests + # ignored tests requires xmlsec python module + HOME=$(mktemp -d) pytest tests --ignore tests/test_wsse_signature.py runHook postCheck ''; |