From 7a5a720f11a0b1a3f3c00da13a5012e41611db115972bd1ecb7bfdcea8c30ee3 Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Tue, 18 Apr 2023 03:11:21 +0000 Subject: [PATCH] Accepting request 1078345 from home:badshah400:branches:science (Depends on sr#1078298) - Drop some unnecessary Requires: python-recordclass, python-scipy. - Add necessary Requires: python-requests, python-Cython, python-Pillow. - Drop python-Mathics-relax-sympy-version.patch: No longer needed as upstream setup.py now allows sympy >= 1.11. - Disable building for python3.11, unsupported [gh#Mathics3/mathics-core#743]. - python-Mathics-Scanner >= 1.3.0 now required. OBS-URL: https://build.opensuse.org/request/show/1078345 OBS-URL: https://build.opensuse.org/package/show/science/python-Mathics?expand=0&rev=28 --- Mathics3-5.0.2.tar.gz | 3 --- Mathics3-6.0.1.tar.gz | 3 +++ python-Mathics-relax-sympy-version.patch | 13 ---------- python-Mathics.changes | 25 ++++++++++++++++++ python-Mathics.spec | 33 +++++++++++------------- 5 files changed, 43 insertions(+), 34 deletions(-) delete mode 100644 Mathics3-5.0.2.tar.gz create mode 100644 Mathics3-6.0.1.tar.gz delete mode 100644 python-Mathics-relax-sympy-version.patch diff --git a/Mathics3-5.0.2.tar.gz b/Mathics3-5.0.2.tar.gz deleted file mode 100644 index 46e96e7..0000000 --- a/Mathics3-5.0.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:659293bf49c9654c6350bb2a26d1edc0bde79d0fed280e0ebc18a585cca6f2b5 -size 2891427 diff --git a/Mathics3-6.0.1.tar.gz b/Mathics3-6.0.1.tar.gz new file mode 100644 index 0000000..3bcce38 --- /dev/null +++ b/Mathics3-6.0.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e96d6ba0e0efa79744add26b6fc081281a0b650f465ca5ac81f4885743a0eae1 +size 2977178 diff --git a/python-Mathics-relax-sympy-version.patch b/python-Mathics-relax-sympy-version.patch deleted file mode 100644 index 3296bad..0000000 --- a/python-Mathics-relax-sympy-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Mathics3-5.0.2/setup.py -=================================================================== ---- Mathics3-5.0.2.orig/setup.py -+++ Mathics3-5.0.2/setup.py -@@ -57,7 +57,7 @@ elif sys.version_info[:2] == (3, 6): - elif sys.version_info[:2] == (3, 7): - INSTALL_REQUIRES += ["numpy<1.22", "llvmlite", "sympy>=1.8, < 1.11"] - else: -- INSTALL_REQUIRES += ["numpy", "llvmlite", "sympy>=1.8, < 1.11"] -+ INSTALL_REQUIRES += ["numpy", "llvmlite", "sympy>=1.8, < 1.12"] - - if not is_PyPy: - INSTALL_REQUIRES += ["recordclass"] diff --git a/python-Mathics.changes b/python-Mathics.changes index cc6f7ee..876e219 100644 --- a/python-Mathics.changes +++ b/python-Mathics.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Apr 11 07:11:25 UTC 2023 - Atri Bhattacharya + +- Drop some unnecessary Requires: python-recordclass, + python-scipy. +- Add necessary Requires: python-requests, python-Cython, + python-Pillow. + +------------------------------------------------------------------- +Tue Mar 14 10:37:24 UTC 2023 - Atri Bhattacharya + +- Update to version 6.0.1: + * Some Pattern-matching code gone over to add type annotations + and to start documenting its behavior and characteristics. + * Combinatorica version upgraded from 0.9 (circa 1992) to 0.91 + (circa 1995) which closer matches the published book. + * Random Builtin function documentation gone over to conform to + current documentation style. + * Pillow 9.2 dependency added for Python 3.7+. +- Drop python-Mathics-relax-sympy-version.patch: No longer needed + as upstream setup.py now allows sympy >= 1.11. +- Disable building for python3.11, unsupported + [gh#Mathics3/mathics-core#743]. +- python-Mathics-Scanner >= 1.3.0 now required. + ------------------------------------------------------------------- Sun Oct 23 04:51:56 UTC 2022 - Atri Bhattacharya diff --git a/python-Mathics.spec b/python-Mathics.spec index 8cf3876..08cb9d6 100644 --- a/python-Mathics.spec +++ b/python-Mathics.spec @@ -1,7 +1,7 @@ # # spec file for package python-Mathics # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,17 +29,16 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} # Upstream no longer supports python2 %define skip_python2 1 +%define skip_python311 1 %define pyname Mathics3 Name: python-Mathics%{psuffix} -Version: 5.0.2 +Version: 6.0.1 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-sympy-version.patch badshah400@gmail.com -- Allow working with sympy version >= 1.11 -Patch0: python-Mathics-relax-sympy-version.patch BuildRequires: %{python_module Cython} BuildRequires: %{python_module Django >= 1.8} BuildRequires: %{python_module colorama} @@ -52,29 +51,31 @@ BuildRequires: %{python_module setuptools} BuildRequires: %{python_module sympy >= 1.10.1} BuildRequires: fdupes BuildRequires: python-rpm-macros +Requires: python-Cython Requires: python-Django >= 1.8 -Requires: python-Mathics-Scanner +Requires: python-Mathics-Scanner >= 1.3.0 Requires: python-Pint Requires: python-llvmlite Requires: python-mpmath >= 0.19 +Requires: python-numpy Requires: python-palettable Requires: python-python-dateutil -Requires: python-recordclass +Requires: python-requests Requires: python-sympy >= 1.10.1 +Requires: (python-Pillow >= 9.2 if python-base >= 3.7) Requires(post): update-alternatives Requires(postun):update-alternatives %if %{with test} # SECTION For tests BuildRequires: %{python_module Mathics} -BuildRequires: %{python_module Mathics-Scanner} +BuildRequires: %{python_module Mathics-Scanner >= 1.3.0} +BuildRequires: %{python_module Pillow >= 9.2 if %python-base >= 3.7} BuildRequires: %{python_module Pint} BuildRequires: %{python_module chardet} BuildRequires: %{python_module llvmlite} BuildRequires: %{python_module palettable} BuildRequires: %{python_module pytest} -BuildRequires: %{python_module recordclass} BuildRequires: %{python_module requests} -BuildRequires: %{python_module scipy} # /SECTION %endif Provides: python-Mathics3 = %{version} @@ -86,14 +87,6 @@ Mathics is a general-purpose computer algebra system (CAS). It is meant to be a %prep %autosetup -p1 -n %{pyname}-%{version} -# FIX SPURIOUS EXEC PERMISSIONS -chmod -x ./mathics/data/ExampleData/{numberdata.csv,InventionNo1.xml} -chmod -x ./mathics/packages/SciDraw/*.m - -# WRONG END-OF-FILE ENCODING -sed -i "s/\r$//" ./mathics/data/ExampleData/numberdata.csv -sed -i "s/\r$//" ./mathics/packages/SciDraw/*.m - # REMOVE SHEBANGS FROM FILES INSTALLED TO NON-EXEC LOCATIONS pushd mathics for d in `find ./ -prune -type d` @@ -102,6 +95,9 @@ do done popd +# Fix incorrect required version for numpy in egg-info +sed -i "s/numpy<=1.24/numpy<1.25/" setup.py Mathics3.egg-info/requires.txt + %build %if %{without test} export USE_CYTHON=1 @@ -119,7 +115,8 @@ export USE_CYTHON=1 %if %{with test} %check # Home page tests require django server up and running, test_gudermannian needs network access -%pytest_arch -k 'not (test_home_page or test_gudermannian)' +# test_image: https://github.com/Mathics3/mathics-core/issues/837 +%pytest_arch -k 'not (test_home_page or test_gudermannian or test_image)' %endif %if %{without test}