Remaining Python bootstrapping fixes (part 2)

pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix

@@ -1,30 +1,32 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, isPy3k
 , flask
 , werkzeug
 }:
 
 buildPythonPackage rec {
   pname = "flask-reverse-proxy-fix";
   version = "0.2.1";
+  format = "setuptools";
 
   # master fixes flask import syntax and has no major changes
   # new release requested: https://github.com/sublee/flask-silk/pull/6
   src = fetchFromGitHub {
     owner = "antarctica";
     repo = "flask-reverse-proxy-fix";
     rev = "v${version}";
-    sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5";
+    hash = "sha256-ZRZI1psr1dnY2FbuLZXOQvLMJd4TF7BfBNZnW9kxeck=";
   };
 
-  disabled = !isPy3k;
-
   postPatch = ''
     sed -i 's@werkzeug.contrib.fixers@werkzeug.middleware.proxy_fix@g' flask_reverse_proxy_fix/middleware/__init__.py
   '';
 
+  # This is needed so that setup.py does not add "devNone" to the version,
+  # after which setuptools throws an error for an invalid version.
+  env.CI_COMMIT_TAG = "v${version}";
+
   propagatedBuildInputs = [
     flask
     werkzeug

pkgs/development/python-modules/flask-security-too/default.nix

@@ -57,6 +57,11 @@ buildPythonPackage rec {
     hash = "sha256-lZzm43m30y+2qjxNddFEeg9HDlQP9afq5VtuR25zaLc=";
   };
 
+  postPatch = ''
+    # This should be removed after updating to version 5.3.0.
+    sed -i '/filterwarnings =/a ignore:pkg_resources is deprecated:DeprecationWarning' pytest.ini
+  '';
+
   propagatedBuildInputs = [
     blinker
     email-validator

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

@@ -4,13 +4,15 @@
 , async-generator
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pypubsub
 , pyserial
 , pyserial-asyncio
 , pytestCheckHook
 , pythonOlder
 , setuptools
 , voluptuous
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -27,8 +29,18 @@ buildPythonPackage rec {
     hash = "sha256-KKF+XYQgdmLbbicyMFyZBG4ol69xAWCF2W/r15gH2Mo=";
   };
 
+  patches = [
+    # https://github.com/pyinsteon/pyinsteon/pull/361
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/pyinsteon/pyinsteon/commit/676bc5fff11b73a4c3fd189a6ac6d3de9ca21ae0.patch";
+      hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   propagatedBuildInputs = [

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

@@ -2,11 +2,13 @@
 , stdenv
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , pytest-asyncio
 , pytest-timeout
 , pytestCheckHook
 , pythonOlder
 , setuptools
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -23,8 +25,18 @@ buildPythonPackage rec {
     hash = "sha256-Vlt4+fRULb9mB0ceRmc7MJ50DnF9DAJPHA8iCbNVvcE=";
   };
 
+  patches = [
+    # https://github.com/alengwenus/pypck/pull/109
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/alengwenus/pypck/commit/17023ebe8082120b1eec086842ca809ec6e9df2b.patch";
+      hash = "sha256-kTu1+IwDrcdqelyK/vfhxw8MQBis5I1jag7YTytKQhs=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   nativeCheckInputs = [

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

@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , runtimeShell
 
 # build
@@ -27,14 +28,20 @@ buildPythonPackage rec {
     hash = "sha256-8pXOnLNjhIv0d+BqjW8wlb6BT6CmFHSsxn5wLOv3LBQ=";
   };
 
+  patches = [
+    # https://github.com/jedie/python-creole/pull/77
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core.patch";
+      url = "https://github.com/jedie/python-creole/commit/bfc46730ab4a189f3142246cead8d26005a28671.patch";
+      hash = "sha256-WtoEQyu/154Cfj6eSnNA+t37+o7Ij328QGMKxwcLg5k=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];
 
   postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace "poetry.masonry.api" "poetry.core.masonry.api"
-
     substituteInPlace Makefile \
       --replace "/bin/bash" "${runtimeShell}"
 

pkgs/development/python-modules/python-homewizard-energy/default.nix

@@ -4,6 +4,7 @@
 , awesomeversion
 , buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , poetry-core
 , protobuf
 , pytest-asyncio
@@ -25,6 +26,15 @@ buildPythonPackage rec {
     hash = "sha256-XTSnIL/hBL1Rsyv/tBce/WCvA3n7mZern0v3i6gTOeA=";
   };
 
+  patches = [
+    # https://github.com/DCSBL/python-homewizard-energy/pull/235
+    (fetchpatch {
+      name = "remove-setuptools-dependency.patch";
+      url = "https://github.com/DCSBL/python-homewizard-energy/commit/b006b0bc1f3d0b4a7569654a1afa90dd4cffaf18.patch";
+      hash = "sha256-WQeepxiYnBfFcQAmrc3pavBz5j1Qo0HmUcOxsK/pr50=";
+    })
+  ];
+
   nativeBuildInputs = [
     poetry-core
   ];
@@ -34,6 +44,8 @@ buildPythonPackage rec {
     aiohttp
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   nativeCheckInputs = [
     aresponses
     pytest-asyncio

pkgs/development/python-modules/python-otbr-api/default.nix

@@ -4,10 +4,13 @@
 , buildPythonPackage
 , cryptography
 , fetchFromGitHub
+, fetchpatch
+, pytest-asyncio
 , pytestCheckHook
 , pythonOlder
 , setuptools
 , voluptuous
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -24,8 +27,18 @@ buildPythonPackage rec {
     hash = "sha256-bPN2h60ypjlKpXs1xDS7bZcGRXvatA3EdlAX/HLxxTM=";
   };
 
+  patches = [
+    # https://github.com/home-assistant-libs/python-otbr-api/pull/68
+    (fetchpatch {
+      name = "relax-setuptools-dependency.patch";
+      url = "https://github.com/home-assistant-libs/python-otbr-api/commit/37eb19c12d17ac7d040ded035d8401def872fbda.patch";
+      hash = "sha256-JGsaLQNbUfz0uK/MeGnR2XTJDs4RnTOEg7BavfDPArg=";
+    })
+  ];
+
   nativeBuildInputs = [
     setuptools
+    wheel
   ];
 
   propagatedBuildInputs = [
@@ -36,6 +49,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    pytest-asyncio
     pytestCheckHook
   ];
 

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

@@ -1,21 +1,29 @@
 { lib
 , buildPythonPackage
-, fetchPypi
+, fetchFromGitHub
 , setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
-  version = "1.0.0";
+  version = "1.1.0";
   pname = "python-vagrant";
   format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-qP6TzPL/N+zJXsL0nqdKkabOc6TbShapjdJtOXz9CeU=";
+  src = fetchFromGitHub {
+    owner = "pycontribs";
+    repo = "python-vagrant";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-apvYzH0IY6ZyUP/FiOVbGN3dXejgN7gn7Mq2tlEaTww=";
   };
 
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   # The tests try to connect to qemu

pkgs/development/python-modules/pyvisa-sim/default.nix

@@ -7,6 +7,9 @@
 , stringparser
 , typing-extensions
 , pytestCheckHook
+, setuptools
+, setuptools-scm
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -19,9 +22,15 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyVISA-sim";
     inherit version;
-    sha256 = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY=";
+    hash = "sha256-vWxW941/1e58pqL/Rzq+eoZJpwsvLphgIe48SuJtohY=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
   propagatedBuildInputs = [
     pyvisa
     pyyaml

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

@@ -1,20 +1,31 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pytestCheckHook
 , zope_interface
+, zope_testrunner
 , sphinx
 }:
 
 buildPythonPackage rec {
   pname = "repoze.sphinx.autointerface";
   version = "1.0.0";
+  format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE=";
   };
 
-  propagatedBuildInputs = [ zope_interface sphinx ];
+  propagatedBuildInputs = [
+    zope_interface
+    sphinx
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    zope_testrunner
+  ];
 
   meta = with lib; {
     homepage = "https://github.com/repoze/repoze.sphinx.autointerface";

pkgs/development/python-modules/riscv-config/default.nix

@@ -1,5 +1,6 @@
 { buildPythonPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 , cerberus
 , pyyaml
@@ -9,6 +10,7 @@
 buildPythonPackage rec {
   pname = "riscv-config";
   version = "3.5.2";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "riscv-software-src";
@@ -17,6 +19,15 @@ buildPythonPackage rec {
     hash = "sha256-K7W6yyqy/2c4WHyOojuvw2P/v7bND5K6WFfTujkofBw=";
   };
 
+  patches = [
+    # Remove when updating to v3.8.0+
+    (fetchpatch {
+      name = "remove-dangling-pip-import.patch";
+      url = "https://github.com/riscv-software-src/riscv-config/commit/f75e7e13fe600b71254b0391be015ec533d3c3ef.patch";
+      hash = "sha256-oVRynBIJevq3UzlMDRh2rVuBJZoEwEYhDma3Bb/QV2E=";
+    })
+  ];
+
   propagatedBuildInputs = [ cerberus pyyaml ruamel-yaml ];
 
   meta = with lib; {

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

@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , setuptools
+, setuptools-scm
+, wheel
 , docutils
 , importlib-metadata
 , jinja2
@@ -19,18 +21,19 @@
 buildPythonPackage rec {
   pname = "rst2pdf";
   version = "0.101";
-
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg=";
+    hash = "sha256-AF8FssEIFHmeY2oVrAPNe85pbmgKWO52yD6ycNNzTSg=";
   };
 
   outputs = [ "out" "man" ];
 
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [