From 373d11751bedd284e07aca961b12f49e368679e7 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 13 Dec 2017 19:45:19 +0100 Subject: [PATCH] novaclient: rip pyrax: rip rackspace-novaclient: rip openstackclient: rip ironicclient: rip --- .../python-modules/pyrax/default.nix | 35 ---- .../rackspace-novaclient/default.nix | 166 ------------------ pkgs/top-level/python-packages.nix | 90 ---------- 3 files changed, 291 deletions(-) delete mode 100644 pkgs/development/python-modules/pyrax/default.nix delete mode 100644 pkgs/development/python-modules/rackspace-novaclient/default.nix diff --git a/pkgs/development/python-modules/pyrax/default.nix b/pkgs/development/python-modules/pyrax/default.nix deleted file mode 100644 index 1337b3c32ad..00000000000 --- 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 3993503e956..00000000000 --- 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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e89f5f89ac6..ec7ef1558b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3087,63 +3087,6 @@ in { }; - ironicclient = buildPythonPackage rec { - name = "ironicclient-${version}"; - version = "0.9.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-ironicclient/python-ironicclient-${version}.tar.gz"; - sha256 = "16kaixrmnx6a32mfv281w22h8lavjh0k9yiqikmwc986ydh85s4d"; - }; - - propagatedBuildInputs = with self; [ - six keystoneclient prettytable oslo-utils oslo-i18n lxml httplib2 cliff - dogpile_cache appdirs anyjson pbr openstackclient - ]; - buildInputs = with self; [ - httpretty - ]; - - meta = with stdenv.lib; { - description = "Python bindings for the Ironic API"; - homepage = "http://www.openstack.org/"; - }; - }; - - novaclient = buildPythonPackage rec { - name = "novaclient-${version}"; - version = "2.31.0"; - - src = pkgs.fetchurl { - url = "https://github.com/openstack/python-novaclient/archive/${version}.tar.gz"; - sha256 = "0cd49yz9qhpv1srg6wwjnivyb3i8zjxda0h439158qv9w6bfqhdf"; - }; - - PBR_VERSION = "${version}"; - - buildInputs = with self; [ - pbr testtools testscenarios testrepository requests-mock fixtures ]; - propagatedBuildInputs = with self; [ - Babel argparse prettytable requests simplejson six iso8601 - keystoneclient tempest-lib ]; - - # TODO: check if removing this test is really harmless - preCheck = '' - substituteInPlace novaclient/tests/unit/v2/test_servers.py --replace "test_get_password" "noop" - ''; - - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = { - homepage = https://github.com/openstack/python-novaclient/; - description = "Client library and command line tool for the OpenStack Nova API"; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.linux; - }; - }; - tablib = buildPythonPackage rec { name = "tablib-${version}"; version = "0.10.0"; @@ -3226,33 +3169,6 @@ in { openidc-client = callPackage ../development/python-modules/openidc-client/default.nix {}; - openstackclient = buildPythonPackage rec { - name = "openstackclient-${version}"; - version = "1.7.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-openstackclient/python-openstackclient-${version}.tar.gz"; - sha256 = "0h1jkrwx06l32k50zq5gs9iba132q2x2jjb3z5gkxxlcd3apk8y9"; - }; - - propagatedBuildInputs = with self; [ - pbr six Babel cliff os-client-config oslo-config oslo-i18n oslo-utils - glanceclient keystoneclient novaclient cinderclient neutronclient requests - stevedore cliff-tablib - ]; - buildInputs = with self; [ - requests-mock - ]; - patchPhase = '' - sed -i 's@python@${python.interpreter}@' .testr.conf - ''; - - meta = with stdenv.lib; { - homepage = "http://wiki.openstack.org/OpenStackClient"; - }; - }; - - idna = buildPythonPackage rec { pname = "idna"; @@ -16421,12 +16337,6 @@ in { doCheck = false; }; - rackspace-novaclient = callPackage ../development/python-modules/rackspace-novaclient { }; - - pyrax = callPackage ../development/python-modules/pyrax { - glibcLocales = pkgs.glibcLocales; - }; - pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; disabled = isPy3k;