diff --git a/41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c.patch b/41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c.patch deleted file mode 100644 index 5747e27..0000000 --- a/41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c Mon Sep 17 00:00:00 2001 -From: rocky -Date: Sat, 31 Jul 2021 20:59:15 -0400 -Subject: [PATCH] Bump to dev version - ---- - mathics/version.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mathics/version.py b/mathics/version.py -index 7f01dd50e..d24d22d6c 100644 ---- a/mathics/version.py -+++ b/mathics/version.py -@@ -5,4 +5,4 @@ - # well as importing into Python. That's why there is no - # space around "=" below. - # fmt: off --__version__="4.0.0" # noqa -+__version__="4.0.1.dev0" # noqa diff --git a/Mathics3-4.0.0.tar.gz b/Mathics3-4.0.0.tar.gz deleted file mode 100644 index 3661667..0000000 --- a/Mathics3-4.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e05868f36d6678c6bee772257ebccd6cca39509bc91a82f8aa23e3e05cb54e1 -size 2016359 diff --git a/Mathics3-5.0.0.tar.gz b/Mathics3-5.0.0.tar.gz new file mode 100644 index 0000000..ca8b365 --- /dev/null +++ b/Mathics3-5.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:caeb4ce0234758367d9e3d7ef8d351ed3b7290d1bc52b7b1c99a7512d788b5bc +size 2876683 diff --git a/python-Mathics-relax-sympy-versions.patch b/python-Mathics-relax-sympy-versions.patch deleted file mode 100644 index fe7f94b..0000000 --- a/python-Mathics-relax-sympy-versions.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Mathics-4.0.0/setup.py -=================================================================== ---- Mathics-4.0.0.orig/setup.py -+++ Mathics-4.0.0/setup.py -@@ -105,7 +105,7 @@ else: - # General Requirements - INSTALL_REQUIRES += [ - "Mathics_Scanner>=1.2.1,<1.3.0", -- "sympy>=1.8, <= 1.9dev", -+ "sympy>=1.8", - "mpmath>=1.2.0", - "numpy", - "palettable", diff --git a/python-Mathics.changes b/python-Mathics.changes index 2c2efd8..79f0533 100644 --- a/python-Mathics.changes +++ b/python-Mathics.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sun Jul 31 20:48:13 UTC 2022 - Atri Bhattacharya + +- Update to version 5.0.0: + * Many changes, see + https://github.com/Mathics3/mathics-core/releases/tag/5.0.0 +- Add requirements-cython.txt as Source since it is missing from + the tagged source tarball. +- Drop upstream incorporated patches: + * python-Mathics-relax-sympy-versions.patch + * 41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c.patch +- Export USE_CYTHON env variable to allow cythonised builds. +- New BuildRequires (for tests) and Requires: python-recordclass. +- Fix up some new spurious file permissions and EOF encodings. + ------------------------------------------------------------------- Sun Jul 17 00:51:00 UTC 2022 - Atri Bhattacharya @@ -49,7 +64,7 @@ Sat Jan 29 19:13:15 UTC 2022 - Atri Bhattacharya ------------------------------------------------------------------- Tue Apr 20 04:19:34 UTC 2021 - Steve Kowalik -- Don't build for Python 3.6, due to no NumPy. +- Don't build for Python 3.6, due to no NumPy. ------------------------------------------------------------------- Mon Dec 28 01:52:38 UTC 2020 - Atri Bhattacharya diff --git a/python-Mathics.spec b/python-Mathics.spec index 30bd890..8cfb87e 100644 --- a/python-Mathics.spec +++ b/python-Mathics.spec @@ -31,17 +31,15 @@ %define skip_python2 1 %define pyname Mathics3 Name: python-Mathics%{psuffix} -Version: 4.0.0 +Version: 5.0.0 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/ -Source: https://github.com/mathics/Mathics/archive/%{version}/%{pyname}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Revert version jump to dev branch -Patch0: https://github.com/Mathics3/mathics-core/commit/41dee8c9dd7b979a4d77d38a1e8fe8dc75b7638c.patch -# PATCH-FIX-UPSTREAM python-Mathics-relax-sympy-versions.patch badshah400@gmail.com -- Relax required sympy versions, to enable tests to run on openSUSE >= 1550 where sympy is at version 1.10.x already -Patch1: python-Mathics-relax-sympy-versions.patch +Source0: https://github.com/Mathics3/mathics-core/releases/download/%{version}/%{pyname}-%{version}.tar.gz +# File missing from tagged tarball +Source1: https://raw.githubusercontent.com/Mathics3/mathics-core/%{version}/requirements-cython.txt BuildRequires: %{python_module Cython} BuildRequires: %{python_module Django >= 1.8} BuildRequires: %{python_module colorama} @@ -52,7 +50,7 @@ BuildRequires: %{python_module pexpect} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module six >= 1.10} -BuildRequires: %{python_module sympy >= 1.8} +BuildRequires: %{python_module sympy >= 1.10.1} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-Django >= 1.8 @@ -62,8 +60,9 @@ Requires: python-llvmlite Requires: python-mpmath >= 0.19 Requires: python-palettable Requires: python-python-dateutil +Requires: python-recordclass Requires: python-six >= 1.10 -Requires: python-sympy >= 1.8 +Requires: python-sympy >= 1.10.1 Requires(post): update-alternatives Requires(postun):update-alternatives %if %{with test} @@ -75,6 +74,7 @@ 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 @@ -86,15 +86,17 @@ Provides: python-Mathics3 = %{version} Mathics is a general-purpose computer algebra system (CAS). It is meant to be a free, lightweight alternative to Mathematica. %prep -%setup -q -n Mathics-%{version} -%patch0 -p1 -R -%patch1 -p1 +%setup -q -n %{pyname}-%{version} + +cp %{SOURCE1} ./ # 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 @@ -106,11 +108,13 @@ popd %build %if %{without test} +export USE_CYTHON=1 %python_build %endif %install %if %{without test} +export USE_CYTHON=1 %python_install %python_clone -a %{buildroot}%{_bindir}/mathics %python_expand %fdupes %{buildroot}%{$python_sitearch} @@ -118,11 +122,8 @@ popd %if %{with test} %check -# Tests need to be run from the test dir, otherwise some tests in test_files.py fail -pushd test -# Home page tests require django server up and running -%pytest_arch -k 'not test_home_page' -popd +# Home page tests require django server up and running, test_gudermannian needs network access +%pytest_arch -k 'not (test_home_page or test_gudermannian)' %endif %if %{without test} diff --git a/requirements-cython.txt b/requirements-cython.txt new file mode 100644 index 0000000..1168263 --- /dev/null +++ b/requirements-cython.txt @@ -0,0 +1,2 @@ +# Optional packages which add functionality or speed things up +cython # To speed up building