From 7b2a1c97ae6dce7610f244497404e4f2398f94d635471c7dd61bb919cfbfbf11 Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <badshah400@gmail.com>
Date: Sat, 17 Aug 2024 04:21:21 +0000
Subject: [PATCH] Accepting request 1193597 from
 home:badshah400:branches:science

* Update to version 1.3.1.
* Compatibility with python 3.6 dropped, bump miminum python-base version in BuildRequires to 3.8.

OBS-URL: https://build.opensuse.org/request/show/1193597
OBS-URL: https://build.opensuse.org/package/show/science/python-Mathics-Scanner?expand=0&rev=5
---
 Mathics_Scanner-1.3.0.tar.gz   |  3 ---
 mathics_scanner-1.3.1.tar.gz   |  3 +++
 python-Mathics-Scanner.changes | 11 +++++++++++
 python-Mathics-Scanner.spec    | 21 ++++++++++++---------
 4 files changed, 26 insertions(+), 12 deletions(-)
 delete mode 100644 Mathics_Scanner-1.3.0.tar.gz
 create mode 100644 mathics_scanner-1.3.1.tar.gz

diff --git a/Mathics_Scanner-1.3.0.tar.gz b/Mathics_Scanner-1.3.0.tar.gz
deleted file mode 100644
index ec75df0..0000000
--- a/Mathics_Scanner-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:39751a2d28d40c88538cc03aa72a113dcae59fc49e8e7727f30219a6cc9ef997
-size 125861
diff --git a/mathics_scanner-1.3.1.tar.gz b/mathics_scanner-1.3.1.tar.gz
new file mode 100644
index 0000000..48781d9
--- /dev/null
+++ b/mathics_scanner-1.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:599a1e5bb84a802de424256b008ca93365bd73471d0aab5ae99f69028088df22
+size 127755
diff --git a/python-Mathics-Scanner.changes b/python-Mathics-Scanner.changes
index ed8712e..3be27b6 100644
--- a/python-Mathics-Scanner.changes
+++ b/python-Mathics-Scanner.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Aug 13 04:53:15 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 1.3.1:
+  * Packaging was redone to be able to support Python 3.12.
+  * Files now follow current Python black formatting and isort
+    import ordering.
+  * Some Python code linting.
+- Compatibility with python 3.6 dropped, bump miminum python-base
+  version in BuildRequires to 3.8.
+
 -------------------------------------------------------------------
 Mon Apr 10 20:45:44 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 
diff --git a/python-Mathics-Scanner.spec b/python-Mathics-Scanner.spec
index 130690f..0ad3924 100644
--- a/python-Mathics-Scanner.spec
+++ b/python-Mathics-Scanner.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-Mathics-Scanner
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,16 +16,19 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
+%define modname mathics_scanner
 Name:           python-Mathics-Scanner
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
 Summary:        Character Tables and Tokenizer for Mathics and the Wolfram Language
 License:        GPL-3.0-only
 URL:            https://mathics.org/
-Source:         https://files.pythonhosted.org/packages/source/M/Mathics-Scanner/Mathics_Scanner-%{version}.tar.gz
+Source:         https://files.pythonhosted.org/packages/source/M/Mathics-Scanner/%{modname}-%{version}.tar.gz
+BuildRequires:  %{python_module base >= 3.8}
+BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module wheel}
 BuildRequires:  python-rpm-macros
 # SECTION test requirements
 BuildRequires:  %{python_module chardet}
@@ -47,16 +50,16 @@ BuildArch:      noarch
 Character Tables and Tokenizer for Mathics and the Wolfram Language.
 
 %prep
-%setup -q -n Mathics_Scanner-%{version}
+%setup -q -n %{modname}-%{version}
 # Fix shbang
 sed -i "s|/usr/bin/env python|/usr/bin/python3|" mathics_scanner/generate/build_tables.py
 sed -i "s|/usr/bin/env python3|/usr/bin/python3|" mathics_scanner/generate/rl_inputrc.py
 
 %build
-%python_build
+%pyproject_wheel
 
 %install
-%python_install
+%pyproject_install
 %python_clone -a %{buildroot}%{_bindir}/mathics-generate-json-table
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 # Should be executable
@@ -73,7 +76,7 @@ sed -i "s|/usr/bin/env python3|/usr/bin/python3|" mathics_scanner/generate/rl_in
 
 %files %{python_files}
 %python_alternative %{_bindir}/mathics-generate-json-table
-%{python_sitelib}/mathics_scanner/
-%{python_sitelib}/Mathics_Scanner-%{version}-py%{python_version}.egg-info/
+%{python_sitelib}/%{modname}/
+%{python_sitelib}/Mathics_Scanner-%{version}*.*-info/
 
 %changelog