Merge pull request #140692 from dotlambda/class-registry-alias

python3Packages.class-registry: make alias of phx-class-registry

pkgs/development/python-modules/class-registry/default.nix

@@ -1,32 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, nose
-, pythonOlder
-}:
-
-buildPythonPackage rec {
-  pname = "class-registry";
-  version = "3.0.5";
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "todofixthis";
-    repo = pname;
-    rev = version;
-    sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
-  };
-
-  checkInputs = [
-    nose
-  ];
-
-  pythonImportsCheck = [ "class_registry" ];
-
-  meta = with lib; {
-    description = "Factory and registry pattern for Python classes";
-    homepage = "https://class-registry.readthedocs.io/en/latest/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kevincox ];
-  };
-}

pkgs/development/python-modules/phx-class-registry/default.nix

@@ -1,28 +1,34 @@
-{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+}:
 
 buildPythonPackage rec {
-  pname = "phx-class-registry";
+  pname = "class-registry";
   version = "3.0.5";
+  disabled = pythonOlder "3.5";
 
-  disabled = isPy27;
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "14iap8db2ldmnlf5kvxs52aps31rl98kpa5nq8wdm30a86n6457i";
+  src = fetchFromGitHub {
+    owner = "todofixthis";
+    repo = pname;
+    rev = version;
+    sha256 = "0gpvq4a6qrr2iki6b4vxarjr1jrsw560m2qzm5bb43ix8c8b7y3q";
   };
 
-  checkInputs = [ pytestCheckHook ];
+  checkInputs = [
+    pytestCheckHook
+  ];
 
-  disabledTests = [
-    "test_branding"
-    "test_happy_path"
-    "test_len"
+  pythonImportsCheck = [
+    "class_registry"
   ];
 
   meta = with lib; {
-    description = "Registry pattern for Python classes, with setuptools entry points integration";
-    homepage = "https://github.com/todofixthis/class-registry";
+    description = "Factory and registry pattern for Python classes";
+    homepage = "https://class-registry.readthedocs.io/en/latest/";
     license = licenses.mit;
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [ kevincox SuperSandro2000 ];
   };
 }

pkgs/development/tools/backblaze-b2/default.nix

@@ -29,7 +29,6 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     b2sdk
-    class-registry
     phx-class-registry
     setuptools
     docutils

pkgs/top-level/python-aliases.nix

@@ -36,6 +36,7 @@ mapAliases ({
   blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # Added 2020-11-29
   bt_proximity = bt-proximity; # added 2021-07-02
   bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27
+  class-registry = phx-class-registry; # added 2021-10-05
   ConfigArgParse = configargparse; # added 2021-03-18
   dateutil = python-dateutil; # added 2021-07-03
   detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04

pkgs/top-level/python-packages.nix

@@ -1501,8 +1501,6 @@ in {
 
   ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { };
 
-  class-registry = callPackage ../development/python-modules/class-registry { };
-
   claripy = callPackage ../development/python-modules/claripy { };
 
   cld2-cffi = callPackage ../development/python-modules/cld2-cffi { };