From b322cbefd8c8bb160d733f43dbbc5f3fce9e1af3 Mon Sep 17 00:00:00 2001 From: Jonas Lindemann Date: Thu, 15 Feb 2024 23:20:49 +0100 Subject: [PATCH] Reorganise for PDM-package manager. --- .gitignore | 1 + .pdm-python | 2 +- pyproject.toml | 14 ++++++++++---- {calfem => src/calfem}/__init__.py | 0 {calfem => src/calfem}/_export.py | 0 {calfem => src/calfem}/classes_qt4.py | 0 {calfem => src/calfem}/classes_wx.py | 0 {calfem => src/calfem}/core.py | 0 {calfem => src/calfem}/core_compat.py | 0 {calfem => src/calfem}/editor.py | 0 {calfem => src/calfem}/editor.ui | 0 {calfem => src/calfem}/editor_resources.py | 0 {calfem => src/calfem}/editor_scene.py | 0 {calfem => src/calfem}/editor_ui.py | 0 {calfem => src/calfem}/experimental.py | 0 {calfem => src/calfem}/geometry.py | 0 {calfem => src/calfem}/intvis.py | 0 {calfem => src/calfem}/mesh.py | 0 {calfem => src/calfem}/misc.py | 0 {calfem => src/calfem}/qt5.py | 0 {calfem => src/calfem}/shapes.py | 0 {calfem => src/calfem}/solver.py | 0 {calfem => src/calfem}/ui.py | 0 {calfem => src/calfem}/utils.py | 0 {calfem => src/calfem}/vedo_utils.py | 0 {calfem => src/calfem}/vis.py | 0 {calfem => src/calfem}/vis_mpl.py | 0 {calfem => src/calfem}/vis_vedo.py | 0 {calfem => src/calfem}/vis_vedo_utils.py | 0 {calfem => src/calfem}/vis_vtk.py | 0 src/calfem_python/__init__.py | 0 31 files changed, 12 insertions(+), 5 deletions(-) rename {calfem => src/calfem}/__init__.py (100%) rename {calfem => src/calfem}/_export.py (100%) rename {calfem => src/calfem}/classes_qt4.py (100%) rename {calfem => src/calfem}/classes_wx.py (100%) rename {calfem => src/calfem}/core.py (100%) rename {calfem => src/calfem}/core_compat.py (100%) rename {calfem => src/calfem}/editor.py (100%) rename {calfem => src/calfem}/editor.ui (100%) rename {calfem => src/calfem}/editor_resources.py (100%) rename {calfem => src/calfem}/editor_scene.py (100%) rename {calfem => src/calfem}/editor_ui.py (100%) rename {calfem => src/calfem}/experimental.py (100%) rename {calfem => src/calfem}/geometry.py (100%) rename {calfem => src/calfem}/intvis.py (100%) rename {calfem => src/calfem}/mesh.py (100%) rename {calfem => src/calfem}/misc.py (100%) rename {calfem => src/calfem}/qt5.py (100%) rename {calfem => src/calfem}/shapes.py (100%) rename {calfem => src/calfem}/solver.py (100%) rename {calfem => src/calfem}/ui.py (100%) rename {calfem => src/calfem}/utils.py (100%) rename {calfem => src/calfem}/vedo_utils.py (100%) rename {calfem => src/calfem}/vis.py (100%) rename {calfem => src/calfem}/vis_mpl.py (100%) rename {calfem => src/calfem}/vis_vedo.py (100%) rename {calfem => src/calfem}/vis_vedo_utils.py (100%) rename {calfem => src/calfem}/vis_vtk.py (100%) delete mode 100644 src/calfem_python/__init__.py diff --git a/.gitignore b/.gitignore index 3b03993..4e56def 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ docs/source/examples/.ipynb_checkpoints/ *.log *.log *.log +.pdm-python diff --git a/.pdm-python b/.pdm-python index 34eb7c6..f8efda1 100644 --- a/.pdm-python +++ b/.pdm-python @@ -1 +1 @@ -C:/Users/Miniconda3/envs/calfem-clean/python.EXE \ No newline at end of file +C:/Users/jonas/miniconda3/envs/calfem-dev/python.EXE \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 03e2f0c..d01264a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [project] name = "calfem-python" -version = "3.6.7" +version = "3.6.8" description = "CALFEM for Python" authors = [ {name = "Jonas Lindemann", email = "jonas.lindemann@lunarc.lu.se"}, - {name = "Jonas Lindemann", email = "jonas.lindemann@gmail.com"} + {name = "Jonas Lindemann", email = "jonas.lindemann@gmail.com"}, ] dependencies = [ "gmsh", @@ -16,12 +16,16 @@ dependencies = [ "vedo", "pyvtk", "qtpy", - "tabulate" + "tabulate", ] requires-python = ">=3.8" readme = "README.md" license = {text = "MIT"} -keywords = ["finite element", "math", "numerics"] +keywords = [ + "finite element", + "math", + "numerics", +] classifiers = [ "Development Status :: 4 - Beta", "Intended Audience :: Developers", @@ -42,3 +46,5 @@ Homepage = "https://github.com/CALFEM/calfem-python" requires = ["pdm-backend"] build-backend = "pdm.backend" +[tool.pdm] +distribution = true diff --git a/calfem/__init__.py b/src/calfem/__init__.py similarity index 100% rename from calfem/__init__.py rename to src/calfem/__init__.py diff --git a/calfem/_export.py b/src/calfem/_export.py similarity index 100% rename from calfem/_export.py rename to src/calfem/_export.py diff --git a/calfem/classes_qt4.py b/src/calfem/classes_qt4.py similarity index 100% rename from calfem/classes_qt4.py rename to src/calfem/classes_qt4.py diff --git a/calfem/classes_wx.py b/src/calfem/classes_wx.py similarity index 100% rename from calfem/classes_wx.py rename to src/calfem/classes_wx.py diff --git a/calfem/core.py b/src/calfem/core.py similarity index 100% rename from calfem/core.py rename to src/calfem/core.py diff --git a/calfem/core_compat.py b/src/calfem/core_compat.py similarity index 100% rename from calfem/core_compat.py rename to src/calfem/core_compat.py diff --git a/calfem/editor.py b/src/calfem/editor.py similarity index 100% rename from calfem/editor.py rename to src/calfem/editor.py diff --git a/calfem/editor.ui b/src/calfem/editor.ui similarity index 100% rename from calfem/editor.ui rename to src/calfem/editor.ui diff --git a/calfem/editor_resources.py b/src/calfem/editor_resources.py similarity index 100% rename from calfem/editor_resources.py rename to src/calfem/editor_resources.py diff --git a/calfem/editor_scene.py b/src/calfem/editor_scene.py similarity index 100% rename from calfem/editor_scene.py rename to src/calfem/editor_scene.py diff --git a/calfem/editor_ui.py b/src/calfem/editor_ui.py similarity index 100% rename from calfem/editor_ui.py rename to src/calfem/editor_ui.py diff --git a/calfem/experimental.py b/src/calfem/experimental.py similarity index 100% rename from calfem/experimental.py rename to src/calfem/experimental.py diff --git a/calfem/geometry.py b/src/calfem/geometry.py similarity index 100% rename from calfem/geometry.py rename to src/calfem/geometry.py diff --git a/calfem/intvis.py b/src/calfem/intvis.py similarity index 100% rename from calfem/intvis.py rename to src/calfem/intvis.py diff --git a/calfem/mesh.py b/src/calfem/mesh.py similarity index 100% rename from calfem/mesh.py rename to src/calfem/mesh.py diff --git a/calfem/misc.py b/src/calfem/misc.py similarity index 100% rename from calfem/misc.py rename to src/calfem/misc.py diff --git a/calfem/qt5.py b/src/calfem/qt5.py similarity index 100% rename from calfem/qt5.py rename to src/calfem/qt5.py diff --git a/calfem/shapes.py b/src/calfem/shapes.py similarity index 100% rename from calfem/shapes.py rename to src/calfem/shapes.py diff --git a/calfem/solver.py b/src/calfem/solver.py similarity index 100% rename from calfem/solver.py rename to src/calfem/solver.py diff --git a/calfem/ui.py b/src/calfem/ui.py similarity index 100% rename from calfem/ui.py rename to src/calfem/ui.py diff --git a/calfem/utils.py b/src/calfem/utils.py similarity index 100% rename from calfem/utils.py rename to src/calfem/utils.py diff --git a/calfem/vedo_utils.py b/src/calfem/vedo_utils.py similarity index 100% rename from calfem/vedo_utils.py rename to src/calfem/vedo_utils.py diff --git a/calfem/vis.py b/src/calfem/vis.py similarity index 100% rename from calfem/vis.py rename to src/calfem/vis.py diff --git a/calfem/vis_mpl.py b/src/calfem/vis_mpl.py similarity index 100% rename from calfem/vis_mpl.py rename to src/calfem/vis_mpl.py diff --git a/calfem/vis_vedo.py b/src/calfem/vis_vedo.py similarity index 100% rename from calfem/vis_vedo.py rename to src/calfem/vis_vedo.py diff --git a/calfem/vis_vedo_utils.py b/src/calfem/vis_vedo_utils.py similarity index 100% rename from calfem/vis_vedo_utils.py rename to src/calfem/vis_vedo_utils.py diff --git a/calfem/vis_vtk.py b/src/calfem/vis_vtk.py similarity index 100% rename from calfem/vis_vtk.py rename to src/calfem/vis_vtk.py diff --git a/src/calfem_python/__init__.py b/src/calfem_python/__init__.py deleted file mode 100644 index e69de29..0000000