From 1dc6ee10d7d398893714ef81cece133049028c8e Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 13 Dec 2017 23:02:53 +0100 Subject: oslo-*: rip oslo-vmware: rip oslo-serialization: rip pycadf: rip os-brick: rip taskflow: rip oslo-utils: rip oslo-middlewar: rip oslo-versionedobjects: rip oslo-messaging: rip oslo-reports: rip oslo-db: rip oslo-rootwrap: rip oslo-service: rip oslo-cache: rip oslo-config: rip glance_store: rip networking-hyperv: rip ryu: rip keystoneauth1: rip os-client-config: rip oslo-log: rip tempest-lib: rip oslo-context: rip oslo-i18n: rip oslotest: rip futurist: rip bandit: rip cliff: rip cliff-tablib: rip oslosphinx: rip osprofile: rip os-testr: rip stevedore: remove oslosphinx from buildInputs oslo-policy: rip oslo-concurrency: rip unused packages: swiftclient: rip debtcollector: rip automaton: rip --- .../python-modules/fix_swiftclient_mocking.patch | 26 - .../python-modules/keystoneauth1/default.nix | 37 - .../python-modules/os-testr/default.nix | 33 - .../python-modules/oslo-config/default.nix | 32 - .../python-modules/stevedore/default.nix | 3 +- pkgs/top-level/python-packages.nix | 762 --------------------- 6 files changed, 1 insertion(+), 892 deletions(-) delete mode 100644 pkgs/development/python-modules/fix_swiftclient_mocking.patch delete mode 100644 pkgs/development/python-modules/keystoneauth1/default.nix delete mode 100644 pkgs/development/python-modules/os-testr/default.nix delete mode 100644 pkgs/development/python-modules/oslo-config/default.nix (limited to 'pkgs') diff --git a/pkgs/development/python-modules/fix_swiftclient_mocking.patch b/pkgs/development/python-modules/fix_swiftclient_mocking.patch deleted file mode 100644 index 027ef56b317cb..0000000000000 --- a/pkgs/development/python-modules/fix_swiftclient_mocking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f37947a7e083532676a9f2ed079dff6bdc19a8e9 Mon Sep 17 00:00:00 2001 -From: Sabari Kumar Murugesan -Date: Tue, 15 Sep 2015 14:22:11 -0700 -Subject: [PATCH] Fix swift store tests for latest swiftclient - -The latest swiftclient (2.6.0) breaks some of the swift store -tests as a mock function's parameters got changed. - -Change-Id: I36512fbe642f4f12cf1382fdf0e37eccbf1acba4 ---- - glance_store/tests/unit/test_swift_store.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py -index f738cf9..3fe4699 100644 ---- a/glance_store/tests/unit/test_swift_store.py -+++ b/glance_store/tests/unit/test_swift_store.py -@@ -92,7 +92,7 @@ def fake_head_container(url, token, container, **kwargs): - def fake_put_container(url, token, container, **kwargs): - fixture_containers.append(container) - -- def fake_post_container(url, token, container, headers, http_conn=None): -+ def fake_post_container(url, token, container, headers, **kwargs): - for key, value in six.iteritems(headers): - fixture_container_headers[key] = value - diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix deleted file mode 100644 index 7405f7f74cd56..0000000000000 --- a/pkgs/development/python-modules/keystoneauth1/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ buildPythonPackage, isPyPy, fetchPypi, python -, pbr, testtools, testresources, testrepository, mock -, pep8, fixtures, mox3, requests-mock -, iso8601, requests, six, stevedore, webob, oslo-config -, pyyaml, betamax, oauthlib -}: - -buildPythonPackage rec { - pname = "keystoneauth1"; - version = "3.2.0"; - name = "${pname}-${version}"; - disabled = isPyPy; # a test fails - - src = fetchPypi { - inherit pname version; - sha256 = "0rg3harfyvai34lrjiqnl1crmvswjvj8nsviasnz4b9pcvp3d03n"; - }; - - buildInputs = [ pbr ]; - checkInputs = [ pyyaml betamax oauthlib testtools testresources - testrepository mock pep8 fixtures mox3 requests-mock ]; - propagatedBuildInputs = [ iso8601 requests six stevedore webob ]; - - doCheck = true; - # 1. oslo-config - # 2. oslo-utils - # 3. requests-kerberos - preCheck = '' - rm keystoneauth1/tests/unit/loading/test_{session,conf,adapter}.py - rm keystoneauth1/tests/unit/access/test_v{2,3}_access.py - rm keystoneauth1/tests/unit/extras/kerberos/test_fedkerb_loading.py - ''; - postPatch = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" "" - ''; -} diff --git a/pkgs/development/python-modules/os-testr/default.nix b/pkgs/development/python-modules/os-testr/default.nix deleted file mode 100644 index baafc44d10d3d..0000000000000 --- a/pkgs/development/python-modules/os-testr/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, - pbr, Babel, testrepository, subunit, testtools, - coverage, oslosphinx, oslotest, testscenarios, six, ddt -}: -buildPythonPackage rec { - version = "0.8.2"; - pname = "os-testr"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "d8a60bd56c541714a5cab4d1996c8ddfdb5c7c35393d55be617803048c170837"; - }; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - sed -i 's@python@${python.interpreter}@' os_testr/tests/files/testr-conf - ''; - - checkPhase = '' - export PATH=$PATH:$out/bin - ${python.interpreter} setup.py test - ''; - - propagatedBuildInputs = [ pbr Babel testrepository subunit testtools ]; - buildInputs = [ coverage oslosphinx oslotest testscenarios six ddt ]; - - meta = with stdenv.lib; { - description = "A testr wrapper to provide functionality for OpenStack projects"; - homepage = http://docs.openstack.org/developer/os-testr/; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix deleted file mode 100644 index de91a507f1795..0000000000000 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pbr, six, netaddr, stevedore, mock, -debtcollector, rfc3986, pyyaml, oslo-i18n }: - -buildPythonPackage rec { - pname = "oslo.config"; - version = "4.13.2"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "882e5f1dcc0e5b0d7af877b2df0e2692113c5975db8cbbbf0dd3d2b905aefc0b"; - }; - - propagatedBuildInputs = [ pbr six netaddr stevedore debtcollector rfc3986 pyyaml oslo-i18n ]; - buildInputs = [ mock ]; - - # TODO: circular import on oslo-i18n - doCheck = false; - - postPatch = '' - substituteInPlace requirements.txt --replace "argparse" "" - ''; - - meta = with lib; { - description = "Oslo Configuration API"; - homepage = "https://docs.openstack.org/oslo.config/latest/"; - license = licenses.asl20; - maintainers = with maintainers; [ makefu ]; - }; - - -} diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 1955320fd266d..326282a39c3da 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, oslosphinx, pbr, six, argparse }: +{ stdenv, buildPythonPackage, fetchPypi, pbr, six, argparse }: buildPythonPackage rec { pname = "stevedore"; @@ -12,7 +12,6 @@ buildPythonPackage rec { doCheck = false; - buildInputs = [ oslosphinx ]; propagatedBuildInputs = [ pbr six argparse ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 494395541b9a9..00179ee4b224c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3045,25 +3045,6 @@ in { curtsies = callPackage ../development/python-modules/curtsies { }; - oslo-vmware = buildPythonPackage rec { - name = "oslo.vmware-${version}"; - version = "1.22.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.vmware/${name}.tar.gz"; - sha256 = "1119q3x2y3hjz3p784byr13aqay75pbj4cb8v43gjq5piqlpp16x"; - }; - - propagatedBuildInputs = with self; [ - pbr stevedore netaddr iso8601 six oslo-i18n oslo-utils Babel pyyaml eventlet - requests urllib3 oslo-concurrency suds-jurko - ]; - buildInputs = with self; [ - bandit oslosphinx coverage testtools testscenarios testrepository mock - - ]; - }; - tablib = buildPythonPackage rec { name = "tablib-${version}"; version = "0.10.0"; @@ -3082,27 +3063,6 @@ in { }; - cliff-tablib = buildPythonPackage rec { - name = "cliff-tablib-${version}"; - version = "1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cliff-tablib/cliff-tablib-${version}.tar.gz"; - sha256 = "0fa1qw41lwda5ac3z822qhzbilp51y6p1wlp0h76vrvqcqgxi3ja"; - }; - - propagatedBuildInputs = with self; [ - argparse pyyaml pbr six cmd2 tablib unicodecsv prettytable stevedore pyparsing cliff - ]; - buildInputs = with self; [ - - ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/dreamhost/cliff-tablib"; - }; - }; - openant = buildPythonPackage rec { name = "openant-unstable-2017-02-11"; @@ -12640,302 +12600,11 @@ in { }; }; - oslosphinx = buildPythonPackage rec { - name = "oslosphinx-3.3.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslosphinx/${name}.tar.gz"; - sha256 = "1rjiiahw2y7pg5rl15fvhmfyh26vm433000nwp7c94khx7w85w75"; - }; - - doCheck = false; - - propagatedBuildInputs = with self; [ - pbr requests sphinx_1_2 - ]; - }; - - tempest-lib = buildPythonPackage rec { - name = "tempest-lib-${version}"; - version = "0.10.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tempest-lib/${name}.tar.gz"; - sha256 = "0x842a67k9f7yk3zr6755s4qldkfngljqy5whd4jb553y4hn5lyj"; - }; - - patchPhase = '' - substituteInPlace tempest_lib/tests/cli/test_execute.py --replace "/bin/ls" "${pkgs.coreutils}/bin/ls" - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - buildInputs = with self; [ testtools testrepository subunit oslotest ]; - propagatedBuildInputs = with self; [ - pbr six paramiko httplib2 jsonschema iso8601 fixtures Babel oslo-log - os-testr ]; - - }; - - os-testr = callPackage ../development/python-modules/os-testr { }; - - bandit = buildPythonPackage rec { - name = "bandit-${version}"; - version = "0.16.1"; - disabled = isPy33; - doCheck = !isPyPy; # a test fails - - src = pkgs.fetchurl { - url = "mirror://pypi/b/bandit/${name}.tar.gz"; - sha256 = "0qd9kxknac5n5xfl5zjnlmk6jr94krkcx29zgyna8p9lyb828hsk"; - }; - - propagatedBuildInputs = with self; [ pbr six pyyaml appdirs stevedore ]; - buildInputs = with self; [ beautifulsoup4 oslosphinx testtools testscenarios - testrepository fixtures mock ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - oslo-serialization = buildPythonPackage rec { - pname = "oslo.serialization"; - version = "2.20.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "00j8hn8f0shk4anzb6zwn8w1sfxcil9a3jgxljwalq6ma2rzp9pw"; - }; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - propagatedBuildInputs = with self; [ pbr Babel six iso8601 pytz oslo-utils msgpack netaddr ]; - buildInputs = with self; [ oslotest mock coverage simplejson oslo-i18n ]; - }; - rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - pycadf = buildPythonPackage rec { - name = "pycadf-${version}"; - version = "1.1.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pycadf/pycadf-1.1.0.tar.gz"; - sha256 = "0lv9nhbvj1pa8qgn3qvyk9k4q8f7w541074n1rhdjnjkinh4n4dg"; - }; - - propagatedBuildInputs = with self; [ - oslo-i18n argparse six wrapt oslo-utils pbr oslo-config Babel netaddr - monotonic iso8601 pytz stevedore oslo-serialization msgpack - debtcollector netifaces - ]; - buildInputs = with self; [ - oslosphinx testtools testrepository oslotest - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = with stdenv.lib; { - homepage = https://launchpad.net/pycadf; - }; - }; - - - oslo-utils = buildPythonPackage rec { - pname = "oslo.utils"; - version = "3.29.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0l90ijw96czjd6z8bw88983rsnq5753iw86rhk1wi064w4rs19ig"; - }; - - propagatedBuildInputs = with self; [ pbr Babel six iso8601 pytz netaddr netifaces - monotonic oslo-i18n wrapt debtcollector ]; - buildInputs = with self; [ oslotest mock coverage oslosphinx ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - oslo-middleware = buildPythonPackage rec { - name = "oslo.middleware-${version}"; - version = "2.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.middleware/${name}.tar.gz"; - sha256 = "14acinchdpmc1in39mz9kh1h2rd1ygwg3zdhbwzrlhy8wbzzi4w9"; - }; - - propagatedBuildInputs = with self; [ - oslo-i18n six oslo-utils pbr oslo-config Babel oslo-context stevedore - jinja2 webob debtcollector - ]; - buildInputs = with self; [ - coverage testtools oslosphinx oslotest - ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - sed -i '/ordereddict/d' requirements.txt - ''; - - meta = with stdenv.lib; { - homepage = "http://wiki.openstack.org/wiki/Oslo#oslo.middleware"; - }; - }; - - oslo-versionedobjects = buildPythonPackage rec { - name = "oslo.versionedobjects-${version}"; - version = "0.11.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.versionedobjects/${name}.tar.gz"; - sha256 = "1ddcb2zf7a3544ay4sxw200a4mz7p0n1f7826h3vibfdqjlc80y7"; - }; - - propagatedBuildInputs = with self; [ - six Babel oslo-concurrency oslo-config oslo-context oslo-messaging - oslo-serialization oslo-utils iso8601 oslo-log oslo-i18n webob - ]; - buildInputs = with self; [ - oslo-middleware cachetools_1 oslo-service futurist anyjson oslosphinx - testtools oslotest - ]; - - meta = with stdenv.lib; { - homepage = "http://launchpad.net/oslo"; - }; - }; - cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; cachetools = callPackage ../development/python-modules/cachetools {}; - futurist = buildPythonPackage rec { - name = "futurist-${version}"; - version = "0.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/f/futurist/${name}.tar.gz"; - sha256 = "0wf0k9xf5xzmi79418xq8zxwr7w7a4g4alv3dds9afb2l8bh9crg"; - }; - - patchPhase = '' - sed -i "s/test_gather_stats/noop/" futurist/tests/test_executors.py - ''; - - propagatedBuildInputs = with self; [ - contextlib2 pbr six monotonic futures eventlet - ]; - buildInputs = with self; [ - testtools testscenarios testrepository oslotest subunit - ]; - - # breaks in sandboxing - doCheck = false; - }; - - oslo-messaging = buildPythonPackage rec { - name = "oslo.messaging-${version}"; - version = "2.7.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.messaging/${name}.tar.gz"; - sha256 = "1af7l4ri3xfjcnjp2yhngz34h3ls00yyj1x8i64dxb86ryy43kd1"; - }; - - propagatedBuildInputs = with self; [ - pbr oslo-config oslo-context oslo-log oslo-utils oslo-serialization - oslo-i18n stevedore six eventlet greenlet webob pyyaml kombu_3 trollius - aioeventlet cachetools_1 oslo-middleware futurist redis oslo-service - eventlet pyzmq - ]; - - buildInputs = with self; [ - oslotest mock mox3 subunit testtools testscenarios testrepository - fixtures oslosphinx - ]; - - preBuild = '' - # transient failure https://bugs.launchpad.net/oslo.messaging/+bug/1510481 - sed -i 's/test_send_receive/noop/' oslo_messaging/tests/drivers/test_impl_rabbit.py - ''; - }; - - os-brick = buildPythonPackage rec { - name = "os-brick-${version}"; - version = "0.5.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/os-brick/${name}.tar.gz"; - sha256 = "1q05yk5hada470rwsv3hfjn7pdp9n7pprmnslm723l7cfhf7cgm6"; - }; - - propagatedBuildInputs = with self; [ - six retrying oslo-utils oslo-service oslo-i18n oslo-serialization oslo-log - oslo-concurrency eventlet Babel pbr - ]; - buildInputs = with self; [ - testtools testscenarios testrepository requests - ]; - - checkPhase = '' - ${python.interpreter} -m subunit.run discover -t ./ . - ''; - - meta = with stdenv.lib; { - homepage = "http://www.openstack.org/"; - }; - }; - - oslo-reports = buildPythonPackage rec { - name = "oslo.reports-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.reports/${name}.tar.gz"; - sha256 = "0j27mbsa5y1fn9lxn98xs7p9vipcig47srm5sgbgma0ilv125b65"; - }; - - propagatedBuildInputs = with self; [ - oslo-i18n oslo-utils oslo-serialization six psutil_1 Babel jinja2 pbr psutil_1 - ]; - buildInputs = with self; [ - coverage greenlet eventlet oslosphinx oslotest - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - cliff = buildPythonPackage rec { - name = "cliff-${version}"; - version = "1.15.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cliff/${name}.tar.gz"; - sha256 = "1rrbq1nvc84x417hbfm9sc1scia16nilr8nm8ycm8iq5jkh6zfpm"; - }; - - propagatedBuildInputs = with self; [ - argparse pyyaml pbr six cmd2 stevedore unicodecsv prettytable pyparsing - ]; - buildInputs = with self; [ - httplib2 oslosphinx coverage mock nose tempest-lib - ]; - - meta = with stdenv.lib; { - homepage = "https://launchpad.net/python-cliff"; - # requires an update, incompatible with current dependencies (pbr) - broken = true; - }; - }; - cmd2 = buildPythonPackage rec { name = "cmd2-${version}"; version = "0.7.7"; @@ -12960,50 +12629,6 @@ in { }; }; - - oslo-db = buildPythonPackage rec { - name = "oslo.db-${version}"; - version = "3.0.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.db/${name}.tar.gz"; - sha256 = "0jjimsfl53wigzf92dhns813n65qcwilcqlj32m86rxrcz0pjgph"; - }; - - propagatedBuildInputs = with self; [ - six stevedore sqlalchemy_migrate sqlalchemy oslo-utils oslo-context - oslo-config oslo-i18n iso8601 Babel alembic pbr psycopg2 - ]; - buildInputs = with self; [ - tempest-lib testresources mock oslotest - ]; - }; - - oslo-rootwrap = buildPythonPackage rec { - name = "oslo.rootwrap-${version}"; - version = "2.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.rootwrap/${name}.tar.gz"; - sha256 = "1711rlmykizw675ihbaqmk3ph6ah0njbygxr9lrdnacy6yrlmbd5"; - }; - - # https://bugs.launchpad.net/oslo.rootwrap/+bug/1519839 - patchPhase = '' - substituteInPlace oslo_rootwrap/filters.py \ - --replace "/bin/cat" "${pkgs.coreutils}/bin/cat" \ - --replace "/bin/kill" "${pkgs.coreutils}/bin/kill" - ''; - - buildInputs = with self; [ eventlet mock oslotest ]; - propagatedBuildInputs = with self; [ - six pbr - ]; - - # way too many assumptions - doCheck = false; - }; - warlock = buildPythonPackage rec { name = "warlock-${version}"; version = "1.2.0"; @@ -13026,57 +12651,6 @@ in { }; - oslo-service = buildPythonPackage rec { - pname = "oslo.service"; - version = "1.26.0"; - - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "083q7z6nrska5fq12vnd70blphxscd7ivca2d78jk84d99h0m5n5"; - }; - - propagatedBuildInputs = with self; [ - repoze_lru PasteDeploy Babel oslo-context debtcollector - oslo-concurrency wrapt eventlet six oslo-serialization greenlet paste - oslo-config monotonic iso8601 oslo-log pytz routes msgpack - oslo-i18n argparse oslo-utils pbr enum34 netaddr stevedore netifaces - pyinotify webob retrying pyinotify oslo-log ]; - buildInputs = with self; [ - oslosphinx oslotest pkgs.procps mock mox3 fixtures subunit testrepository - testtools testscenarios - ]; - - ## cannot import eventlet due to: - # _proto_tcp = socket.getprotobyname('tcp') - doCheck = false; - - meta = with stdenv.lib; { - homepage = "http://wiki.openstack.org/wiki/Oslo#oslo.service"; - }; - }; - - oslo-cache = buildPythonPackage rec { - name = "oslo.cache-${version}"; - version = "0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.cache/${name}.tar.gz"; - sha256 = "0dzvm5xkfj1alf469d7v3syig9f91kjh4p55k57ykgaww3y4cdjp"; - }; - - propagatedBuildInputs = with self; [ - Babel dogpile_cache six oslo-config oslo-i18n oslo-log oslo-utils - ]; - buildInputs = with self; [ - oslosphinx oslotest memcached pymongo - ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - pecan = callPackage ../development/python-modules/pecan { }; kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; @@ -13099,31 +12673,6 @@ in { }; }; - ryu = buildPythonPackage rec { - name = "ryu-${version}"; - version = "3.26"; - - propagatedBuildInputs = with self; [ - pbr paramiko lxml - ]; - buildInputs = with self; [ - webtest routes oslo-config msgpack eventlet FormEncode - ]; - - preCheck = '' - # we don't really need linters - sed -i '/pylint/d' tools/test-requires - sed -i '/pep8/d' tools/test-requires - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/ryu/${name}.tar.gz"; - sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6"; - }; - - meta.broken = true; - }; - WSME = buildPythonPackage rec { name = "WSME-${version}"; version = "0.8.0"; @@ -13152,89 +12701,6 @@ in { ]; }; - taskflow = buildPythonPackage rec { - name = "taskflow-${version}"; - version = "1.23.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/taskflow/${name}.tar.gz"; - sha256 = "15np1rc6g9vksgdj0y930ysx5wbmhvc082g264j5zbj6c479g8qa"; - }; - - propagatedBuildInputs = with self; [ - pbr futures enum34 debtcollector cachetools_1 oslo-serialization oslo-utils - jsonschema monotonic stevedore networkx futurist pbr automaton fasteners - ]; - buildInputs = with self; [ - oslosphinx pymysql psycopg2 alembic redis eventlet kazoo zake kombu - testscenarios testtools mock oslotest - ]; - - preBuild = '' - # too many transient failures - rm taskflow/tests/unit/test_engines.py - ''; - - checkPhase = '' - sed -i '/doc8/d' test-requirements.txt - ${python.interpreter} setup.py test - ''; - }; - - glance_store = buildPythonPackage rec { - name = "glance_store-${version}"; - version = "0.9.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/g/glance_store/${name}.tar.gz"; - sha256 = "16az3lq9szl0ixna9rd82dmn4sfxqyivhn4z3z79vk8qdfip1sr9"; - }; - - # remove on next version bump - patches = [ - ../development/python-modules/fix_swiftclient_mocking.patch - ]; - - propagatedBuildInputs = with self; [ - oslo-config oslo-i18n oslo-serialization oslo-utils oslo-concurrency stevedore - enum34 eventlet six jsonschema swiftclient httplib2 pymongo - ]; - buildInputs = with self; [ - mock fixtures subunit requests-mock testrepository testscenarios testtools - oslotest oslosphinx boto oslo-vmware - ]; - - meta = with stdenv.lib; { - description = "Glance Store Library"; - homepage = "http://www.openstack.org/"; - }; - }; - - swiftclient = buildPythonPackage rec { - name = "swiftclient-${version}"; - version = "2.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-swiftclient/python-swiftclient-${version}.tar.gz"; - sha256 = "1j33l4z9vqh0scfncl4fxg01zr1hgqxhhai6gvcih1gccqm4nd7p"; - }; - - propagatedBuildInputs = with self; [ - pbr requests futures six - ]; - buildInputs = with self; [ - testtools testrepository mock - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = with stdenv.lib; { - description = "Python bindings to the OpenStack Object Storage API"; - homepage = "http://www.openstack.org/"; - }; - }; zake = buildPythonPackage rec { name = "zake-${version}"; @@ -13256,53 +12722,6 @@ in { }; }; - automaton = buildPythonPackage rec { - name = "automaton-${version}"; - version = "0.8.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/a/automaton/${name}.tar.gz"; - sha256 = "040rw7w92mp34a15vzvbfvhv1cg8zf81s9jbdd9rmwxr0gmgp2ya"; - }; - - propagatedBuildInputs = with self; [ - wrapt pbr Babel six pytz prettytable debtcollector - ]; - buildInputs = with self; [ - testtools testscenarios testrepository - ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - networking-hyperv = buildPythonPackage rec { - name = "networking-hyperv-${version}"; - version = "2015.1.0"; - disabled = isPy3k; # failing tests - - src = pkgs.fetchurl { - url = "mirror://pypi/n/networking-hyperv/${name}.tar.gz"; - sha256 = "04wfkl8rffxp6gp7qvhhc8y80cy0akmh3z7k7y2sj6savg9q7jdj"; - }; - - propagatedBuildInputs = with self; [ - pbr Babel oslo-config oslo-i18n oslo-serialization oslo-utils oslo-log - ]; - buildInputs = with self; [ - testtools testscenarios testrepository oslotest oslosphinx subunit eventlet - fixtures mock - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - # it has pinned pbr<1.0 - sed -i '/pbr/d' requirements.txt - # https://github.com/openstack/networking-hyperv/commit/56d66fc012846620a60cb8f18df5a1c889fe0e26 - sed -i 's/from oslo import i18n/import oslo_i18n as i18n/' hyperv/common/i18n.py - ''; - }; - kazoo = buildPythonPackage rec { name = "kazoo-${version}"; version = "2.2.1"; @@ -13337,29 +12756,6 @@ in { }; }; - osprofiler = buildPythonPackage rec { - name = "osprofiler-${version}"; - version = "0.3.0"; - disabled = isPyPy; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/osprofiler/${name}.tar.gz"; - sha256 = "01rjym49nn4ry1pr2n8fyal1hf17jqhp2yihg8gr15nfjc5iszkx"; - }; - - propagatedBuildInputs = with self; [ - pbr six webob - ]; - buildInputs = with self; [ - oslosphinx coverage mock subunit testrepository testtools - ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - substituteInPlace requirements.txt --replace "argparse" "" - ''; - }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; pycountry = buildPythonPackage rec { @@ -13398,23 +12794,6 @@ in { }; }; - oslo-policy = buildPythonPackage rec { - name = "oslo.policy-${version}"; - version = "0.12.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.policy/${name}.tar.gz"; - sha256 = "06apaj6fwg7f2g5psmxzr5a9apj2l4k2y8kl1hqzyssykblij8ss"; - }; - - propagatedBuildInputs = with self; [ - requests oslo-config oslo-i18n oslo-serialization oslo-utils six - ]; - buildInputs = with self; [ - oslosphinx httpretty oslotest - ]; - }; - ldappool = buildPythonPackage rec { name = "ldappool-${version}"; version = "1.0"; @@ -13450,34 +12829,6 @@ in { }; }; - - oslo-concurrency = buildPythonPackage rec { - pname = "oslo.concurrency"; - version = "3.22.0"; - name = "${pname}-${version}"; - - src = fetchPypi { - inherit pname version; - sha256 = "0nh1ycc2s6w05g5w63bsmmda0gw7qsrwlax3as8a0piai99z4m51"; - }; - - propagatedBuildInputs = with self; [ - oslo-i18n argparse six wrapt oslo-utils pbr enum34 Babel netaddr monotonic - iso8601 oslo-config pytz netifaces stevedore debtcollector retrying fasteners - eventlet - ]; - buildInputs = with self; [ - oslosphinx fixtures coverage oslotest - ] ++ (optional (!isPy3k) futures); - - # too much magic in tests - doCheck = false; - - meta = with stdenv.lib; { - homepage = http://launchpad.net/oslo; - }; - }; - retrying = buildPythonPackage rec { name = "retrying-${version}"; version = "1.3.3"; @@ -13547,100 +12898,6 @@ in { olefile = callPackage ../development/python-modules/olefile { }; - oslo-log = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "oslo.log"; - version = "3.31.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1w08cl98n8592pvb2gw01mqlwi8nnnpg1zy10mvj6xdpvfk2yqzz"; - }; - - propagatedBuildInputs = with self; [ - pbr Babel six iso8601 debtcollector dateutil - oslo-utils oslo-i18n oslo-config oslo-serialization oslo-context - ] ++ stdenv.lib.optional stdenv.isLinux pyinotify; - buildInputs = with self; [ oslotest oslosphinx ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - oslo-context = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "oslo.context"; - version = "2.18.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "1sc7qrwffsm15m91c17k0xiglv6bxh9sbksvxvrrgja82m57mgh6"; - }; - - propagatedBuildInputs = with self; [ pbr Babel ]; - buildInputs = with self; [ oslotest coverage oslosphinx ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - oslo-i18n = buildPythonPackage rec { - name = "oslo.i18n-${version}"; - version = "3.18.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslo.i18n/${name}.tar.gz"; - sha256 = "19w6wil588fgppc7d42fqkrjs0y81ap62svzbij8hlb3w2d4a91n"; - }; - - propagatedBuildInputs = with self; [ pbr Babel six ]; - buildInputs = with self; [ mock coverage oslotest ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - oslo-config = callPackage ../development/python-modules/oslo-config { }; - - oslotest = buildPythonPackage rec { - name = "oslotest-${version}"; - version = "2.18.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/oslotest/${name}.tar.gz"; - sha256 = "0a0zhpb4yp7g6d290jk7a4pfci4ciwhsrqzhbwbl2szi50gp7km1"; - }; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - propagatedBuildInputs = with self; [ pbr fixtures subunit six testrepository - os-client-config debtcollector testscenarios testtools mock mox3 os-client-config ]; - }; - - os-client-config = buildPythonPackage rec { - name = "os-client-config-${version}"; - version = "1.28.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/os-client-config/${name}.tar.gz"; - sha256 = "1f7q384b9drp3fqcg0w8aihv9k4idaay8vr3an187zjpgbx9rgp5"; - }; - - # requires oslotest but is a dependency of that package ... - doCheck = false; - - buildInputs = with self; [ pbr testtools testscenarios testrepository fixtures jsonschema ]; - propagatedBuildInputs = with self; [ appdirs pyyaml keystoneauth1 requestsexceptions ]; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - }; - - keystoneauth1 = callPackage ../development/python-modules/keystoneauth1 {}; - requests-mock = buildPythonPackage rec { name = "requests-mock-${version}"; version = "1.3.0"; @@ -13679,25 +12936,6 @@ in { propagatedBuildInputs = with self; [ pbr fixtures ]; }; - debtcollector = buildPythonPackage rec { - name = "debtcollector-${version}"; - version = "1.17.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/debtcollector/${name}.tar.gz"; - sha256 = "0rh47fd5kgjcdv9dxr7xf0x308cvfic3h2zk03ifvb4pdc5kbqvi"; - }; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - buildInputs = with self; [ pbr ]; - propagatedBuildInputs = with self; [ wrapt Babel six doc8 ] ++ - (optional (isPy26 || isPy27) funcsigs); - checkInputs = with self; [ pbr Babel six wrapt testtools testscenarios - testrepository subunit coverage ]; - }; - doc8 = callPackage ../development/python-modules/doc8 { }; wrapt = buildPythonPackage rec { -- cgit 1.4.1