Merge pull request #1 from olafmersmann/main

Cleanup project structure

Author: bartzbeielstein

.github/workflows/test.yml

@@ -0,0 +1,23 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        version: ["3.10", "3.11"]
+    runs-on: ${{matrix.os}}
+    defaults:
+      run:
+        working-directory: ${{github.workspace}}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-python@v4
+      with:
+        python-version: ${{matrix.version}}
+    - run: python -m pip install --upgrade pip build pytest
+    - run: python -m build .
+    - run: python -m pip install .
+    - run: pytest test/

.gitignore

@@ -1,20 +1,6 @@
-
+*.egg-info/
 .DS_Store
-test/__pycache__/test_aggregate_mean_var.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_build_Psi.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_build_psi_vec.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_build_U.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_evaluate_new_solutions.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_evaluate_new_X.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_extract_from_bounds.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_generate_design.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_infill.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_nat_to_cod.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_nat_to_cod_init.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_ocba.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_repair_non_numeric.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_set_de_bounds.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_show_progress.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_suggest_new_X.cpython-310-pytest-7.1.3.pyc
-test/__pycache__/test_update_surrogate.cpython-310-pytest-7.1.3.pyc
+__pycache__/
 spotPython.code-workspace
+src/spotPython/_version.py
+*.log

MANIFEST.in

@@ -1,15 +1,12 @@
 [build-system]
-requires = ["scipy",
-            "setuptools>=61.0",
-            "graphviz",
-            "numpy",
-            "scikit-learn",
-            "matplotlib"]
+requires = [
+  "setuptools>=61.0",
+  "setuptools_scm[toml]"
+]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "spotPython"
-version = "0.0.2"
 authors = [
   { name="T. Bartz-Beielstein", email="tbb@bartzundbartz.de" }
 ]
@@ -26,16 +23,20 @@ classifiers = [
 # PEP 621 dependencies declaration
 # adapt to your dependencies manager
 dependencies = [
-  "mkdocstrings-python"
+  "matplotlib",
+  "numpy",
+  "pandas",
+  "scikit-learn",
+  "scipy",
 ]
+dynamic = ["version"]
 
 [project.urls]
 "Homepage" = "https://www.spotseven.de"
+Issues = "https://github.com/sequential-parameter-optimization/spotPython/issues"
+Repository = "https://github.com/sequential-parameter-optimization/spotPython"
 
 [tool.setuptools]
-# ...
-# By default, include-package-data is true in pyproject.toml, so you do
-# NOT have to specify this line.
 include-package-data = true
 
 [tool.setuptools.packages.find]
@@ -45,3 +46,11 @@ where = ["src"]
 line-length = 120
 target-version = ["py310"]
 
+[tool.setuptools_scm]
+write_to = "src/spotPython/_version.py"
+
+[tool.pytest.ini_options]
+addopts = [
+    "--import-mode=importlib",
+]
+