Merge branch 'master' into ray-tracing

SWIFTSIM · Sep 9, 2024 · 1484dd5 · 1484dd5
2 parents 7f9092f + 0086510
commit 1484dd5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,11 +3,25 @@ requires = ["setuptools>=61.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]
-packages = ["swiftsimio", "swiftsimio.initial_conditions", "swiftsimio.metadata", "swiftsimio.metadata.cosmology", "swiftsimio.metadata.metadata", "swiftsimio.metadata.particle", "swiftsimio.metadata.unit", "swiftsimio.metadata.writer", "swiftsimio.visualisation", "swiftsimio.visualisation.projection_backends", "swiftsimio.visualisation.slice_backends", "swiftsimio.visualisation.tools"]
+packages = [
+    "swiftsimio",
+    "swiftsimio.initial_conditions",
+    "swiftsimio.metadata",
+    "swiftsimio.metadata.cosmology",
+    "swiftsimio.metadata.metadata",
+    "swiftsimio.metadata.particle",
+    "swiftsimio.metadata.unit",
+    "swiftsimio.metadata.writer",
+    "swiftsimio.visualisation",
+    "swiftsimio.visualisation.projection_backends",
+    "swiftsimio.visualisation.slice_backends",
+    "swiftsimio.visualisation.tools",
+    "swiftsimio.visualisation.smoothing_length"
+]
 
 [project]
 name = "swiftsimio"
-version="7.0.3"
+version="8.0.1"
 authors = [
     { name="Josh Borrow", email="[email protected]" },
 ]

diff --git a/swiftsimio/__version__.py b/swiftsimio/__version__.py
@@ -1 +1 @@
-__version__ = "7.0.3"
+__version__ = "8.0.1"
diff --git a/swiftsimio/visualisation/__init__.py b/swiftsimio/visualisation/__init__.py
@@ -6,3 +6,4 @@
 from .slice import slice_scatter as slice
 from .slice import slice_gas, slice_gas_pixel_grid
 from .smoothing_length import generate_smoothing_lengths
+
diff --git a/swiftsimio/visualisation/smoothing_length/__init__.py b/swiftsimio/visualisation/smoothing_length/__init__.py
@@ -1,12 +1,11 @@
-from swiftsimio.visualisation.smoothing_length.sph import get_hsml as sph_get_hsml
-from swiftsimio.visualisation.smoothing_length.nearest_neighbours import (
+from .sph import get_hsml as sph_get_hsml
+from .nearest_neighbours import (
     get_hsml as nearest_neighbours_get_hsml,
 )
-from swiftsimio.visualisation.smoothing_length.generate import (
+from .generate import (
     generate_smoothing_lengths,
 )
 
-
 backends_get_hsml = {
     "sph": sph_get_hsml,
     "nearest_neighbours": nearest_neighbours_get_hsml,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@
		from .slice import slice_scatter as slice
		from .slice import slice_gas, slice_gas_pixel_grid
		from .smoothing_length import generate_smoothing_lengths