Skip to content

Commit b2db75a

Browse files
Merge branch 'development' into fix/document
2 parents a22e73b + ffacfe7 commit b2db75a

File tree

130 files changed

+643
-712
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

130 files changed

+643
-712
lines changed

CHANGELOG.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Release 0.9.1 (25 Aug 2025)
66

77
Bug fixes:
88
* Fixed a typo in the meson.build files that was not caught by meson, due to a bug in meson's option handling.
9-
- Versions of meson < 1.8.4 suffered regressions in option handling that were fixed in v1.8.4.
9+
- Meson versions v1.8.0 to v1.8.3 suffered regressions in option handling that were fixed in v1.8.4.
1010
- Attempting to build Raysect with meson v1.8.4 resulted in an error.
1111

1212
New:
13-
* Added pickle support to Interpolate1DArray, Interpolate2DArray and Interpolate3DArray.
13+
* Added pickle support to Interpolator1DArray, Interpolator2DArray and Interpolator3DArray.
1414

1515

1616
Release 0.9.0 (30 Jul 2025)

dev/build_wheels_manylinux2010.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

dev/build_wheels_manylinux2014.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

dev/notes/building_a_release.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
Building a Release
2+
==================
3+
4+
We have switched to building with cibuildwheel and build. You'll need docker installed and working.
5+
In a venv, install the required packages:
6+
7+
> pip install twine build cibuildwheel
8+
9+
Build the source distribution:
10+
11+
> python -m build
12+
13+
Build the wheels:
14+
15+
> cibuildwheel
16+
17+
The cibuildwheel process is long. First the required docker images are obtained/updated,
18+
then a matrix of builds is performed.
19+
20+
Move the sdist and wheels to a common folder and upload to pypi with twine. Twine needs an API key.
21+
Upload to the test repository first and confirm everything works as expected:
22+
23+
twine upload --repository testpypi wheelhouse/*
24+
25+
If happy, upload to the main pypi repository:
26+
27+
twine upload wheelhouse/*
28+
29+
30+
31+
32+

dev/notes/building_bdist_with_manylinux.txt

Lines changed: 0 additions & 42 deletions
This file was deleted.

dev/root-meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ py = import('python').find_installation(pure: false)
1010
numpy = dependency('numpy', method: 'config-tool')
1111
fs = import('fs')
1212

13-
# disabling explicit noexcept until pycharm fixes their cython 3 support (causes a large number of build warnings)
14-
cython_args = ['--annotate', '-X legacy_implicit_noexcept=True']
13+
cython_args = ['--annotate']
1514
cython_dependencies = [numpy]

meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ py = import('python').find_installation(pure: false)
1313
numpy = dependency('numpy', method: 'config-tool')
1414
fs = import('fs')
1515

16-
# disabling explicit noexcept until pycharm fixes their cython 3 support (causes a large number of build warnings)
17-
cython_args = ['--annotate', '-X legacy_implicit_noexcept=True']
16+
cython_args = ['--annotate']
1817
cython_dependencies = [numpy]
1918

2019
subdir('raysect')

raysect/core/acceleration/accelerator.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ from raysect.core.intersection cimport Intersection
3636

3737
cdef class Accelerator:
3838

39-
cpdef build(self, list primitives)
39+
cpdef object build(self, list primitives)
4040
cpdef Intersection hit(self, Ray ray)
4141
cpdef list contains(self, Point3D point)

raysect/core/acceleration/accelerator.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
cdef class Accelerator:
3333

34-
cpdef build(self, list primitives):
34+
cpdef object build(self, list primitives):
3535
pass
3636

3737
cpdef Intersection hit(self, Ray ray):

raysect/core/acceleration/boundprimitive.pxd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ cdef class BoundPrimitive:
4444

4545
cdef Intersection hit(self, Ray ray)
4646
cdef Intersection next_intersection(self)
47-
cdef bint contains(self, Point3D point)
47+
cdef bint contains(self, Point3D point) noexcept

0 commit comments

Comments
 (0)