Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.0
- name: Build cherab
run: dev/build.sh
- name: Run tests
Expand Down
2 changes: 1 addition & 1 deletion cherab/core/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4.0
1.5.0dev1
5 changes: 3 additions & 2 deletions cherab/tools/raytransfer/roughconductor.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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.0"]
build-backend="setuptools.build_meta"
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ cython>=0.28
numpy>=1.14
scipy
matplotlib
raysect==0.7.1
raysect==0.8.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
"numpy>=1.14",
"scipy",
"matplotlib",
"raysect==0.7.1",
"raysect==0.8.0",
],
packages=find_packages(),
include_package_data=True,
Expand Down