diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a1350bf7..f4c15ee4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - name: Install Python dependencies run: python -m pip install --prefer-binary cython>=0.28 ${{ matrix.numpy-version }} scipy matplotlib "pyopencl[pocl]>=2022.2.4" - name: Install Raysect from pypi - run: pip install raysect==0.7.1 + run: pip install raysect==0.8.1 - name: Build cherab run: dev/build.sh - name: Run tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae0a7d3..0a17fd37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ Project Changelog ================= +Release 1.5.0 (TBD) +------------------- + +New: +* Support Raysect 0.8 + + Release 1.4.0 (3 Feb 2023) ------------------- diff --git a/cherab/core/VERSION b/cherab/core/VERSION index 88c5fb89..c831dd27 100644 --- a/cherab/core/VERSION +++ b/cherab/core/VERSION @@ -1 +1 @@ -1.4.0 +1.5.0.dev1 diff --git a/cherab/tools/raytransfer/roughconductor.pyx b/cherab/tools/raytransfer/roughconductor.pyx index 04edf6f2..faef9cf1 100644 --- a/cherab/tools/raytransfer/roughconductor.pyx +++ b/cherab/tools/raytransfer/roughconductor.pyx @@ -18,7 +18,7 @@ # under the Licence. # -from raysect.optical cimport Point3D, Vector3D, AffineMatrix3D, World, Ray, Spectrum, new_vector3d +from raysect.optical cimport Point3D, Vector3D, AffineMatrix3D, World, Ray, Spectrum, new_vector3d, Intersection from libc.math cimport M_PI, sqrt from raysect.optical.material cimport RoughConductor cimport cython @@ -34,7 +34,8 @@ cdef class RToptimisedRoughConductor(RoughConductor): @cython.cdivision(True) cpdef Spectrum evaluate_shading(self, World world, Ray ray, Vector3D s_incoming, Vector3D s_outgoing, Point3D w_reflection_origin, Point3D w_transmission_origin, bint back_face, - AffineMatrix3D world_to_surface, AffineMatrix3D surface_to_world): + AffineMatrix3D world_to_surface, AffineMatrix3D surface_to_world, + Intersection intersection): cdef: double n, k diff --git a/pyproject.toml b/pyproject.toml index f896f8f0..ce56ed60 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.28", "raysect==0.7.1"] +requires = ["setuptools", "wheel", "oldest-supported-numpy", "cython>=0.28", "raysect==0.8.1"] build-backend="setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index 2b5e7b4e..24a9b6e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,4 @@ cython>=0.28 numpy>=1.14 scipy matplotlib -raysect==0.7.1 \ No newline at end of file +raysect==0.8.1 diff --git a/setup.py b/setup.py index d7810f52..476697e8 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ source_paths = ["cherab", "demos"] compilation_includes = [".", numpy.get_include()] -compilation_args = [] +compilation_args = ["-O3"] cython_directives = {"language_level": 3} setup_path = path.dirname(path.abspath(__file__)) @@ -103,7 +103,7 @@ "numpy>=1.14", "scipy", "matplotlib", - "raysect==0.7.1", + "raysect==0.8.1", ], packages=find_packages(), include_package_data=True,