Merge pull request #452 from raysect/development

V0.9.0 Release

Author: CnlPepper

.github/workflows/ci.yml

@@ -11,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        numpy-version: ["oldest-supported-numpy", "numpy"]
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        numpy-version: ["numpy"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
@@ -21,8 +21,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install Python dependencies
-      run: python -m pip install --prefer-binary setuptools "cython>=0.28,<3.0" "matplotlib>=3,<4" ${{ matrix.numpy-version }}
+      run: python -m pip install --prefer-binary meson-python meson ninja setuptools setuptools-scm "cython>=3.1" "matplotlib>=3,<4" ${{ matrix.numpy-version }}
     - name: Build and install Raysect
-      run: dev/build.sh
+      run: dev/install_editable.sh
     - name: Run tests
       run: dev/test.sh

.gitignore

@@ -6,10 +6,12 @@ __pycache__/
 # C extensions
 *.so
 *.c
+
 # Distribution / packaging
+/build/
 .Python
 env/
-build/
+venv/
 develop-eggs/
 dist/
 downloads/
@@ -58,4 +60,5 @@ docs/build/
 # PyBuilder
 target/
 
-
+# setuptools-scm
+raysect/_version.py

CHANGELOG.txt

@@ -1,6 +1,32 @@
 Raysect Changelog
 =================
 
+Release 0.9.0 (TBD)
+-------------------
+
+Build changes:
+* The legacy setuptools build system has been replaced with meson-python.
+  - The dev/build.sh and dev/clean.sh scripts have been updated to work with the new build system.
+  - A meson.build generator script is provided to automate the discovery of pyx, pxd,py and data files. Please see dev/generate_meson_files.py.
+  - When installed in editable mode, any modified pyx files will automatically trigger a rebuild when python attempts to import from the package. Please be aware that (as with the previous build system) changes to pxd files will require a clean rebuild of the project.
+  - A dev/install_editable.sh script is provided to simplify the installation of the package in editable mode with verbose build output enabled.
+  - Meson-python performs the build out of the project folder, so the project source folders will no longer be polluted with build artefacts.
+  - Cython build annotations are now always enabled, the annotation files can be found in the build folder under the build artefacts folder associated with each so file (*.so.p folder).
+* The codebase has been migrated to Cython 3.
+  - This migration was made possible due to the contributions of Koyo Munechika (@munechika-koyo).
+
+Python support:
+* Raysect now requires Python v3.9 and above.
+  - From version v0.9.0 Raysect is dropping support for Python versions older than v3.9.
+  - Users of older versions of Python should remain using Raysect v0.8.1 and plan for a migration to v0.9.0+.
+
+API changes:
+* Corrected spelling of all classes, methods and functions where "targeted" was incorrectly spelt "targetted".
+
+New:
+* Added a torus primitive (contribute by Koyo Munechika).
+
+
 Release 0.8.1 (12 Feb 2023)
 ---------------------------
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021, Dr Alex Meakins, Raysect Project
+Copyright (c) 2014-2025, Dr Alex Meakins, Raysect Project
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

MANIFEST.in

@@ -1,5 +1,4 @@
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1341346.svg)](https://doi.org/10.5281/zenodo.1341346)
-[![Build Status](https://travis-ci.com/raysect/source.svg?branch=master)](https://travis-ci.com/raysect/source)
 
 <a name="logo"/>
 <a href="https://www.raysect.org/" target="_blank">

README.md

@@ -18,7 +18,7 @@ def emission_function(self, point, direction, spectrum, world, ray, primitive, t
         wvl_range = spectrum.min_wavelength - spectrum.max_wavelength
         shift = 2 * (spectrum.wavelengths - wvl_centre) / wvl_range
         radius = sqrt(point.x**2 + point.y**2)
-        spectrum.samples += cos((shift + 5) * radius)**4
+        spectrum.samples[:] += cos((shift + 5) * radius)**4
         return spectrum
 
 

demos/materials/modifiers/transform.py

@@ -20,7 +20,7 @@ def emission_function(self, point, direction, spectrum, world, ray, primitive, t
         wvl_range = spectrum.min_wavelength - spectrum.max_wavelength
         shift = 2 * (spectrum.wavelengths - wvl_centre) / wvl_range
         radius = sqrt(point.x**2 + point.y**2)
-        spectrum.samples += cos((shift + 5) * radius)**4
+        spectrum.samples[:] += cos((shift + 5) * radius)**4
         return spectrum
 
 

demos/materials/volume.py

@@ -2,7 +2,7 @@
 import matplotlib.pyplot as plt
 from math import atan2, sqrt, degrees
 
-from raysect.core.math import Point3D, TargettedHemisphereSampler, TargettedSphereSampler
+from raysect.core.math import Point3D, TargetedHemisphereSampler, TargetedSphereSampler
 
 
 def display_samples(samples, title):
@@ -34,8 +34,8 @@ def display_samples(samples, title):
 observation_point = Point3D(0, 0, 0)
 
 # generate samplers
-hemisphere = TargettedHemisphereSampler(targets)
-sphere = TargettedSphereSampler(targets)
+hemisphere = TargetedHemisphereSampler(targets)
+sphere = TargetedSphereSampler(targets)
 
 # sample for origin point and point at (0, 0, -10)
 h_samples = hemisphere(observation_point, samples=samples)

demos/maths/plot_targetted_sampler.py demos/maths/plot_targeted_sampler.pydemos/maths/plot_targetted_sampler.py renamed to demos/maths/plot_targeted_sampler.py

@@ -4,7 +4,7 @@
 from raysect.optical import World, Node, translate, rotate, Point3D
 from raysect.optical.material import Lambert, UniformSurfaceEmitter, AbsorbingSurface, Checkerboard
 from raysect.optical.library import *
-from raysect.optical.observer import TargettedCCDArray
+from raysect.optical.observer import TargetedCCDArray
 from raysect.optical.observer import RGBPipeline2D, BayerPipeline2D, PowerPipeline2D
 from raysect.optical.observer import RGBAdaptiveSampler2D
 from raysect.core.math import mm
@@ -184,9 +184,9 @@
 rgb = RGBPipeline2D(display_unsaturated_fraction=0.96, name="sRGB")
 sampler = RGBAdaptiveSampler2D(rgb, ratio=10, fraction=0.2, min_samples=1000, cutoff=0.01)
 
-# CCD targetting all rays at last lens element for speed
-ccd = TargettedCCDArray(
-    targetted_path_prob=1.0, targets=[l3],
+# CCD targeting all rays at last lens element for speed
+ccd = TargetedCCDArray(
+    targeted_path_prob=1.0, targets=[l3],
     width=mm(35), pixels=(512, 512),
     parent=image_plane, transform=translate(0, 0, 0)*rotate(0, 0, 180),
     pipelines=[rgb]