From 46085ebde438c08a30070386d1b256c3c1842aa32ade097ba49be889f60fbe50 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sat, 29 Jul 2023 19:34:06 +0000
Subject: [PATCH] Accepting request 1100891 from
 home:badshah400:branches:science

- Update to version 6.0.2.
- Drop python-Mathics-relax-module-versions.patch: No longer required as upstream has removed numpy and scipy upper limits from requirements.
- Re-enable test_calculus.

OBS-URL: https://build.opensuse.org/request/show/1100891
OBS-URL: https://build.opensuse.org/package/show/science/python-Mathics?expand=0&rev=32
---
 Mathics3-6.0.1.tar.gz                      |  3 ---
 Mathics3-6.0.2.tar.gz                      |  3 +++
 python-Mathics-relax-module-versions.patch | 30 ----------------------
 python-Mathics.changes                     | 11 ++++++++
 python-Mathics.spec                        |  7 ++---
 5 files changed, 16 insertions(+), 38 deletions(-)
 delete mode 100644 Mathics3-6.0.1.tar.gz
 create mode 100644 Mathics3-6.0.2.tar.gz
 delete mode 100644 python-Mathics-relax-module-versions.patch

diff --git a/Mathics3-6.0.1.tar.gz b/Mathics3-6.0.1.tar.gz
deleted file mode 100644
index 3bcce38..0000000
--- a/Mathics3-6.0.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e96d6ba0e0efa79744add26b6fc081281a0b650f465ca5ac81f4885743a0eae1
-size 2977178
diff --git a/Mathics3-6.0.2.tar.gz b/Mathics3-6.0.2.tar.gz
new file mode 100644
index 0000000..79f30da
--- /dev/null
+++ b/Mathics3-6.0.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e46858d4e3ef10f1fc7316fb337c8c7d25f9c785665d46bc09fc5d232a8d7664
+size 2975862
diff --git a/python-Mathics-relax-module-versions.patch b/python-Mathics-relax-module-versions.patch
deleted file mode 100644
index a193783..0000000
--- a/python-Mathics-relax-module-versions.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: Mathics3-6.0.1/setup.py
-===================================================================
---- Mathics3-6.0.1.orig/setup.py
-+++ Mathics3-6.0.1/setup.py
-@@ -64,9 +64,9 @@ elif sys.version_info[:2] == (3, 6):
-         sys.exit(-1)
- else:
-     INSTALL_REQUIRES += [
--        "numpy<=1.24",
-+        "numpy",
-         "llvmlite",
--        "sympy>=1.8, < 1.12",
-+        "sympy>=1.8",
-         "pillow >= 9.2",
-     ]
- 
-Index: Mathics3-6.0.1/Mathics3.egg-info/requires.txt
-===================================================================
---- Mathics3-6.0.1.orig/Mathics3.egg-info/requires.txt
-+++ Mathics3-6.0.1/Mathics3.egg-info/requires.txt
-@@ -1,7 +1,7 @@
- Mathics-Scanner>=1.3.0
--numpy<=1.24
-+numpy
- llvmlite
--sympy<1.12,>=1.8
-+sympy>=1.8
- pillow>=9.2
- mpmath>=1.2.0
- palettable
diff --git a/python-Mathics.changes b/python-Mathics.changes
index ab2ab52..7d46aeb 100644
--- a/python-Mathics.changes
+++ b/python-Mathics.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Jul 26 15:24:55 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 6.0.2:
+  * Change testing to facilitate openSUSE Tumbleweed distribution
+    which uses Sympy 1.12 (gh#Mathics3/mathics-core#881).
+- Drop python-Mathics-relax-module-versions.patch: No longer
+  required as upstream has removed numpy and scipy upper limits
+  from requirements.
+- Re-enable test_calculus.
+
 -------------------------------------------------------------------
 Tue Apr 11 07:11:25 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/python-Mathics.spec b/python-Mathics.spec
index 33a2916..ceca085 100644
--- a/python-Mathics.spec
+++ b/python-Mathics.spec
@@ -32,15 +32,13 @@
 %define skip_python311 1
 %define pyname Mathics3
 Name:           python-Mathics%{psuffix}
-Version:        6.0.1
+Version:        6.0.2
 Release:        0
 Summary:        A general-purpose computer algebra system
 # Mathics itself is licensed as GPL-3.0 but it includes third-party software with MIT, BSD-3-Clause, and Apache-2.0 Licensing; also includes data from wikipedia licensed under CC-BY-SA-3.0 and GFDL-1.3
 License:        Apache-2.0 AND BSD-3-Clause AND GPL-3.0-only AND MIT
 URL:            https://mathics.github.io/
 Source0:        https://github.com/Mathics3/mathics-core/releases/download/%{version}/%{pyname}-%{version}.tar.gz
-# PATCH-FEATURE-OPENSUSE python-Mathics-relax-module-versions.patch gh#mathics-core/issues#881 badshah400@gmail.com -- Relax upper limits on sympy and numpy to get packages building for Tumbleweed
-Patch0:         python-Mathics-relax-module-versions.patch
 BuildRequires:  %{python_module Cython}
 BuildRequires:  %{python_module Django >= 1.8}
 BuildRequires:  %{python_module colorama}
@@ -117,8 +115,7 @@ export USE_CYTHON=1
 %check
 # Home page tests require django server up and running, test_gudermannian needs network access
 # test_image: https://github.com/Mathics3/mathics-core/issues/837
-# test_calculus: https://github.com/Mathics3/mathics-core/issues/881
-%pytest_arch -k 'not (test_home_page or test_gudermannian or test_image or test_calculus)'
+%pytest_arch -k 'not (test_home_page or test_gudermannian or test_image)'
 %endif
 
 %if %{without test}