python39Packages.dogpile-cache: normalise attr, cleanup

pkgs/development/python-modules/bugwarrior/default.nix

@@ -1,6 +1,6 @@
 { lib, buildPythonPackage, fetchPypi, pythonOlder, setuptools
 , twiggy, requests, offtrac, bugzilla, taskw, python-dateutil, pytz, keyring, six
-, jinja2, pycurl, dogpile_cache, lockfile, click, pyxdg, future, jira }:
+, jinja2, pycurl, dogpile-cache, lockfile, click, pyxdg, future, jira }:
 
 buildPythonPackage rec {
   pname = "bugwarrior";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     setuptools
     twiggy requests offtrac bugzilla taskw python-dateutil pytz keyring six
-    jinja2 pycurl dogpile_cache lockfile click pyxdg future jira
+    jinja2 pycurl dogpile-cache lockfile click pyxdg future jira
   ];
 
   # for the moment oauth2client <4.0.0 and megaplan>=1.4 are missing for running the test suite.

pkgs/development/python-modules/dogpile-cache/default.nix

@@ -2,8 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pythonOlder
-, pytest
-, pytest-cov
+, pytestCheckHook
 , mock
 , Mako
 , decorator
@@ -11,29 +10,27 @@
 }:
 
 buildPythonPackage rec {
-  pname = "dogpile.cache";
+  pname = "dogpile-cache";
   version = "1.1.4";
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "dogpile.cache";
+    inherit version;
     sha256 = "ea09bebf24bb7c028caf98963785fe9ad0bd397305849a3303bc5380d468d813";
   };
 
-  # Disable concurrency tests that often fail,
-  # probably some kind of timing issue.
-  postPatch = ''
+  preCheck = ''
+    # Disable concurrency tests that often fail,
+    # probably some kind of timing issue.
     rm tests/test_lock.py
     # Failing tests. https://bitbucket.org/zzzeek/dogpile.cache/issues/116
     rm tests/cache/test_memcached_backend.py
   '';
 
   dontUseSetuptoolsCheck = true;
-  checkPhase = ''
-    pytest
-  '';
 
-  checkInputs = [ pytest pytest-cov mock Mako ];
+  checkInputs = [ pytestCheckHook mock Mako ];
 
   propagatedBuildInputs = [ decorator stevedore ];
 
@@ -41,5 +38,6 @@ buildPythonPackage rec {
     description = "A caching front-end based on the Dogpile lock";
     homepage = "https://bitbucket.org/zzzeek/dogpile.cache";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }

pkgs/development/python-modules/openstacksdk/default.nix

@@ -4,7 +4,7 @@
 , fetchPypi
 , appdirs
 , cryptography
-, dogpile_cache
+, dogpile-cache
 , jmespath
 , jsonpatch
 , keystoneauth1
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     appdirs
     cryptography
-    dogpile_cache
+    dogpile-cache
     jmespath
     jsonpatch
     keystoneauth1

pkgs/development/python-modules/python-ironicclient/default.nix

@@ -4,7 +4,7 @@
 , pbr
 , appdirs
 , cliff
-, dogpile_cache
+, dogpile-cache
 , jsonschema
 , keystoneauth1
 , openstacksdk
@@ -31,7 +31,7 @@ buildPythonApplication rec {
     pbr
     appdirs
     cliff
-    dogpile_cache
+    dogpile-cache
     jsonschema
     keystoneauth1
     openstacksdk

pkgs/development/python-modules/subliminal/default.nix

@@ -7,7 +7,7 @@
 , beautifulsoup4
 , requests
 , click
-, dogpile_cache
+, dogpile-cache
 , stevedore
 , chardet
 , pysrt
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     guessit babelfish enzyme beautifulsoup4 requests
-    click dogpile_cache stevedore chardet pysrt six
+    click dogpile-cache stevedore chardet pysrt six
     appdirs rarfile pytz
   ];
 

pkgs/tools/package-management/nox/default.nix

@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
   buildInputs = [ python3Packages.pbr git ];
 
   propagatedBuildInputs = with python3Packages; [
-      dogpile_cache
+      dogpile-cache
       click
       requests
       characteristic

pkgs/top-level/python-aliases.nix

@@ -45,6 +45,7 @@ mapAliases ({
   discogs_client = discogs-client; # added 2021-07-02
   djangorestframework-jwt = drf-jwt;
   dns = dnspython; # Alias for compatibility, 2017-12-10
+  dogpile_cache = dogpile-cache; # added 2021-10-28
   faulthandler = throw "faulthandler is built into ${python.executable}";
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28

pkgs/top-level/python-packages.nix

@@ -2255,7 +2255,7 @@ in {
 
   dodgy = callPackage ../development/python-modules/dodgy { };
 
-  dogpile_cache = callPackage ../development/python-modules/dogpile.cache { };
+  dogpile-cache = callPackage ../development/python-modules/dogpile-cache { };
 
   dogpile_core = callPackage ../development/python-modules/dogpile.core { };