fusion-energy · shimwell · Oct 9, 2022 · Oct 8, 2022 · Oct 8, 2022 · Oct 9, 2022
diff --git a/Dockerfile b/Dockerfile
@@ -70,7 +70,7 @@ FROM dependencies as final
 ARG paramak_version=develop
 
 COPY run_tests.sh run_tests.sh
-COPY paramak paramak/
+COPY src src/
 COPY examples examples/
 
 COPY tests tests/

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -14,8 +14,8 @@ build:
 requirements:
   build:
     - python {{ python }}
-    - setuptools>=46.4.0
-    - setuptools_scm>=6.3.1
+    - setuptools>=65.4.1
+    - setuptools_scm>=7.0.5
   run:
     - python {{ python }}
     - cadquery {{ cadquery }}

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,13 +1,48 @@
 [build-system]
 requires = [
-    "setuptools >= 46.4.0",
-    "wheel",
-    "setuptools_scm[toml] >= 6.3.1",
+    "setuptools >= 65.4.1",
+    "setuptools_scm[toml] >= 7.0.5",
 ]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "paramak"
+dynamic = ["version"]
+description = "Create 3D fusion reactor CAD models based on input parameters"
+readme = "README.md"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+authors = [
+  { name="The Paramak Development Team" },
+]
+license = {file = "LICENSE.txt"}
+requires-python = ">=3.8"
+dependencies = [
+    "plotly>=5.1.0",
+    "scipy>=1.7.0",
+    "sympy>=1.8",
+    "numpy>=1.21.1",
+    "matplotlib>=3.4.2",
+    "plasmaboundaries>=0.1.8",
+    "jupyter-client < 7",
+    "jupyter-cadquery>=3.2.0",
+    "brep_part_finder>=0.5.0",
+    "brep_to_h5m>=0.4.0",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/fusion-energy/paramak"
+"Bug Tracker" = "https://github.com/fusion-energy/paramak/issues"
+"Documentation" = "https://paramak.readthedocs.io"
+
 [tool.setuptools_scm]
-write_to = "paramak/_version.py"
+write_to = "src/_version.py"
 
 [tool.black]
 line-length = 120
+
+[tool.setuptools]
+package-dir = {"" = "src"}
diff --git a/setup.cfg b/setup.cfg
@@ -1,43 +1,10 @@
 [metadata]
-name = paramak
 version = attr: paramak.__version__
 author = The Paramak Development Team
 author_email = [email protected]
-description = Create 3D fusion reactor CAD models based on input parameters
 long_description = file: README.md
 long_description_content_type = text/markdown
-url = https://github.com/fusion-energy/paramak
-license = MIT
-license_file = LICENSE.txt
-classifiers =
-    Natural Language :: English
-    Topic :: Scientific/Engineering
-    Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
-    License :: OSI Approved :: MIT License
-    Operating System :: OS Independent
-project_urls =
-    Source = https://github.com/fusion-energy/paramak
-    Tracker = https://github.com/fusion-energy/paramak/issues
 
-[options]
-packages = find:
-python_requires= >=3.8
-install_requires=
-    plotly >= 5.1.0
-    scipy >= 1.7.0
-    sympy >= 1.8
-    numpy >= 1.21.1
-    matplotlib >= 3.4.2
-    plasmaboundaries >= 0.1.8
-    jupyter-client < 7
-    jupyter-cadquery >= 3.2.0
-    brep_part_finder >= 0.5.0
-    brep_to_h5m >= 0.4.0
-    setuptools_scm
 
 [options.extras_require]
 tests =

diff --git a/paramak/__init__.py → src/paramak/__init__.py b/paramak/__init__.py → src/paramak/__init__.py
diff --git a/paramak/parametric_components/__init__.py → ...paramak/parametric_components/__init__.py b/paramak/parametric_components/__init__.py → ...paramak/parametric_components/__init__.py
diff --git a/...nents/blanket_constant_thickness_arc_h.py → ...nents/blanket_constant_thickness_arc_h.py b/...nents/blanket_constant_thickness_arc_h.py → ...nents/blanket_constant_thickness_arc_h.py
diff --git a/...nents/blanket_constant_thickness_arc_v.py → ...nents/blanket_constant_thickness_arc_v.py b/...nents/blanket_constant_thickness_arc_v.py → ...nents/blanket_constant_thickness_arc_v.py
diff --git a/...ic_components/blanket_cutter_parallels.py → ...ic_components/blanket_cutter_parallels.py b/...ic_components/blanket_cutter_parallels.py → ...ic_components/blanket_cutter_parallels.py
diff --git a/...metric_components/blanket_cutters_star.py → ...metric_components/blanket_cutters_star.py b/...metric_components/blanket_cutters_star.py → ...metric_components/blanket_cutters_star.py
diff --git a/paramak/parametric_components/blanket_fp.py → ...ramak/parametric_components/blanket_fp.py b/paramak/parametric_components/blanket_fp.py → ...ramak/parametric_components/blanket_fp.py
diff --git a/...ic_components/blanket_poloidal_segment.py → ...ic_components/blanket_poloidal_segment.py b/...ic_components/blanket_poloidal_segment.py → ...ic_components/blanket_poloidal_segment.py
diff --git a/...etric_components/capsule_vacuum_vessel.py → ...etric_components/capsule_vacuum_vessel.py b/...etric_components/capsule_vacuum_vessel.py → ...etric_components/capsule_vacuum_vessel.py
diff --git a/...tric_components/center_column_circular.py → ...tric_components/center_column_circular.py b/...tric_components/center_column_circular.py → ...tric_components/center_column_circular.py
diff --git a/...tric_components/center_column_cylinder.py → ...tric_components/center_column_cylinder.py b/...tric_components/center_column_cylinder.py → ...tric_components/center_column_cylinder.py
diff --git a/...onents/center_column_flat_top_circular.py → ...onents/center_column_flat_top_circular.py b/...onents/center_column_flat_top_circular.py → ...onents/center_column_flat_top_circular.py
diff --git a/...nents/center_column_flat_top_hyperbola.py → ...nents/center_column_flat_top_hyperbola.py b/...nents/center_column_flat_top_hyperbola.py → ...nents/center_column_flat_top_hyperbola.py
diff --git a/...ric_components/center_column_hyperbola.py → ...ric_components/center_column_hyperbola.py b/...ric_components/center_column_hyperbola.py → ...ric_components/center_column_hyperbola.py
diff --git a/...ponents/center_column_plasma_dependant.py → ...ponents/center_column_plasma_dependant.py b/...ponents/center_column_plasma_dependant.py → ...ponents/center_column_plasma_dependant.py
diff --git a/...ak/parametric_components/circular_port.py → ...ak/parametric_components/circular_port.py b/...ak/parametric_components/circular_port.py → ...ak/parametric_components/circular_port.py
diff --git a/...ric_components/constant_thickness_dome.py → ...ric_components/constant_thickness_dome.py b/...ric_components/constant_thickness_dome.py → ...ric_components/constant_thickness_dome.py
diff --git a/...components/coolant_channel_ring_curved.py → ...components/coolant_channel_ring_curved.py b/...components/coolant_channel_ring_curved.py → ...components/coolant_channel_ring_curved.py
diff --git a/...mponents/coolant_channel_ring_straight.py → ...mponents/coolant_channel_ring_straight.py b/...mponents/coolant_channel_ring_straight.py → ...mponents/coolant_channel_ring_straight.py
diff --git a/...ak/parametric_components/cutting_wedge.py → ...ak/parametric_components/cutting_wedge.py b/...ak/parametric_components/cutting_wedge.py → ...ak/parametric_components/cutting_wedge.py
diff --git a/...parametric_components/cutting_wedge_fs.py → ...parametric_components/cutting_wedge_fs.py b/...parametric_components/cutting_wedge_fs.py → ...parametric_components/cutting_wedge_fs.py
diff --git a/...metric_components/dished_vacuum_vessel.py → ...metric_components/dished_vacuum_vessel.py b/...metric_components/dished_vacuum_vessel.py → ...metric_components/dished_vacuum_vessel.py
diff --git a/...ak/parametric_components/divertor_ITER.py → ...ak/parametric_components/divertor_ITER.py b/...ak/parametric_components/divertor_ITER.py → ...ak/parametric_components/divertor_ITER.py
diff --git a/...etric_components/divertor_ITER_no_dome.py → ...etric_components/divertor_ITER_no_dome.py b/...etric_components/divertor_ITER_no_dome.py → ...etric_components/divertor_ITER_no_dome.py
diff --git a/...ic_components/extrude_hollow_rectangle.py → ...ic_components/extrude_hollow_rectangle.py b/...ic_components/extrude_hollow_rectangle.py → ...ic_components/extrude_hollow_rectangle.py
diff --git a/...arametric_components/extrude_rectangle.py → ...arametric_components/extrude_rectangle.py b/...arametric_components/extrude_rectangle.py → ...arametric_components/extrude_rectangle.py
diff --git a/paramak/parametric_components/hexagon_pin.py → ...amak/parametric_components/hexagon_pin.py b/paramak/parametric_components/hexagon_pin.py → ...amak/parametric_components/hexagon_pin.py
diff --git a/paramak/parametric_components/hollow_cube.py → ...amak/parametric_components/hollow_cube.py b/paramak/parametric_components/hollow_cube.py → ...amak/parametric_components/hollow_cube.py
diff --git a/...tric_components/inboard_firstwall_fccs.py → ...tric_components/inboard_firstwall_fccs.py b/...tric_components/inboard_firstwall_fccs.py → ...tric_components/inboard_firstwall_fccs.py
diff --git a/...ric_components/inner_tf_coils_circular.py → ...ric_components/inner_tf_coils_circular.py b/...ric_components/inner_tf_coils_circular.py → ...ric_components/inner_tf_coils_circular.py
diff --git a/...ametric_components/inner_tf_coils_flat.py → ...ametric_components/inner_tf_coils_flat.py b/...ametric_components/inner_tf_coils_flat.py → ...ametric_components/inner_tf_coils_flat.py
diff --git a/...ametric_components/poloidal_field_coil.py → ...ametric_components/poloidal_field_coil.py b/...ametric_components/poloidal_field_coil.py → ...ametric_components/poloidal_field_coil.py
diff --git a/...ic_components/poloidal_field_coil_case.py → ...ic_components/poloidal_field_coil_case.py b/...ic_components/poloidal_field_coil_case.py → ...ic_components/poloidal_field_coil_case.py
diff --git a/...components/poloidal_field_coil_case_fc.py → ...components/poloidal_field_coil_case_fc.py b/...components/poloidal_field_coil_case_fc.py → ...components/poloidal_field_coil_case_fc.py
diff --git a/...omponents/poloidal_field_coil_case_set.py → ...omponents/poloidal_field_coil_case_set.py b/...omponents/poloidal_field_coil_case_set.py → ...omponents/poloidal_field_coil_case_set.py
diff --git a/...onents/poloidal_field_coil_case_set_fc.py → ...onents/poloidal_field_coil_case_set_fc.py b/...onents/poloidal_field_coil_case_set_fc.py → ...onents/poloidal_field_coil_case_set_fc.py
diff --git a/...tric_components/poloidal_field_coil_fp.py → ...tric_components/poloidal_field_coil_fp.py b/...tric_components/poloidal_field_coil_fp.py → ...tric_components/poloidal_field_coil_fp.py
diff --git a/...ric_components/poloidal_field_coil_set.py → ...ric_components/poloidal_field_coil_set.py b/...ric_components/poloidal_field_coil_set.py → ...ric_components/poloidal_field_coil_set.py
diff --git a/...rametric_components/poloidal_segmenter.py → ...rametric_components/poloidal_segmenter.py b/...rametric_components/poloidal_segmenter.py → ...rametric_components/poloidal_segmenter.py
diff --git a/...etric_components/port_cutters_circular.py → ...etric_components/port_cutters_circular.py b/...etric_components/port_cutters_circular.py → ...etric_components/port_cutters_circular.py
diff --git a/...ic_components/port_cutters_rectangular.py → ...ic_components/port_cutters_rectangular.py b/...ic_components/port_cutters_rectangular.py → ...ic_components/port_cutters_rectangular.py
diff --git a/...metric_components/port_cutters_rotated.py → ...metric_components/port_cutters_rotated.py b/...metric_components/port_cutters_rotated.py → ...metric_components/port_cutters_rotated.py
diff --git a/..._components/rotated_isosceles_triangle.py → ..._components/rotated_isosceles_triangle.py b/..._components/rotated_isosceles_triangle.py → ..._components/rotated_isosceles_triangle.py
diff --git a/...arametric_components/rotated_trapezoid.py → ...arametric_components/rotated_trapezoid.py b/...arametric_components/rotated_trapezoid.py → ...arametric_components/rotated_trapezoid.py
diff --git a/paramak/parametric_components/shell_fs.py → ...paramak/parametric_components/shell_fs.py b/paramak/parametric_components/shell_fs.py → ...paramak/parametric_components/shell_fs.py
diff --git a/...k/parametric_components/tf_coil_casing.py → ...k/parametric_components/tf_coil_casing.py b/...k/parametric_components/tf_coil_casing.py → ...k/parametric_components/tf_coil_casing.py
diff --git a/...k/parametric_components/tokamak_plasma.py → ...k/parametric_components/tokamak_plasma.py b/...k/parametric_components/tokamak_plasma.py → ...k/parametric_components/tokamak_plasma.py
diff --git a/..._components/tokamak_plasma_from_points.py → ..._components/tokamak_plasma_from_points.py b/..._components/tokamak_plasma_from_points.py → ..._components/tokamak_plasma_from_points.py
diff --git a/...onents/tokamak_plasma_plasmaboundaries.py → ...onents/tokamak_plasma_plasmaboundaries.py b/...onents/tokamak_plasma_plasmaboundaries.py → ...onents/tokamak_plasma_plasmaboundaries.py
diff --git a/...ametric_components/toroidal_field_coil.py → ...ametric_components/toroidal_field_coil.py b/...ametric_components/toroidal_field_coil.py → ...ametric_components/toroidal_field_coil.py
diff --git a/...onents/toroidal_field_coil_coat_hanger.py → ...onents/toroidal_field_coil_coat_hanger.py b/...onents/toroidal_field_coil_coat_hanger.py → ...onents/toroidal_field_coil_coat_hanger.py
diff --git a/...onents/toroidal_field_coil_princeton_d.py → ...onents/toroidal_field_coil_princeton_d.py b/...onents/toroidal_field_coil_princeton_d.py → ...onents/toroidal_field_coil_princeton_d.py
diff --git a/...mponents/toroidal_field_coil_rectangle.py → ...mponents/toroidal_field_coil_rectangle.py b/...mponents/toroidal_field_coil_rectangle.py → ...mponents/toroidal_field_coil_rectangle.py
diff --git a/...ents/toroidal_field_coil_round_corners.py → ...ents/toroidal_field_coil_round_corners.py b/...ents/toroidal_field_coil_round_corners.py → ...ents/toroidal_field_coil_round_corners.py
diff --git a/...ponents/toroidal_field_coil_triple_arc.py → ...ponents/toroidal_field_coil_triple_arc.py b/...ponents/toroidal_field_coil_triple_arc.py → ...ponents/toroidal_field_coil_triple_arc.py
diff --git a/...ak/parametric_components/vacuum_vessel.py → ...ak/parametric_components/vacuum_vessel.py b/...ak/parametric_components/vacuum_vessel.py → ...ak/parametric_components/vacuum_vessel.py
diff --git a/...ric_components/vacuum_vessel_inner_leg.py → ...ric_components/vacuum_vessel_inner_leg.py b/...ric_components/vacuum_vessel_inner_leg.py → ...ric_components/vacuum_vessel_inner_leg.py
diff --git a/paramak/parametric_reactors/__init__.py → src/paramak/parametric_reactors/__init__.py b/paramak/parametric_reactors/__init__.py → src/paramak/parametric_reactors/__init__.py
diff --git a/paramak/parametric_reactors/ball_reactor.py → ...ramak/parametric_reactors/ball_reactor.py b/paramak/parametric_reactors/ball_reactor.py → ...ramak/parametric_reactors/ball_reactor.py
diff --git a/...c_reactors/center_column_study_reactor.py → ...c_reactors/center_column_study_reactor.py b/...c_reactors/center_column_study_reactor.py → ...c_reactors/center_column_study_reactor.py
diff --git a/...rametric_reactors/eu_demo_2015_reactor.py → ...rametric_reactors/eu_demo_2015_reactor.py b/...rametric_reactors/eu_demo_2015_reactor.py → ...rametric_reactors/eu_demo_2015_reactor.py
diff --git a/...etric_reactors/flf_system_code_reactor.py → ...etric_reactors/flf_system_code_reactor.py b/...etric_reactors/flf_system_code_reactor.py → ...etric_reactors/flf_system_code_reactor.py
diff --git a/...ak/parametric_reactors/iter_paper_2020.py → ...ak/parametric_reactors/iter_paper_2020.py b/...ak/parametric_reactors/iter_paper_2020.py → ...ak/parametric_reactors/iter_paper_2020.py
diff --git a/...eactors/negative_triangularity_reactor.py → ...eactors/negative_triangularity_reactor.py b/...eactors/negative_triangularity_reactor.py → ...eactors/negative_triangularity_reactor.py
diff --git a/...eactors/segmented_blanket_ball_reactor.py → ...eactors/segmented_blanket_ball_reactor.py b/...eactors/segmented_blanket_ball_reactor.py → ...eactors/segmented_blanket_ball_reactor.py
diff --git a/...tric_reactors/single_null_ball_reactor.py → ...tric_reactors/single_null_ball_reactor.py b/...tric_reactors/single_null_ball_reactor.py → ...tric_reactors/single_null_ball_reactor.py
diff --git a/...eactors/single_null_submersion_reactor.py → ...eactors/single_null_submersion_reactor.py b/...eactors/single_null_submersion_reactor.py → ...eactors/single_null_submersion_reactor.py
diff --git a/...k/parametric_reactors/sparc_paper_2020.py → ...k/parametric_reactors/sparc_paper_2020.py b/...k/parametric_reactors/sparc_paper_2020.py → ...k/parametric_reactors/sparc_paper_2020.py
diff --git a/...parametric_reactors/submersion_reactor.py → ...parametric_reactors/submersion_reactor.py b/...parametric_reactors/submersion_reactor.py → ...parametric_reactors/submersion_reactor.py
diff --git a/paramak/parametric_shapes/__init__.py → src/paramak/parametric_shapes/__init__.py b/paramak/parametric_shapes/__init__.py → src/paramak/parametric_shapes/__init__.py
diff --git a/...arametric_shapes/extruded_circle_shape.py → ...arametric_shapes/extruded_circle_shape.py b/...arametric_shapes/extruded_circle_shape.py → ...arametric_shapes/extruded_circle_shape.py
diff --git a/...parametric_shapes/extruded_mixed_shape.py → ...parametric_shapes/extruded_mixed_shape.py b/...parametric_shapes/extruded_mixed_shape.py → ...parametric_shapes/extruded_mixed_shape.py
diff --git a/...arametric_shapes/extruded_spline_shape.py → ...arametric_shapes/extruded_spline_shape.py b/...arametric_shapes/extruded_spline_shape.py → ...arametric_shapes/extruded_spline_shape.py
diff --git a/...ametric_shapes/extruded_straight_shape.py → ...ametric_shapes/extruded_straight_shape.py b/...ametric_shapes/extruded_straight_shape.py → ...ametric_shapes/extruded_straight_shape.py
diff --git a/.../parametric_shapes/rotate_circle_shape.py → .../parametric_shapes/rotate_circle_shape.py b/.../parametric_shapes/rotate_circle_shape.py → .../parametric_shapes/rotate_circle_shape.py
diff --git a/...k/parametric_shapes/rotate_mixed_shape.py → ...k/parametric_shapes/rotate_mixed_shape.py b/...k/parametric_shapes/rotate_mixed_shape.py → ...k/parametric_shapes/rotate_mixed_shape.py
diff --git a/.../parametric_shapes/rotate_spline_shape.py → .../parametric_shapes/rotate_spline_shape.py b/.../parametric_shapes/rotate_spline_shape.py → .../parametric_shapes/rotate_spline_shape.py
diff --git a/...arametric_shapes/rotate_straight_shape.py → ...arametric_shapes/rotate_straight_shape.py b/...arametric_shapes/rotate_straight_shape.py → ...arametric_shapes/rotate_straight_shape.py
diff --git a/...k/parametric_shapes/sweep_circle_shape.py → ...k/parametric_shapes/sweep_circle_shape.py b/...k/parametric_shapes/sweep_circle_shape.py → ...k/parametric_shapes/sweep_circle_shape.py
diff --git a/...ak/parametric_shapes/sweep_mixed_shape.py → ...ak/parametric_shapes/sweep_mixed_shape.py b/...ak/parametric_shapes/sweep_mixed_shape.py → ...ak/parametric_shapes/sweep_mixed_shape.py
diff --git a/...k/parametric_shapes/sweep_spline_shape.py → ...k/parametric_shapes/sweep_spline_shape.py b/...k/parametric_shapes/sweep_spline_shape.py → ...k/parametric_shapes/sweep_spline_shape.py
diff --git a/...parametric_shapes/sweep_straight_shape.py → ...parametric_shapes/sweep_straight_shape.py b/...parametric_shapes/sweep_straight_shape.py → ...parametric_shapes/sweep_straight_shape.py
diff --git a/paramak/reactor.py → src/paramak/reactor.py b/paramak/reactor.py → src/paramak/reactor.py
diff --git a/paramak/shape.py → src/paramak/shape.py b/paramak/shape.py → src/paramak/shape.py
diff --git a/paramak/utils.py → src/paramak/utils.py b/paramak/utils.py → src/paramak/utils.py
diff --git a/tests/__init__.py b/tests/__init__.py