From a198efc31350f957f9b10df0cf40bbb7223ed57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 May 2022 02:37:19 +0000 Subject: [PATCH] python3Packages.python-memcached: 1.51 -> 1.59 Also rename from memcached to python-memcached. --- .../python-modules/beaker/default.nix | 10 ++--- .../python-modules/cachy/default.nix | 4 +- pkgs/development/python-modules/django/4.nix | 4 +- .../python-modules/graphite-web/default.nix | 4 +- .../python-modules/influxgraph/default.nix | 10 +---- .../python-modules/memcached/default.nix | 27 ------------- .../python-memcached/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +- 9 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/memcached/default.nix create mode 100644 pkgs/development/python-modules/python-memcached/default.nix diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 60823b4c077..c455ee50284 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -5,7 +5,7 @@ , glibcLocales , nose , pylibmc -, memcached +, python-memcached , redis , pymongo , mock @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales - memcached + python-memcached mock nose pylibmc @@ -52,11 +52,7 @@ buildPythonPackage rec { ]; # Can not run memcached tests because it immediately tries to connect - postPatch = lib.optionalString isPy3k '' - substituteInPlace setup.py \ - --replace "python-memcached" "python3-memcached" - '' + '' - + postPatch = '' rm tests/test_memcached.py ''; diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index 278dd5a8ae6..c88067146f3 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , redis -, memcached +, python-memcached , msgpack }: @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - memcached + python-memcached msgpack ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index db005067981..f36c064a647 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -22,7 +22,7 @@ , docutils , geoip2 , jinja2 -, memcached +, python-memcached , numpy , pillow , pylibmc @@ -76,7 +76,7 @@ buildPythonPackage rec { docutils geoip2 jinja2 - memcached + python-memcached numpy pillow pylibmc diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index cf188e1d5d1..cb05a8104bf 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , django -, memcached +, python-memcached , txamqp , django_tagging , gunicorn @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - memcached + python-memcached txamqp django_tagging gunicorn diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index c8403cf6446..7f24e1fd87e 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, memcached +, influxdb, graphite_api, python-memcached }: buildPythonPackage rec { @@ -11,13 +11,7 @@ buildPythonPackage rec { sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; }; - patchPhase = lib.optionalString isPy3k '' - sed 's/python-memcached/python3-memcached/' \ - -i ./influxgraph.egg-info/requires.txt \ - -i ./setup.py - ''; - - propagatedBuildInputs = [ influxdb graphite_api memcached ]; + propagatedBuildInputs = [ influxdb graphite_api python-memcached ]; passthru.moduleName = "influxgraph.InfluxDBFinder"; diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix deleted file mode 100644 index e7a41d7b238..00000000000 --- a/pkgs/development/python-modules/memcached/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "memcached"; - version = "1.51"; - - src = if isPy3k then fetchPypi { - inherit version; - pname = "python3-${pname}"; - sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw"; - } else fetchurl { - url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz"; - sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192"; - }; - - meta = with lib; { - description = "Python API for communicating with the memcached distributed memory object cache daemon"; - homepage = "https://github.com/linsomniac/python-memcached"; - license = licenses.psfl; - }; - -} diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix new file mode 100644 index 00000000000..1f69062a64e --- /dev/null +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-memcached"; + version = "1.59"; + + src = fetchFromGitHub { + owner = "linsomniac"; + repo = "python-memcached"; + rev = version; + hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698="; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + # all tests fail + doCheck = false; + + pythonImportsCheck = [ "memcache" ]; + + meta = with lib; { + description = "Pure python memcached client"; + homepage = "https://github.com/linsomniac/python-memcached"; + license = licenses.psfl; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dcb33f7965..979e47663fa 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + memcached = python-memcached; # added 2022-05-06 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 pam = python-pam; # added 2020-09-07. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..4fedb308f84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5185,8 +5185,6 @@ in { meld3 = callPackage ../development/python-modules/meld3 { }; - memcached = callPackage ../development/python-modules/memcached { }; - memory-allocator = callPackage ../development/python-modules/memory-allocator { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; @@ -6463,6 +6461,8 @@ in { python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; + python-memcached = callPackage ../development/python-modules/python-memcached { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { };