move to a src layout.

CEA-COSMIC · Feb 16, 2024 · 877f568 · 877f568
1 parent 476178f
commit 877f568
Show file tree

Hide file tree

Showing 51 changed files with 3 additions and 8 deletions.
diff --git a/modopt/examples/README.rst → examples/README.rst b/modopt/examples/README.rst → examples/README.rst
diff --git a/modopt/examples/__init__.py → examples/__init__.py b/modopt/examples/__init__.py → examples/__init__.py
diff --git a/modopt/examples/conftest.py → examples/conftest.py b/modopt/examples/conftest.py → examples/conftest.py
diff --git a/...xamples/example_lasso_forward_backward.py → examples/example_lasso_forward_backward.py b/...xamples/example_lasso_forward_backward.py → examples/example_lasso_forward_backward.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,9 +26,6 @@ dev=["black", "pytest<8.0.0", "pytest-cases", "pytest-cov", "pytest-sugar", "ruf
 [build-system]
 requires=["setuptools", "setuptools-scm[toml]", "wheel"]
 
-[tool.setuptools]
-packages=["modopt"]
-
 [tool.coverage.run]
 omit = ["*tests*", "*__init__*", "*setup.py*", "*_version.py*", "*example*"]
 
@@ -38,19 +35,17 @@ exclude_lines = ["pragma: no cover", "raise NotImplementedError"]
 
 [tool.black]
 
-[tool.ruff]
-
-src=["modopt"]
+[lint]
 select = ["E", "F", "B", "Q", "UP", "D", "NPY", "RUF"]
 
-[tool.ruff.pydocstyle]
+[lint.pydocstyle]
 convention="numpy"
 
 [tool.isort]
 profile="black"
 
 [tool.pytest.ini_options]
 minversion = "6.0"
-norecursedirs = ["tests/helpers"]
+norecursedirs = ["tests/test_helpers"]
 testpaths=["modopt"]
 addopts = ["--verbose", "--cov=modopt", "--cov-report=term-missing", "--cov-report=xml", "--junitxml=pytest.xml"]
diff --git a/modopt/__init__.py → src/modopt/__init__.py b/modopt/__init__.py → src/modopt/__init__.py
diff --git a/modopt/base/__init__.py → src/modopt/base/__init__.py b/modopt/base/__init__.py → src/modopt/base/__init__.py
diff --git a/modopt/base/backend.py → src/modopt/base/backend.py b/modopt/base/backend.py → src/modopt/base/backend.py
diff --git a/modopt/base/np_adjust.py → src/modopt/base/np_adjust.py b/modopt/base/np_adjust.py → src/modopt/base/np_adjust.py
diff --git a/modopt/base/observable.py → src/modopt/base/observable.py b/modopt/base/observable.py → src/modopt/base/observable.py
diff --git a/modopt/base/transform.py → src/modopt/base/transform.py b/modopt/base/transform.py → src/modopt/base/transform.py
diff --git a/modopt/base/types.py → src/modopt/base/types.py b/modopt/base/types.py → src/modopt/base/types.py
diff --git a/modopt/base/wrappers.py → src/modopt/base/wrappers.py b/modopt/base/wrappers.py → src/modopt/base/wrappers.py
diff --git a/modopt/interface/__init__.py → src/modopt/interface/__init__.py b/modopt/interface/__init__.py → src/modopt/interface/__init__.py
diff --git a/modopt/interface/errors.py → src/modopt/interface/errors.py b/modopt/interface/errors.py → src/modopt/interface/errors.py
diff --git a/modopt/interface/log.py → src/modopt/interface/log.py b/modopt/interface/log.py → src/modopt/interface/log.py
diff --git a/modopt/math/__init__.py → src/modopt/math/__init__.py b/modopt/math/__init__.py → src/modopt/math/__init__.py
diff --git a/modopt/math/convolve.py → src/modopt/math/convolve.py b/modopt/math/convolve.py → src/modopt/math/convolve.py
diff --git a/modopt/math/matrix.py → src/modopt/math/matrix.py b/modopt/math/matrix.py → src/modopt/math/matrix.py
diff --git a/modopt/math/metrics.py → src/modopt/math/metrics.py b/modopt/math/metrics.py → src/modopt/math/metrics.py
diff --git a/modopt/math/stats.py → src/modopt/math/stats.py b/modopt/math/stats.py → src/modopt/math/stats.py
diff --git a/modopt/opt/__init__.py → src/modopt/opt/__init__.py b/modopt/opt/__init__.py → src/modopt/opt/__init__.py
diff --git a/modopt/opt/algorithms/__init__.py → src/modopt/opt/algorithms/__init__.py b/modopt/opt/algorithms/__init__.py → src/modopt/opt/algorithms/__init__.py
diff --git a/modopt/opt/algorithms/admm.py → src/modopt/opt/algorithms/admm.py b/modopt/opt/algorithms/admm.py → src/modopt/opt/algorithms/admm.py
diff --git a/modopt/opt/algorithms/base.py → src/modopt/opt/algorithms/base.py b/modopt/opt/algorithms/base.py → src/modopt/opt/algorithms/base.py
diff --git a/modopt/opt/algorithms/forward_backward.py → ...modopt/opt/algorithms/forward_backward.py b/modopt/opt/algorithms/forward_backward.py → ...modopt/opt/algorithms/forward_backward.py
diff --git a/modopt/opt/algorithms/gradient_descent.py → ...modopt/opt/algorithms/gradient_descent.py b/modopt/opt/algorithms/gradient_descent.py → ...modopt/opt/algorithms/gradient_descent.py
diff --git a/modopt/opt/algorithms/primal_dual.py → src/modopt/opt/algorithms/primal_dual.py b/modopt/opt/algorithms/primal_dual.py → src/modopt/opt/algorithms/primal_dual.py
diff --git a/modopt/opt/cost.py → src/modopt/opt/cost.py b/modopt/opt/cost.py → src/modopt/opt/cost.py
diff --git a/modopt/opt/gradient.py → src/modopt/opt/gradient.py b/modopt/opt/gradient.py → src/modopt/opt/gradient.py
diff --git a/modopt/opt/linear/__init__.py → src/modopt/opt/linear/__init__.py b/modopt/opt/linear/__init__.py → src/modopt/opt/linear/__init__.py
diff --git a/modopt/opt/linear/base.py → src/modopt/opt/linear/base.py b/modopt/opt/linear/base.py → src/modopt/opt/linear/base.py
diff --git a/modopt/opt/linear/wavelet.py → src/modopt/opt/linear/wavelet.py b/modopt/opt/linear/wavelet.py → src/modopt/opt/linear/wavelet.py
diff --git a/modopt/opt/proximity.py → src/modopt/opt/proximity.py b/modopt/opt/proximity.py → src/modopt/opt/proximity.py
diff --git a/modopt/opt/reweight.py → src/modopt/opt/reweight.py b/modopt/opt/reweight.py → src/modopt/opt/reweight.py
diff --git a/modopt/plot/__init__.py → src/modopt/plot/__init__.py b/modopt/plot/__init__.py → src/modopt/plot/__init__.py
diff --git a/modopt/plot/cost_plot.py → src/modopt/plot/cost_plot.py b/modopt/plot/cost_plot.py → src/modopt/plot/cost_plot.py
diff --git a/modopt/signal/__init__.py → src/modopt/signal/__init__.py b/modopt/signal/__init__.py → src/modopt/signal/__init__.py
diff --git a/modopt/signal/filter.py → src/modopt/signal/filter.py b/modopt/signal/filter.py → src/modopt/signal/filter.py
diff --git a/modopt/signal/noise.py → src/modopt/signal/noise.py b/modopt/signal/noise.py → src/modopt/signal/noise.py
diff --git a/modopt/signal/positivity.py → src/modopt/signal/positivity.py b/modopt/signal/positivity.py → src/modopt/signal/positivity.py
diff --git a/modopt/signal/svd.py → src/modopt/signal/svd.py b/modopt/signal/svd.py → src/modopt/signal/svd.py
diff --git a/modopt/signal/validation.py → src/modopt/signal/validation.py b/modopt/signal/validation.py → src/modopt/signal/validation.py
diff --git a/modopt/signal/wavelet.py → src/modopt/signal/wavelet.py b/modopt/signal/wavelet.py → src/modopt/signal/wavelet.py
diff --git a/modopt/tests/test_algorithms.py → tests/test_algorithms.py b/modopt/tests/test_algorithms.py → tests/test_algorithms.py
diff --git a/modopt/tests/test_base.py → tests/test_base.py b/modopt/tests/test_base.py → tests/test_base.py
diff --git a/modopt/tests/test_helpers/__init__.py → tests/test_helpers/__init__.py b/modopt/tests/test_helpers/__init__.py → tests/test_helpers/__init__.py
diff --git a/modopt/tests/test_helpers/utils.py → tests/test_helpers/utils.py b/modopt/tests/test_helpers/utils.py → tests/test_helpers/utils.py
diff --git a/modopt/tests/test_math.py → tests/test_math.py b/modopt/tests/test_math.py → tests/test_math.py
diff --git a/modopt/tests/test_opt.py → tests/test_opt.py b/modopt/tests/test_opt.py → tests/test_opt.py
diff --git a/modopt/tests/test_signal.py → tests/test_signal.py b/modopt/tests/test_signal.py → tests/test_signal.py