moved to src layout

fusion-energy · Jan 17, 2024 · cc4877d · cc4877d
1 parent d10f0c2
commit cc4877d
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 75 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,12 +2,8 @@ name: CI
 
 on:
   pull_request:    
-    branches:
-    - develop
-    - main
   push:
     branches:
-    - develop
     - main
 
 jobs:

diff --git a/CITATION.cff b/CITATION.cff
@@ -14,6 +14,6 @@ authors:
 - family-names: "Faisal"
   given-names: "Mohammed"
 title: "OpenMC Plasma Source"
-version: 0.2.4
-date-released: 2022-01-31
+version: 0.3.0
+date-released: 2023-01-12
 url: "https://github.com/fusion-energy/openmc-plasma-source"
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,11 +1,42 @@
 [build-system]
 requires = [
-    "setuptools >= 45",
-    "wheel",
-    "setuptools_scm[toml] >= 6.2",
-    "setuptools_scm_git_archive",
+    "setuptools>=65.5.0",
+    "setuptools_scm[toml]>=7.0.5"
 ]
 build-backend = "setuptools.build_meta"
 
+[project]
+name = "openmc_plasma_source"
+dynamic = ["version"]
+description = "Creates tokamak and ICF plasma sources for OpenMC"
+readme = "README.md"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+]
+authors = [
+  { name="Rémi Delaporte-Mathurin" },
+]
+requires-python = ">=3.8"
+keywords = ["python", "neutron", "fusion", "source", "openmc", "energy", "tokamak"]
+dependencies = [
+    "numpy>=1.9",
+    "matplotlib>=3.2.2",
+]
+
+[project.urls]
+"Homepage" = "https://github.com/fusion-energy/openmc-plasma-source"
+"Bug Tracker" = "https://github.com/fusion-energy/openmc-plasma-source/issues"
+
 [tool.setuptools_scm]
-write_to = "openmc_plasma_source/_version.py"
+write_to = "src/_version.py"
+
+[project.optional-dependencies]
+tests = [
+    "pytest>=5.4.3",
+    "hypothesis"
+]
+
+[tool.setuptools]
+package-dir = {"" = "src"}
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/openmc_plasma_source/__init__.py → src/openmc_plasma_source/__init__.py b/openmc_plasma_source/__init__.py → src/openmc_plasma_source/__init__.py
diff --git a/openmc_plasma_source/fuel_types.py → src/openmc_plasma_source/fuel_types.py b/openmc_plasma_source/fuel_types.py → src/openmc_plasma_source/fuel_types.py
diff --git a/openmc_plasma_source/plotting/__init__.py → ...openmc_plasma_source/plotting/__init__.py b/openmc_plasma_source/plotting/__init__.py → ...openmc_plasma_source/plotting/__init__.py
diff --git a/...ma_source/plotting/plot_tokamak_source.py → ...ma_source/plotting/plot_tokamak_source.py b/...ma_source/plotting/plot_tokamak_source.py → ...ma_source/plotting/plot_tokamak_source.py
diff --git a/openmc_plasma_source/point_source.py → src/openmc_plasma_source/point_source.py b/openmc_plasma_source/point_source.py → src/openmc_plasma_source/point_source.py
diff --git a/openmc_plasma_source/ring_source.py → src/openmc_plasma_source/ring_source.py b/openmc_plasma_source/ring_source.py → src/openmc_plasma_source/ring_source.py
diff --git a/openmc_plasma_source/tokamak_source.py → src/openmc_plasma_source/tokamak_source.py b/openmc_plasma_source/tokamak_source.py → src/openmc_plasma_source/tokamak_source.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,12 +2,8 @@ name: CI @@
     on:
       pull_request:
-        branches:
-        - develop
-        - main
       push:
         branches:
-        - develop
         - main
     jobs:
@@ Expand Down @@