From 2e4bd78a4690654e15f6d0345170c80fc5d60021 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Aug 2023 09:19:27 +0000
Subject: [PATCH 1/2] python310Packages.pypiserver: 1.5.1 -> 1.5.2

---
 pkgs/development/python-modules/pypiserver/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index 74ddf37e236d..6e2c02274159 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "pypiserver";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-1tV3pVEC5sIjT0tjbujU7l41Jx7PQ1dCn4B1r94C9xE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-jub+iVL/YeGaG9Vzqyyfc4qFi0cR+7xrzuXNHL5W4p4=";
   };
 
   nativeBuildInputs = [ setuptools-git ];

From 0884271c8dc98d4aad3b7f56d36cd1756efdf12a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Aug 2023 18:22:28 +0200
Subject: [PATCH 2/2] python310Packages.pypiserver: add changelog to meta

- add optional dependencies
- add format
- disable on unsupported Python releases
---
 .../python-modules/pypiserver/default.nix     | 45 ++++++++++++++-----
 1 file changed, 35 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/pypiserver/default.nix b/pkgs/development/python-modules/pypiserver/default.nix
index 6e2c02274159..e892a8227c3d 100644
--- a/pkgs/development/python-modules/pypiserver/default.nix
+++ b/pkgs/development/python-modules/pypiserver/default.nix
@@ -1,17 +1,22 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchFromGitHub
-, lib
 , passlib
 , pytestCheckHook
+, pythonOlder
 , setuptools
 , setuptools-git
 , twine
+, watchdog
 , webtest
 }:
 
 buildPythonPackage rec {
   pname = "pypiserver";
   version = "1.5.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = pname;
@@ -20,38 +25,58 @@ buildPythonPackage rec {
     hash = "sha256-jub+iVL/YeGaG9Vzqyyfc4qFi0cR+7xrzuXNHL5W4p4=";
   };
 
-  nativeBuildInputs = [ setuptools-git ];
+  nativeBuildInputs = [
+    setuptools-git
+  ];
 
-  propagatedBuildInputs = [ setuptools ];
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
+  passthru.optional-dependencies = {
+    passlib = [
+      passlib
+    ];
+    cache = [
+      watchdog
+    ];
+  };
 
   preCheck = ''
     export HOME=$TMPDIR
   '';
 
   nativeCheckInputs = [
-    passlib
     pytestCheckHook
     twine
     webtest
-  ];
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   disabledTests = [
-    # fails to install the package
+    # Fails to install the package
     "test_hash_algos"
     "test_pip_install_authed_succeeds"
     "test_pip_install_open_succeeds"
+    "test_pip_install_authed_fails"
+    # Tests want to tests upload
+    "upload"
+    "register"
+    "test_partial_authed_open_download"
   ];
 
   disabledTestPaths = [
-    # requires docker service running
+    # Test requires docker service running
     "docker/test_docker.py"
   ];
 
-  pythonImportsCheck = [ "pypiserver" ];
+  pythonImportsCheck = [
+    "pypiserver"
+  ];
 
   meta = with lib; {
-    homepage = "https://github.com/pypiserver/pypiserver";
     description = "Minimal PyPI server for use with pip/easy_install";
+    homepage = "https://github.com/pypiserver/pypiserver";
+    changelog = "https://github.com/pypiserver/pypiserver/releases/tag/v${version}";
     license = with licenses; [ mit zlib ];
     maintainers = with maintainers; [ austinbutler ];
   };