Merge pull request #492 from minijackson/python-package-updates

Python packages updates

Author: minijackson

pkgs/default.nix

@@ -54,10 +54,7 @@ recurseIntoAttrs {
 
       support = scope self (self: importByName ./support/by-name self);
 
-      # Lewis needs Python < 3.12
-      inherit (final.python311Packages) lewis;
-
-      inherit (final.python3Packages) pyepics;
+      inherit (final.python3Packages) lewis pyepics;
 
       pythonSoftIOC = final.python3Packages.softioc;
 

pkgs/python-modules/by-name/aioca/package.nix

@@ -10,15 +10,15 @@
 }:
 buildPythonPackage rec {
   pname = "aioca";
-  version = "1.8.1";
+  version = "2.0";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DiamondLightSource";
     repo = "aioca";
-    rev = "${version}";
-    hash = "sha256-szM/sVqeWWUj84lq/wsxNCf/aZwoCySeTnuLD+hYLyc=";
+    tag = version;
+    hash = "sha256-aXK+K8y9L9KeYWKs6Fs6AmpX1mDfYJGd8A/Gb11Yswo=";
   };
 
   build-system = [

pkgs/python-modules/by-name/lewis/package.nix

@@ -6,9 +6,10 @@
   fetchFromGitHub,
   approvaltests,
   setuptools,
-  wheel,
+  setuptools-scm,
   json-rpc,
   mock,
+  pyasynchat,
   pytest,
   pyyaml,
   pyzmq,
@@ -17,31 +18,29 @@
 }:
 buildPythonPackage rec {
   pname = "lewis";
-  version = "1.3.1";
+  version = "1.3.5";
   pyproject = true;
 
-  # Due to mrjob, which is needed by approvaltests
-  disabled = pythonAtLeast "3.12";
-
   src = fetchFromGitHub {
     owner = "ISISComputingGroup";
     repo = "lewis";
-    rev = "v${version}";
-    hash = "sha256-7iMREHt6W26IzCFsRmojHqGuqIUHaCuvsKMMHuYflz0=";
+    tag = "v${version}";
+    hash = "sha256-VXZE+j/shlz1mLbDYECDNmLEeFGd2pl6+LEOGVHe0Zs=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    wheel
+    setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     json-rpc
     pyyaml
     pyzmq
     scanf
     semantic-version
-  ];
+  ]
+  ++ (lib.optional (pythonAtLeast "3.12") pyasynchat);
 
   checkInputs = [
     approvaltests
@@ -53,7 +52,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Let's write intricate simulators";
-    homepage = "https://github.com/ISISComputingGroup/lewis";
+    inherit (src.meta) homepage;
     mainProgram = "lewis";
     license = lib.licenses.gpl3Only;
     maintainers = with epnixLib.maintainers; [ minijackson ];

pkgs/python-modules/by-name/pvxslibs/package.nix

@@ -1,12 +1,11 @@
 {
   buildPythonPackage,
   epnix,
-  fetchPypi,
   setuptools,
   setuptools-dso,
   epicscorelibs,
 }:
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "pvxslibs";
   inherit (epnix.support.pvxs) version src;
   pyproject = true;

pkgs/python-modules/by-name/scanf/package.nix

@@ -2,30 +2,28 @@
   lib,
   epnixLib,
   buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  wheel,
+  fetchFromGitHub,
+  flit-core,
 }:
 buildPythonPackage rec {
   pname = "scanf";
-  version = "1.5.2";
+  version = "1.6.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-V2M0QKAqE4zRS2k9CScK8KA7sBfo1M/SSMeYizG4y4E=";
+  src = fetchFromGitHub {
+    owner = "joshburnett";
+    repo = pname;
+    tag = "v${version}";
+    hash = "sha256-xiQh26bkGha8WCSWWdtcL+Ln+J1Rn5NyNKRbdSI1DgI=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ flit-core ];
 
   pythonImportsCheck = [ "scanf" ];
 
   meta = {
     description = "A small scanf implementation";
-    homepage = "https://pypi.org/project/scanf/";
+    inherit (src.meta) homepage;
     license = lib.licenses.mit;
     maintainers = with epnixLib.maintainers; [ minijackson ];
   };

pkgs/python-modules/by-name/softioc/package.nix

@@ -1,24 +1,26 @@
 {
   lib,
   buildPythonPackage,
-  fetchgit,
+  fetchFromGitHub,
   setuptools,
   epicscorelibs,
   pvxslibs,
+  pyyaml,
   epicsdbbuilder,
   epnixLib,
 }:
 buildPythonPackage rec {
   pname = "softioc";
-  version = "4.5.0";
+  version = "4.6.1";
 
   pyproject = true;
 
-  src = fetchgit {
-    url = "https://github.com/DiamondLightSource/pythonSoftIOC.git";
-    rev = version;
+  src = fetchFromGitHub {
+    owner = "DiamondLightSource";
+    repo = "pythonSoftIOC";
+    tag = version;
     fetchSubmodules = true;
-    hash = "sha256-JXfFkA3MzipqUw0riMTZmgCP9qe4Tfj8vZaFBwqoO+c=";
+    hash = "sha256-wvzV+5fwdqKhlZ2QmhLIuw7JdhXtKlfNWMmBiLJgCPY=";
   };
 
   # Set correct version instead of automatically detected version:
@@ -32,11 +34,13 @@ buildPythonPackage rec {
     epicscorelibs
     epicsdbbuilder
     pvxslibs
+    pyyaml
   ];
 
   meta = {
     description = "Embed an EPICS IOC in a Python process";
     homepage = "https://diamondlightsource.github.io/pythonSoftIOC/";
+    changelog = "https://github.com/DiamondLightSource/pythonSoftIOC/blob/${src.rev}/CHANGELOG.rst";
     license = lib.licenses.asl20;
     maintainers = with epnixLib.maintainers; [ synthetica ];
   };