Merge pull request #207664 from fabaff/dparse2-bump

python310Packages.dparse2: 0.6.1 -> 0.7.0

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

@@ -4,13 +4,13 @@
 , pythonOlder
 , toml
 , pyyaml
-, packaging
+, packvers
 , pytestCheckHook
 }:
 
 buildPythonPackage rec {
   pname = "dparse2";
-  version = "0.6.1";
+  version = "0.7.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -18,14 +18,14 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "nexB";
     repo = pname;
-    rev = version;
-    hash = "sha256-1tbNW7Gy7gvMnETdAM2ahHiwbhG9qvdYZggia1+7eGo=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-JUTL+SVf1RRIXQqwFR7MnExsgGseSiO0a5YzzcqdXHw=";
   };
 
   propagatedBuildInputs = [
     toml
     pyyaml
-    packaging
+    packvers
   ];
 
   checkInputs = [
@@ -44,6 +44,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to parse Python dependency files";
     homepage = "https://github.com/nexB/dparse2";
+    changelog = "https://github.com/nexB/dparse2/blob/${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

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

@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pretend
+, pyparsing
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "packvers";
+  version = "21.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "nexB";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-nCSYL0g7mXi9pGFt24pOXbmmYsaRuB+rRZrygf8DTLE=";
+  };
+
+  propagatedBuildInputs = [
+    pyparsing
+  ];
+
+  checkInputs = [
+    pretend
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "packvers"
+  ];
+
+  meta = with lib; {
+    description = "Module for version handling of modules";
+    homepage = "https://github.com/nexB/dparse2";
+    changelog = "https://github.com/nexB/packvers/blob/${version}/CHANGELOG.rst";
+    license = with licenses; [ asl20 /* and */ bsd2 ];
+    maintainers = with maintainers; [ fab ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -6668,6 +6668,8 @@ self: super: with self; {
 
   packet-python = callPackage ../development/python-modules/packet-python { };
 
+  packvers = callPackage ../development/python-modules/packvers { };
+
   pafy = callPackage ../development/python-modules/pafy { };
 
   pagelabels = callPackage ../development/python-modules/pagelabels { };