merge main into develop

angelsen · Aug 31, 2021 · 625fb00 · 625fb00
2 parents bce4eaa + 658ee57
commit 625fb00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -110,5 +110,8 @@ test.c
 # tox
 .tox/
 
+# julia
+Manifest.toml
+
 # vcpkg
 vcpkg_installed/
diff --git a/setup.py b/setup.py
@@ -172,7 +172,7 @@ def compile_KLU():
 
 setup(
     name="pybamm",
-    version=load_version(),
+    version=load_version() + ".post1",
     description="Python Battery Mathematical Modelling.",
     long_description=readme,
     long_description_content_type="text/markdown",
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,5 +110,8 @@ test.c @@
     # tox
     .tox/
+    # julia
+    Manifest.toml
     # vcpkg
     vcpkg_installed/