Merge remote-tracking branch 'origin/main'

# Conflicts:
#	pyroll/basic.py

Author: ChRen95

pyproject.toml

@@ -8,17 +8,17 @@ authors = [
 license = "BSD-3-Clause"
 requires-python = ">=3.9"
 dependencies = [
-    "pyroll-core ~= 2.1",
-    "pyroll-cli ~= 2.1",
-    "pyroll-report ~= 2.1",
-    "pyroll-export ~= 2.1",
-    "pyroll-integral-thermal ~= 2.1",
-    "pyroll-lippmann-mahrenholz-force-torque ~= 2.0",
-    "pyroll-wusatowski-spreading ~= 2.0",
-    "pyroll-zouhar-contact ~= 2.1",
-    "pyroll-freiberg-flow-stress ~= 2.0",
-    "pyroll-lendl-equivalent-method ~= 2.0",
-    "pyroll-linear-thermal-expansion ~= 2.1",
+    "pyroll-core ~= 3.0",
+    "pyroll-cli ~= 3.0",
+    "pyroll-report ~= 3.0",
+    "pyroll-export ~= 3.0",
+    "pyroll-integral-thermal ~= 3.0",
+    "pyroll-lippmann-mahrenholz-force-torque ~= 3.0",
+    "pyroll-wusatowski-spreading ~= 3.0",
+    "pyroll-zouhar-contact ~= 3.0",
+    "pyroll-freiberg-flow-stress ~= 3.0",
+    "pyroll-lendl-equivalent-method ~= 3.0",
+    "pyroll-linear-thermal-expansion ~= 3.0",
     "plotly"
 ]
 readme = "README.md"

pyroll/basic.py

@@ -1,4 +1,4 @@
-VERSION = "2.1.2"
+VERSION = "3.0.0"
 
 import pyroll.core as core
 from pyroll.core import (

tests/test_solve.py

@@ -65,6 +65,6 @@ def test_solve(tmp_path: Path, caplog):
     rendered = report(sequence)
     print()
 
-    report_file.write_text(rendered)
+    report_file.write_text(rendered, encoding="utf-8")
 
     webbrowser.open(report_file.as_uri())

tests/test_solve_3rp_hex_75_2.py

@@ -130,6 +130,6 @@ def test_solve_3rp_hexagon_75_2(tmp_path: Path, caplog):
     rendered = report(sequence)
     print()
 
-    report_file.write_text(rendered)
+    report_file.write_text(rendered, encoding="utf-8")
 
     webbrowser.open(report_file.as_uri())

tests/test_solve_imf_semi_continuous_8_mm.py

@@ -303,6 +303,6 @@ def test_solve_imf_semi_continuous_8_mm_pass_sequence(tmp_path: Path, caplog):
     rendered = report(sequence)
     print()
 
-    report_file.write_text(rendered)
+    report_file.write_text(rendered, encoding="utf-8")
 
     webbrowser.open(report_file.as_uri())

tests/test_solve_sag_kalibreur.py

@@ -228,6 +228,6 @@ def test_solve_sag_kalibreur_pass_sequence(tmp_path: Path, caplog):
     rendered = report(sequence)
     print()
 
-    report_file.write_text(rendered)
+    report_file.write_text(rendered, encoding="utf-8")
 
     webbrowser.open(report_file.as_uri())