From 125e150cd230087a782b9eabf731b7d7a6bffc20 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jun 2022 10:43:15 +0200
Subject: [PATCH 1/3] python310Packages.pymc: unstable-2022-05-23 -> 4.0.0

- rename to pymc
- use pythonRelaxDepsHook
---
 .../{pymc3 => pymc}/default.nix               | 23 ++++++++++++-------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
 rename pkgs/development/python-modules/{pymc3 => pymc}/default.nix (76%)

diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc/default.nix
similarity index 76%
rename from pkgs/development/python-modules/pymc3/default.nix
rename to pkgs/development/python-modules/pymc/default.nix
index 1d31188c9c8..4fce3800ef1 100644
--- a/pkgs/development/python-modules/pymc3/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -9,24 +9,29 @@
 , fetchFromGitHub
 , numpy
 , pythonOlder
+, pythonRelaxDepsHook
 , scipy
 , typing-extensions
 }:
 
 buildPythonPackage rec {
-  pname = "pymc3";
-  version = "unstable-2022-05-23";
+  pname = "pymc";
+  version = "4.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "pymc-devs";
-    repo = "pymc3";
-    rev = "b5a5b569779673914c9420c1cc0135b118505ff5";
-    hash = "sha256-vkIFwdjX2Rex8oqscVMP4xh0K4bjmN/RL7aQmOI//Dw=";
+    repo = "pymc";
+    rev = "v${version}";
+    hash = "sha256-ZMuDQJ+bmrQlrem/OqU/hIie3ZQkAqayU3N8ZtaW7xo=";
   };
 
+  nativeBuildInputs = [
+    pythonRelaxDepsHook
+  ];
+
   propagatedBuildInputs = [
     aeppl
     aesara
@@ -42,11 +47,13 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace setup.py \
       --replace ', "pytest-cov"' ""
-    substituteInPlace requirements.txt \
-      --replace "aesara==2.6.2" "aesara" \
-      --replace "aeppl==0.0.28" "aeppl"
   '';
 
+  pythonRelaxDeps = [
+    "aesara"
+    "aeppl"
+  ];
+
   # The test suite is computationally intensive and test failures are not
   # indicative for package usability hence tests are disabled by default.
   doCheck = false;
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 2a17eb067b8..0e58d7b976c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -112,6 +112,7 @@ mapAliases ({
   pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
   pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
+  pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
   pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
   pyreadability = readability-lxml; # added 2022-05-24
   pysmart-smartx = pysmart; # added 2021-10-22
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2dfd23222d..8da9937cbc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7570,7 +7570,7 @@ in {
 
   pymbolic = callPackage ../development/python-modules/pymbolic { };
 
-  pymc3 = callPackage ../development/python-modules/pymc3 { };
+  pymc = callPackage ../development/python-modules/pymc { };
 
   pymdstat = callPackage ../development/python-modules/pymdstat { };
 

From 803065a3a23c9a71f2e36b117ca8b9d3d8bfd2c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jun 2022 11:04:52 +0200
Subject: [PATCH 2/3] python310Packages.aesara: 2.6.6 -> 2.7.1

---
 pkgs/development/python-modules/aesara/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix
index d7d51c2582d..56d298f6ed1 100644
--- a/pkgs/development/python-modules/aesara/default.nix
+++ b/pkgs/development/python-modules/aesara/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aesara";
-  version = "2.6.6";
+  version = "2.7.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "aesara-devs";
     repo = "aesara";
     rev = "refs/tags/rel-${version}";
-    hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk=";
+    hash = "sha256-qjAaW7YYmzGBNpc8T5RyOdP5evkKOdzUGzQ9JXKioxw=";
   };
 
   nativeBuildInputs = [

From 16a4320fdf4e163aae3bce5a25a8acc616f4a4be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jun 2022 12:34:09 +0200
Subject: [PATCH 3/3] python310Packages.aeppl: disable failing test

---
 pkgs/development/python-modules/aeppl/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix
index bf7f4b8d02a..5457da46677 100644
--- a/pkgs/development/python-modules/aeppl/default.nix
+++ b/pkgs/development/python-modules/aeppl/default.nix
@@ -42,6 +42,11 @@ buildPythonPackage rec {
     "aeppl"
   ];
 
+  disabledTests = [
+    # Compute issue
+    "test_initial_values"
+  ];
+
   meta = with lib; {
     description = "Library for an Aesara-based PPL";
     homepage = "https://github.com/aesara-devs/aeppl";