Update for python 3.11 and nixpkgs 24.05

Stowarzyszenie-Talent · Jun 16, 2024 · 4f97d45 · 4f97d45
1 parent d2c1cd2
commit 4f97d45
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "The task runner used by SIO2";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
   inputs.flake-utils.url = "github:numtide/flake-utils";
   inputs.filetracker = {
-    url = "github:Stowarzyszenie-Talent/filetracker";
+    url = "github:Stowarzyszenie-Talent/filetracker/nixpkgs-24.05";
     inputs.nixpkgs.follows = "nixpkgs";
   };
 
@@ -30,7 +30,7 @@
           })
         ];
 
-        sioworkers = with final.python310Packages; toPythonApplication sioworkers;
+        sioworkers = with final.python311Packages; toPythonApplication sioworkers;
       };
 
       nixosModules.self = {

diff --git a/nix/module/worker.nix b/nix/module/worker.nix
@@ -5,7 +5,7 @@
     enable = lib.mkEnableOption "sioworker";
 
     package = lib.mkPackageOption pkgs "sioworkers" {
-      default = [ "python310Packages" "sioworkers" ];
+      default = [ "python311Packages" "sioworkers" ];
     };
 
     filetrackerUrl = lib.mkOption {

diff --git a/nix/module/workersd.nix b/nix/module/workersd.nix
@@ -5,7 +5,7 @@
     enable = lib.mkEnableOption "sioworkersd";
 
     package = lib.mkPackageOption pkgs "sioworkers" {
-      default = [ "python310Packages" "sioworkers" ];
+      default = [ "python311Packages" "sioworkers" ];
     };
 
     taskMemoryLimit = lib.mkOption {

diff --git a/nix/package.nix b/nix/package.nix
@@ -23,7 +23,7 @@
 buildPythonPackage {
   pname = "sioworkers";
   version = "1.0";
-  disabled = pythonAtLeast "3.11" || pythonOlder "3.9";
+  disabled = pythonAtLeast "3.12" || pythonOlder "3.9";
 
   src = builtins.path {
     path = ./..;

diff --git a/setup.py b/setup.py
@@ -18,16 +18,16 @@
         'bsddb3<6.3',
         'simplejson<3.20',
         #'supervisor>=4.0,<4.3',
-        'Twisted>=23.8,<23.9',
+        'Twisted==24.3',
         'sortedcontainers<2.5',
         'six<1.17',
-        'urllib3>=2.0,<2.1',
+        'urllib3>=2.0,<3.0',
     ],
 
     extras_require = {
         'dev' : [
             'pytest<8',
-            'pytest-timeout<2.2',
+            'pytest-timeout<3',
             'tox',
         ]
     },