Merge pull request #32637 from makefu/pkgs/openstack/nuke

nuke openstack (again)

9 files changed, 13 insertions, 391 deletions

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 027ef56b317c..000000000000
--- 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 <smurugesan@vmware.com>
-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 7405f7f74cd5..000000000000
--- 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/keystoneclient/default.nix b/pkgs/development/python-modules/keystoneclient/default.nix
deleted file mode 100644
index a856f4db793f..000000000000
--- a/pkgs/development/python-modules/keystoneclient/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python
-
-, pbr, testtools, testresources, testrepository
-, requests-mock, fixtures, openssl, oslotest, pep8
-
-, oslo-serialization, oslo-config, oslo-i18n, oslo-utils
-, Babel, prettytable, requests, six, iso8601, stevedore
-, netaddr, debtcollector, bandit, webob, mock, pycrypto
-}:
-
-buildPythonPackage rec {
-  pname = "keystoneclient";
-  version = "1.8.1";
-  name = pname + "-" + version;
-
-  src = fetchFromGitHub {
-    owner = "openstack";
-    repo = "python-keystoneclient";
-    rev = version;
-    sha256 = "0yayn1hb3mncqb0isy8vy6d519xya7mhf5pcbn60fzdqjrkj2prq";
-  };
-
-  PBR_VERSION = "${version}";
-
-  buildInputs = [
-    pbr testtools testresources testrepository requests-mock fixtures openssl
-    oslotest pep8
-  ];
-  propagatedBuildInputs = [
-    oslo-serialization oslo-config oslo-i18n oslo-utils
-    Babel prettytable requests six iso8601 stevedore
-    netaddr debtcollector bandit webob mock pycrypto
-  ];
-
-  postPatch = ''
-    sed -i 's@python@${python.interpreter}@' .testr.conf
-    sed -ie '/argparse/d' requirements.txt
-    '';
-
-  doCheck = false; # The checkPhase below is broken
-
-  checkPhase = ''
-    patchShebangs run_tests.sh
-    ./run_tests.sh
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/openstack/python-novaclient/;
-    description = "Client library and command line tool for the OpenStack Nova API";
-    license = licenses.asl20;
-    platforms = platforms.linux;
-  };
-}
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 baafc44d10d3..000000000000
--- 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 de91a507f179..000000000000
--- 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/pyrax/default.nix b/pkgs/development/python-modules/pyrax/default.nix
deleted file mode 100644
index 1337b3c32ada..000000000000
--- a/pkgs/development/python-modules/pyrax/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib, buildPythonPackage, fetchurl, requests, novaclient, keyring,
-  rackspace-novaclient, six, isPy3k, pytest, glibcLocales }:
-buildPythonPackage rec {
-  pname = "pyrax";
-  version = "1.9.8";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pyrax/${name}.tar.gz";
-    sha256 = "1x98jzyxnvha81pgx3jpfixljhs7zik89yfp8q06kwpx8ws99nz9";
-  };
-
-  # no good reason given in commit why limited, and seems to work
-  patchPhase = ''
-      substituteInPlace "setup.py"                                     \
-              --replace "python-novaclient==2.27.0" "python-novaclient"
-    '';
-
-  disabled = isPy3k;
-  propagatedBuildInputs = [ requests novaclient keyring rackspace-novaclient six ];
-
-  LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest glibcLocales ];
-
-  checkPhase = ''
-    py.test tests/unit
-  '';
-
-  meta = {
-    homepage = https://github.com/rackspace/pyrax;
-    license = lib.licenses.asl20;
-    description = "Python API to interface with Rackspace";
-    maintainers = with lib.maintainers; [ teh ];
-  };
-}
diff --git a/pkgs/development/python-modules/rackspace-novaclient/default.nix b/pkgs/development/python-modules/rackspace-novaclient/default.nix
deleted file mode 100644
index 3993503e9562..000000000000
--- a/pkgs/development/python-modules/rackspace-novaclient/default.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{ buildPythonPackage, fetchurl, isPy3k, requests, novaclient, six, lib }:
-let
-os-virtual-interfacesv2-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_virtual_interfacesv2_python_novaclient_ext";
-  version = "0.20";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os-virtual-interfacesv2-python-novaclient-ext/${name}.tar.gz";
-    sha256 = "17a4r8psxmfikgmzh709absbn5jsh1005whibmwhysj9fi0zyfbd";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://github.com/rackerlabs/os_virtual_interfacesv2_ext;
-    license = lib.licenses.asl20;
-    description = "Adds Virtual Interfaces support to python-novaclient";
-  };
-};
-
-ip-associations-python-novaclient-ext = buildPythonPackage rec {
-  pname = "ip_associations_python_novaclient_ext";
-  version = "0.2";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/i/ip_associations_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "0dxfkfjhzskafmb01y8hzbcpvc4cd6fas1s50dzcmg29w4z6qmz4";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://github.com/rackerlabs/ip_associations_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Adds Rackspace ip_associations support to python-novaclient";
-  };
-};
-
-rackspace-auth-openstack = buildPythonPackage rec {
-  pname = "rackspace-auth-openstack";
-  version = "1.3";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rackspace-auth-openstack/${name}.tar.gz";
-    sha256 = "1kaiyvgwmavw2mh0s32yjk70xsziynjdhi01qn9a8kljn7p6kh64";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rackspace-auth-openstack;
-    license = lib.licenses.asl20;
-    description = "Rackspace Auth Plugin for OpenStack Clients.";
-  };
-};
-rax-default-network-flags-python-novaclient-ext = buildPythonPackage rec {
-  pname = "rax_default_network_flags_python_novaclient_ext";
-  version = "0.4.0";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rax_default_network_flags_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "00b0csb58k6rr1is68bkkw358mms8mmb898bm8bbr8g7j2fz8aw5";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/simple/rax-default-network-flags-python-novaclient-ext;
-    license = lib.licenses.asl20;
-    description = "Novaclient Extension for Instance Default Network Flags";
-  };
-};
-os-networksv2-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_networksv2_python_novaclient_ext";
-  version = "0.26";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os_networksv2_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "06dzqmyrwlq7hla6dk699z18c8v27qr1gxqknimwxlwqdlhpafk1";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/os_networksv2_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Adds rackspace networks support to python-novaclient";
-  };
-};
-
-rax-scheduled-images-python-novaclient-ext = buildPythonPackage rec {
-  pname = "rax_scheduled_images_python_novaclient_ext";
-  version = "0.3.1";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rax_scheduled_images_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "1nvwjgrkp1p1d27an393qf49pszm1nvqa2ychhbqmp0bnabwyw7i";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rax_scheduled_images_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Extends python-novaclient to use RAX-SI, the Rackspace Nova API Scheduled Images extension";
-  };
-};
-
-os-diskconfig-python-novaclient-ext = buildPythonPackage rec {
-  pname = "os_diskconfig_python_novaclient_ext";
-  version = "0.1.3";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/o/os_diskconfig_python_novaclient_ext/${name}.tar.gz";
-    sha256 = "0xayy5nlkgl9yr0inqkwirlmar8pv1id29r59lj70g5plwrr5lg7";
-  };
-
-  propagatedBuildInputs = [ six novaclient ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/os_diskconfig_python_novaclient_ext;
-    license = lib.licenses.asl20;
-    description = "Disk Config extension for python-novaclient";
-  };
-};
-
-in
-buildPythonPackage rec {
-  pname = "rackspace-novaclient";
-  version = "2.1";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/r/rackspace-novaclient/${name}.tar.gz";
-    sha256 = "1rzaa328hzm8hs9q99gvjr64x47fmcq4dv4656rzxq5s4gv49z12";
-  };
-
-  disabled = isPy3k;
-  propagatedBuildInputs = [
-    requests
-    novaclient
-    six
-    # extensions
-    ip-associations-python-novaclient-ext
-    os-diskconfig-python-novaclient-ext
-    os-networksv2-python-novaclient-ext
-    os-virtual-interfacesv2-python-novaclient-ext
-    rackspace-auth-openstack
-    rax-default-network-flags-python-novaclient-ext
-    rax-scheduled-images-python-novaclient-ext
-  ];
-
-  meta = {
-    homepage = https://pypi.python.org/pypi/rackspace-novaclient/;
-    license = lib.licenses.asl20;
-    description = "Metapackage to install python-novaclient and Rackspace extensions";
-    maintainers = with lib.maintainers; [ teh ];
-  };
-}
diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
index 258f84e8c72a..c2e454d08cda 100644
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -1,20 +1,25 @@
-{ stdenv, buildPythonPackage, fetchurl, python,
-  unittest2, scripttest, pytz, pylint, tempest-lib, mock, testtools,
-  pbr, tempita, decorator, sqlalchemy, six, sqlparse 
+{ stdenv, buildPythonPackage, fetchPypi, python
+, unittest2, scripttest, pytz, pylint, mock
+, testtools, pbr, tempita, decorator, sqlalchemy
+, six, sqlparse, testrepository
 }:
 buildPythonPackage rec {
   pname = "sqlalchemy-migrate";
-  name = "${pname}-${version}";
   version = "0.11.0";
 
-  src = fetchurl {
-    url = "mirror://pypi/s/sqlalchemy-migrate/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "0ld2bihp9kmf57ykgzrfgxs4j9kxlw79sgdj9sfn47snw3izb2p6";
   };
 
-  checkInputs = [ unittest2 scripttest pytz pylint mock testtools tempest-lib ];
+  checkInputs = [ unittest2 scripttest pytz pylint mock testtools testrepository ];
   propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];
 
+  prePatch = ''
+    sed -i -e /tempest-lib/d \
+           -e /testtools/d \
+      test-requirements.txt
+  '';
   checkPhase = ''
     export PATH=$PATH:$out/bin
     echo sqlite:///__tmp__ > test_db.cfg
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 1955320fd266..326282a39c3d 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; {