Merge pull request #7 from semuconsulting/RC-1.0.14

Rc 1.0.14

Author: semuadmin

.vscode/settings.json

@@ -2,7 +2,7 @@
     "python.testing.pytestEnabled": true,
     "python.testing.unittestEnabled": false,
     "python.formatting.provider": "black",
-    "python.defaultInterpreterPath": "/Library/Frameworks/Python.framework/Versions/3.12/bin/python3.12",
+    "python.defaultInterpreterPath": "python3",
     "editor.formatOnSave": true,
     "modulename": "pymandel",
     "distname": "pymandel",

README.md

@@ -83,7 +83,7 @@ the Python 3 scripts (bin) and site_packages directories are included in your PA
 
 ### Dependencies
 
-PyMandel is compatible with Python >=3.9 <=3.12. **NB:** PyMandel does not currently support Python 3.13 due to the dependent `numba` library.
+PyMandel is compatible with Python 3.9 - 3.13.
 
 On Windows and MacOS, pip, tkinter and the necessary imaging libraries are generally packaged with Python.  On some Linux distributions like Ubuntu 18+ and Raspberry Pi OS, they may need to be installed separately, e.g.:
 
@@ -152,26 +152,6 @@ Icon=/home/user/.local/lib/python3.11/site-packages/pygpsclient/resources/pymand
 Exec=/home/user/.local/bin/pymandel
 ```
 
-### 2. Manual installation
-
-The following Python libraries are required (these will be installed automatically if using pip to install PyMandel):
-
-```shell
-python3 -m pip install --upgrade numba numpy Pillow
-```
-
-To install PyMandel manually, download and unzip this repository and type:
-
-```shell
-python3 -m /path_to_folder/foldername/pymandel
-```
-
-e.g. if you downloaded and unzipped to a folder named `PyMandel-1.0.12`, type: 
-
-```shell
-python3 -m /path_to_folder/PyMandel-1.0.12/pymandel
-```
-
 ### Performance Optimisations
 
 The application makes use of [Numba](http://numba.pydata.org/) just in time (jit) compilation, caching and parallelisation techniques, in conjunction with Numpy image arrays, to dramatically improve calculation and rendering times relative to standard Python, particularly on multi-core CPUs. 

RELEASE_NOTES.md

@@ -1,5 +1,11 @@
 # PyMandel Release Notes
 
+### RELEASE 1.0.14
+
+CHANGES:
+
+1. Support for Python 3.13 added - numba>=0.61 now supports 3.13
+
 ### RELEASE 1.0.13
 
 CHANGES:

pyproject.toml

@@ -33,6 +33,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Topic :: Multimedia :: Graphics",
     "Topic :: Scientific/Engineering :: Mathematics",

src/colormaps/make_colormap.py

@@ -48,37 +48,35 @@ def make_colormap(**kwargs):
         print(f"Invalid image mode {mode} - must be RGB or RGBA")
 
     levels = int(kwargs.get("levels", image.width))
-    if levels > image.width:
-        levels = image.width
+    levels = min(levels, image.width)
     outfile = kwargs.get("output", mapname + str(levels) + "_colormap.py")
 
-    file = open(outfile, "a", encoding="utf-8")
-    file.write("from numpy import array\n\n")
-    file.write(
-        "#****************************************************************************************\n"
-        f"# {str(levels)}-level colormap created by make_colormap utility from file {infile}\n"
-        "#****************************************************************************************\n"
-    )
-    file.write(mapname + " = array([ \\\n")
-
-    for x_axis in range(levels):
-        pix = int(x_axis * image.width / levels)
-        if x_axis == levels - 1:
-            end = "]])\n"
-        elif x_axis % 4 == 3:
-            end = "],\n"
-        else:
-            end = "],"
-        if mode == "RGBA":
-            red, grn, blu, alpha = image.getpixel((pix, 0))
-        else:
-            red, grn, blu = image.getpixel((pix, 0))
-        file.write("[" + str(red) + "," + str(grn) + "," + str(blu) + end)
-
-    image.close()
-    file.close()
-
-    print(str(levels) + "-level colormap file " + outfile + " created")
+    with open(outfile, "a", encoding="utf-8") as file:
+        file.write("from numpy import array\n\n")
+        file.write(
+            "#****************************************************************************************\n"
+            f"# {str(levels)}-level colormap created by make_colormap utility from file {infile}\n"
+            "#****************************************************************************************\n"
+        )
+        file.write(mapname + " = array([ \\\n")
+
+        for x_axis in range(levels):
+            pix = int(x_axis * image.width / levels)
+            if x_axis == levels - 1:
+                end = "]])\n"
+            elif x_axis % 4 == 3:
+                end = "],\n"
+            else:
+                end = "],"
+            if mode == "RGBA":
+                red, grn, blu, alpha = image.getpixel((pix, 0))
+            else:
+                red, grn, blu = image.getpixel((pix, 0))
+            file.write("[" + str(red) + "," + str(grn) + "," + str(blu) + end)
+
+        image.close()
+
+        print(str(levels) + "-level colormap file " + outfile + " created")
 
 
 def main():

src/pymandel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pymandel
-Version: 1.0.13
+Version: 1.0.14
 Summary: Fractal generation GUI application
 Author-email: semuadmin <semuadmin@semuconsulting.com>
 Maintainer-email: semuadmin <semuadmin@semuconsulting.com>
@@ -696,6 +696,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Topic :: Multimedia :: Graphics
 Classifier: Topic :: Scientific/Engineering :: Mathematics
@@ -806,7 +807,7 @@ the Python 3 scripts (bin) and site_packages directories are included in your PA
 
 ### Dependencies
 
-PyMandel is compatible with Python >=3.9 <=3.12. **NB:** PyMandel does not currently support Python 3.13 due to the dependent `numba` library.
+PyMandel is compatible with Python 3.9 - 3.13.
 
 On Windows and MacOS, pip, tkinter and the necessary imaging libraries are generally packaged with Python.  On some Linux distributions like Ubuntu 18+ and Raspberry Pi OS, they may need to be installed separately, e.g.:
 
@@ -875,26 +876,6 @@ Icon=/home/user/.local/lib/python3.11/site-packages/pygpsclient/resources/pymand
 Exec=/home/user/.local/bin/pymandel
 ```
 
-### 2. Manual installation
-
-The following Python libraries are required (these will be installed automatically if using pip to install PyMandel):
-
-```shell
-python3 -m pip install --upgrade numba numpy Pillow
-```
-
-To install PyMandel manually, download and unzip this repository and type:
-
-```shell
-python3 -m /path_to_folder/foldername/pymandel
-```
-
-e.g. if you downloaded and unzipped to a folder named `PyMandel-1.0.12`, type: 
-
-```shell
-python3 -m /path_to_folder/PyMandel-1.0.12/pymandel
-```
-
 ### Performance Optimisations
 
 The application makes use of [Numba](http://numba.pydata.org/) just in time (jit) compilation, caching and parallelisation techniques, in conjunction with Numpy image arrays, to dramatically improve calculation and rendering times relative to standard Python, particularly on multi-core CPUs. 

src/pymandel/_version.py

@@ -2,4 +2,4 @@
 Version for PyMandel Application.
 """
 
-__version__ = "1.0.13"
+__version__ = "1.0.14"

src/pymandel/mandelcli.py

@@ -78,8 +78,7 @@ def __init__(self, **kwargs):
         self._theme = kwargs.get("theme", "Default")
         self._shift = int(kwargs.get("shift", 0))
         self._startframe = int(kwargs.get("startframe", 1))
-        if self._startframe > self._frames:
-            self._startframe = self._frames
+        self._startframe = min(self._startframe, self._frames)
         self._zoom = float(kwargs.get("zoom", 0.75))
         self._startzoom = float(
             kwargs.get(