From 573a4753248574fa312f9f4bdf46c04b1c2f1234 Mon Sep 17 00:00:00 2001
From: Kim Louisa Auth <54391668+kimauth@users.noreply.github.com>
Date: Wed, 12 Oct 2022 17:23:19 +0200
Subject: [PATCH 1/4] plante: fix orientation of returned fe

`plante` returned a row instead of a column vector for `fe`.
---
 calfem/core.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/calfem/core.py b/calfem/core.py
index b4e58c0..6763855 100644
--- a/calfem/core.py
+++ b/calfem/core.py
@@ -2662,7 +2662,7 @@ def plante(ex, ey, ep, D, eq=None):
         if eq is None:
             return Ke
         else:
-            return Ke, fe.T
+            return Ke, fe
 
     #--------- plane strain --------------------------------------
 
@@ -2686,7 +2686,7 @@ def plante(ex, ey, ep, D, eq=None):
         if eq == None:
             return Ke
         else:
-            return Ke, fe.T
+            return Ke, fe
 
     else:
         info("Error ! Check first argument, ptype=1 or 2 allowed")
@@ -4419,4 +4419,4 @@ def beam2crd(ex=None, ey=None, ed=None, mag=None):
         excd[i, :] = xyc[0, :]+mag*cd[0, :]
         eycd[i, :] = xyc[1, :]+mag*cd[1, :]
 
-    return excd, eycd
\ No newline at end of file
+    return excd, eycd

From 0d54e46cda3a1ab934443b917c57a09bc8ea106b Mon Sep 17 00:00:00 2001
From: Jonas Lindemann <jonas.lindemann@lunarc.lu.se>
Date: Sun, 8 Oct 2023 21:50:40 +0200
Subject: [PATCH 2/4] Fix is None issues

---
 calfem/core.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/calfem/core.py b/calfem/core.py
index a9dd3fc..bce8bc9 100644
--- a/calfem/core.py
+++ b/calfem/core.py
@@ -268,7 +268,7 @@ def bar1s(ex, ep, ed, eq=None, nep=None):
     edi=u
     eci=X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -416,7 +416,7 @@ def bar1ws(ex, ep, ed, eq=None, nep=None):
     edi = u
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -580,7 +580,7 @@ def bar2s(ex, ey, ep, ed, eq=None, nep=None):
     edi = u
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -748,7 +748,7 @@ def bar2gs(ex, ey, ep, ed, nep=None):
     edi=u
     eci=X
 
-    if nep == None:
+    if nep is None:
         return es, QX
     else:
         return es, QX, edi, eci
@@ -918,7 +918,7 @@ def bar3s(ex, ey, ez, ep, ed, eq=None, nep=None):
     edi=u
     eci=X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -1067,7 +1067,7 @@ def beam1s(ex, ep, ed, eq=None, nep=None):
     edi = v
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -1240,7 +1240,7 @@ def beam1ws(ex, ep, ed, eq=None, nep=None):
     edi = v
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -1450,7 +1450,7 @@ def beam2s(ex, ey, ep, ed, eq=None, nep=None):
     edi = np.concatenate((u, v), 1)
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -1692,7 +1692,7 @@ def beam2ws(ex, ey, ep, ed, eq=None, nep=None):
     edi = np.concatenate((u, v), 1)
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -1934,7 +1934,7 @@ def beam2gs(ex, ey, ep, ed, QX, eq=None, nep=None):
     edi = np.concatenate((u, v), 1)
     eci = X
     
-    if nep == None:
+    if nep is None:
         return es, QX
     else:
         return es, QX, edi, eci
@@ -2221,7 +2221,7 @@ def beam2gxs(ex, ey, ep, ed, QX, eq=None, nep=None):
     edi = np.concatenate((u, v), 1)
     eci = X
     
-    if nep == None:
+    if nep is None:
         return es, QX
     else:
         return es, QX, edi, eci
@@ -2448,7 +2448,7 @@ def beam2ts(ex, ey, ep, ed, eq=None, nep=None):
     edi = np.concatenate((u, v, theta), 1)
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci
@@ -2970,7 +2970,7 @@ def beam3s(ex, ey, ez, eo, ep, ed, eq=None, nep=None):
     edi = np.concatenate((u, v, w, fi), 1)
     eci = X
 
-    if nep == None:
+    if nep is None:
         return es
     else:
         return es, edi, eci

From 8a7fa31f3c226ec6160bf9aca0aa3f0e2ce2a6ac Mon Sep 17 00:00:00 2001
From: Jonas Lindemann <jonas.lindemann@lunarc.lu.se>
Date: Mon, 9 Oct 2023 21:19:28 +0200
Subject: [PATCH 3/4] Update version number

---
 build-package.py  | 2 +-
 setup-org.py      | 5 +++--
 setup-template.py | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/build-package.py b/build-package.py
index 02c2df4..edc6757 100644
--- a/build-package.py
+++ b/build-package.py
@@ -14,7 +14,7 @@ def build_package():
 
 if __name__ == "__main__":
 
-    package_version = "3.6.3"
+    package_version = "3.6.4"
 
     update_setup("calfem-python", package_version, "'numpy', 'visvis', 'pyvtk', 'matplotlib', 'scipy', 'gmsh', 'qtpy', 'vedo', 'tabulate'")
 
diff --git a/setup-org.py b/setup-org.py
index 2e0f809..3a5f931 100644
--- a/setup-org.py
+++ b/setup-org.py
@@ -32,7 +32,7 @@ def gen_data_files(*dirs):
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
 
-    version='3.6.3',
+    version='3.6.4',
 
     description='CALFEM for Python',
     long_description='The computer program CALFEM is written for the software MATLAB and is an interactive tool for  learning the finite element method. CALFEM is an abbreviation of "Computer Aided Learning of the Finite Element  Method" and been developed by the Division of Structural Mechanics at Lund University since the late 70s.',
@@ -68,7 +68,8 @@ def gen_data_files(*dirs):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
 
     # What does your project relate to?
diff --git a/setup-template.py b/setup-template.py
index 1176426..7f20230 100644
--- a/setup-template.py
+++ b/setup-template.py
@@ -68,7 +68,8 @@ def gen_data_files(*dirs):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
 
     # What does your project relate to?

From 80cebbf7d11fac3bc374ff6dfb1ce6e110da07db Mon Sep 17 00:00:00 2001
From: Jonas Lindemann <jonas.lindemann@lunarc.lu.se>
Date: Tue, 31 Oct 2023 22:31:34 +0100
Subject: [PATCH 4/4] Prepare for release

---
 .gitignore                                    |   3 +
 calfem_python_small.egg-info/PKG-INFO         |  22 ----
 calfem_python_small.egg-info/SOURCES.txt      | 108 ------------------
 .../dependency_links.txt                      |   1 -
 calfem_python_small.egg-info/requires.txt     |   6 -
 calfem_python_small.egg-info/top_level.txt    |   1 -
 setup-template.py                             |   1 +
 setup.py                                      |   7 +-
 8 files changed, 8 insertions(+), 141 deletions(-)
 delete mode 100644 calfem_python_small.egg-info/PKG-INFO
 delete mode 100644 calfem_python_small.egg-info/SOURCES.txt
 delete mode 100644 calfem_python_small.egg-info/dependency_links.txt
 delete mode 100644 calfem_python_small.egg-info/requires.txt
 delete mode 100644 calfem_python_small.egg-info/top_level.txt

diff --git a/.gitignore b/.gitignore
index 5ae09e7..373ae8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,9 @@ venv-calfem
 
 calfem/shapes - kopia.py
 
+calfem_python.egg-info/*
+calfem_python_small.egg-info/*
+
 .vscode/launch.json
 *.project
 .pydevproject
diff --git a/calfem_python_small.egg-info/PKG-INFO b/calfem_python_small.egg-info/PKG-INFO
deleted file mode 100644
index 073c99c..0000000
--- a/calfem_python_small.egg-info/PKG-INFO
+++ /dev/null
@@ -1,22 +0,0 @@
-Metadata-Version: 2.1
-Name: calfem-python-small
-Version: 3.6.3
-Summary: CALFEM for Python
-Home-page: https://github.com/CALFEM/calfem-python
-Author: Jonas Lindemann, et al
-Author-email: jonas.lindemann@byggmek.lth.se
-License: MIT
-Keywords: finite element,math,numerics
-Classifier: Development Status :: 4 - Beta
-Classifier: Intended Audience :: Developers
-Classifier: Topic :: Software Development :: Build Tools
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.9
-License-File: LICENSE
-License-File: LICENSE.txt
-
-The computer program CALFEM is written for the software MATLAB and is an interactive tool for  learning the finite element method. CALFEM is an abbreviation of "Computer Aided Learning of the Finite Element  Method" and been developed by the Division of Structural Mechanics at Lund University since the late 70s.
diff --git a/calfem_python_small.egg-info/SOURCES.txt b/calfem_python_small.egg-info/SOURCES.txt
deleted file mode 100644
index 8342635..0000000
--- a/calfem_python_small.egg-info/SOURCES.txt
+++ /dev/null
@@ -1,108 +0,0 @@
-LICENSE
-LICENSE.txt
-MANIFEST.in
-README.md
-README.rst
-setup.py
-calfem/__init__.py
-calfem/_export.py
-calfem/classes_qt4.py
-calfem/classes_wx.py
-calfem/core.py
-calfem/editor.py
-calfem/editor_resources.py
-calfem/editor_scene.py
-calfem/editor_ui.py
-calfem/experimental.py
-calfem/geometry.py
-calfem/intvis.py
-calfem/mesh.py
-calfem/misc.py
-calfem/qt5.py
-calfem/shapes.py
-calfem/solver.py
-calfem/ui.py
-calfem/utils.py
-calfem/vedo_utils.py
-calfem/vis.py
-calfem/vis_mpl.py
-calfem/vis_vedo.py
-calfem/vis_vedo_utils.py
-calfem/vis_vtk.py
-calfem_python_small.egg-info/PKG-INFO
-calfem_python_small.egg-info/SOURCES.txt
-calfem_python_small.egg-info/dependency_links.txt
-calfem_python_small.egg-info/requires.txt
-calfem_python_small.egg-info/top_level.txt
-examples/ex_beam2.py
-examples/ex_tutorial_1.py
-examples/ex_tutorial_2.py
-examples/exe_stress_2d_editor.py
-examples/exm_circle_bsplines.py
-examples/exm_flow_model.py
-examples/exm_geometry.py
-examples/exm_qt_app.py
-examples/exm_qt_app.ui
-examples/exm_qt_vis.py
-examples/exm_qt_vis.ui
-examples/exm_stress_2d.py
-examples/exm_stress_2d_export.py
-examples/exm_stress_2d_materials.py
-examples/exm_stress_2d_pyvtk.py
-examples/exm_stress_2d_qt.py
-examples/exm_stress_2d_qt.ui
-examples/exm_structured_mesh.py
-examples/exm_structured_mesh_3d.py
-examples/exm_structured_mesh_vtk.py
-examples/exm_temp_2d_markers.py
-examples/exm_temp_2d_splines_arcs.py
-examples/exm_tet_mesh.py
-examples/exm_tet_mesh_vtk.py
-examples/exs1.py
-examples/exs_bar2.py
-examples/exs_bar2_la.py
-examples/exs_beam1.py
-examples/exs_beambar2.py
-examples/exs_flw_diff2.py
-examples/exs_flw_temp2.py
-examples/exs_spring.py
-examples/exv1.py
-examples/exv2.py
-examples/exv3.py
-examples/exv4.m
-examples/exv4.mat
-examples/exv4.py
-examples/exv5.py
-examples/exvis_beam_soli8.py
-examples/.ipynb_checkpoints/Untitled-checkpoint.ipynb
-examples/.ipynb_checkpoints/exs1-checkpoint.ipynb
-examples/.ipynb_checkpoints/exs2-checkpoint.ipynb
-examples/.ipynb_checkpoints/exs3-checkpoint.ipynb
-examples/experimental/exed1.py
-examples/experimental/exed1.ui
-examples/experimental/exint1.py
-examples/experimental/exm11.py
-examples/experimental/exm11_mpl.py
-examples/experimental/exm12.ipynb
-examples/experimental/exm12.py
-examples/experimental/exm12_mpl.py
-examples/experimental/exm14_vtk.py
-examples/experimental/exm1_mpl_edit.py
-examples/experimental/exs6_test.py
-examples/experimental/exui1.py
-examples/experimental/gmsh_api_test.py
-examples/experimental/gmsh_api_test_2.py
-examples/experimental/path_int.py
-examples/experimental/plot_test.py
-examples/experimental/prim3d.py
-examples/experimental/qt1.py
-examples/experimental/qt2.py
-examples/experimental/test_point_in_geom.py
-examples/experimental/test_tri_mesh.py
-examples/experimental/.vscode/settings.json
-examples/gmsh-api/exgm1.py
-examples/gmsh-api/exgm2.py
-examples/gmsh-api/exgm3.py
-examples/gmsh-api/exgm4.py
-examples/obsolete/extri1.py
-examples/obsolete/extri2.py
\ No newline at end of file
diff --git a/calfem_python_small.egg-info/dependency_links.txt b/calfem_python_small.egg-info/dependency_links.txt
deleted file mode 100644
index 8b13789..0000000
--- a/calfem_python_small.egg-info/dependency_links.txt
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/calfem_python_small.egg-info/requires.txt b/calfem_python_small.egg-info/requires.txt
deleted file mode 100644
index 8b8cb09..0000000
--- a/calfem_python_small.egg-info/requires.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-numpy
-visvis
-matplotlib
-scipy
-gmsh
-tabulate
diff --git a/calfem_python_small.egg-info/top_level.txt b/calfem_python_small.egg-info/top_level.txt
deleted file mode 100644
index 5fdf479..0000000
--- a/calfem_python_small.egg-info/top_level.txt
+++ /dev/null
@@ -1 +0,0 @@
-calfem
diff --git a/setup-template.py b/setup-template.py
index 7f20230..58eed20 100644
--- a/setup-template.py
+++ b/setup-template.py
@@ -70,6 +70,7 @@ def gen_data_files(*dirs):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
 
     # What does your project relate to?
diff --git a/setup.py b/setup.py
index 02102e5..6eb68ec 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@ def gen_data_files(*dirs):
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
 
-    version='3.6.3',
+    version='3.6.4',
 
     description='CALFEM for Python',
     long_description='The computer program CALFEM is written for the software MATLAB and is an interactive tool for  learning the finite element method. CALFEM is an abbreviation of "Computer Aided Learning of the Finite Element  Method" and been developed by the Division of Structural Mechanics at Lund University since the late 70s.',
@@ -42,7 +42,7 @@ def gen_data_files(*dirs):
 
     # Author details
     author='Jonas Lindemann, et al',
-    author_email='jonas.lindemann@byggmek.lth.se',
+    author_email='jonas.lindemann@lunarc.lu.se',
 
     # Choose your license
     license='MIT',
@@ -68,7 +68,8 @@ def gen_data_files(*dirs):
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
-        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
 
     # What does your project relate to?