"bug fixing, code cleaning and quality-of-life improvements"

MABeeskow · Jul 2, 2024 · 219a2af · 219a2af
1 parent ef9189e
commit 219a2af
Show file tree

Hide file tree

Showing 6 changed files with 30,154 additions and 50 deletions.
diff --git a/notebooks/PySILLS_Tutorial.ipynb b/notebooks/PySILLS_Tutorial.ipynb
diff --git a/pysills/pypitzer/database/lassin_binary.py b/pysills/pypitzer/database/lassin_binary.py
@@ -3,6 +3,7 @@
 # Description: This script calculates the average of a list of numbers.
 # Version: 1.0
 # Last Modified: May 7, 2023
+# Modified by Maximilian Beeskow: July 2, 2024
 
 import pandas as pd
 
@@ -225,8 +226,10 @@
 
 index = pd.MultiIndex.from_tuples([('pr1', 'pr2', 'pr3')], names=["parameter", "species1", "species2"])
 df = pd.DataFrame(columns=['a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'a8'], index=index)
+
 for key, value in species.items():
+    df.sort_index(inplace=True, na_position="first")
     df.loc[key, :] = pd.Series(value)
-df.sort_index()
+#df.sort_index()
 
 lassin_binary = df
diff --git a/pysills/pypitzer/database/marion_binary.py b/pysills/pypitzer/database/marion_binary.py
@@ -3,6 +3,7 @@
 # Description: This script calculates the average of a list of numbers.
 # Version: 1.0
 # Last Modified: May 7, 2023
+# Modified by Maximilian Beeskow: July 2, 2024
 
 import pandas as pd
 
@@ -265,9 +266,11 @@
 
 index = pd.MultiIndex.from_tuples([('pr1', 'pr2', 'pr3')], names=["parameter", "species1", "species2"])
 df = pd.DataFrame(columns=['a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7'], index=index)
+
 for key, value in species.items():
+    df.sort_index(inplace=True, na_position="first")
     df.loc[key, :] = pd.Series(value)
-df.sort_index()
+#df.sort_index()
 
 marion_binary = df
 
diff --git a/pysills/pypitzer/database/spencer_revised_binary.py b/pysills/pypitzer/database/spencer_revised_binary.py
@@ -3,6 +3,7 @@
 # Description: This script calculates the average of a list of numbers.
 # Version: 1.0
 # Last Modified: May 7, 2023
+# Modified by Maximilian Beeskow: July 2, 2024
 
 import pandas as pd
 
@@ -541,8 +542,10 @@
 
 index = pd.MultiIndex.from_tuples([('pr1', 'pr2', 'pr3')], names=["parameter", "species1", "species2"])
 df = pd.DataFrame(columns=['a1', 'a2', 'a3', 'a4', 'a5', 'a6'], index=index)
+
 for key, value in species.items():
+    df.sort_index(inplace=True, na_position="first")
     df.loc[key, :] = pd.Series(value)
-df.sort_index()
+#df.sort_index()
 
 spencer_binary = df
diff --git a/pysills/pysills_app.py b/pysills/pysills_app.py
@@ -5,8 +5,8 @@
 
 # Name:		pysills_app.py
 # Author:	Maximilian A. Beeskow
-# Version:	v1.0.5
-# Date:		28.06.2024
+# Version:	v1.0.7
+# Date:		02.07.2024
 
 # -----------------------------------------------------------------------------------------------------------------------
 
@@ -73,7 +73,7 @@ def __init__(self, parent, var_screen_width, var_screen_height, var_path=None):
         # val_version = subprocess.check_output(['git', 'log', '-n', '1', '--pretty=tformat:%h']).strip()
         # self.val_version = val_version.decode("utf-8")
         #self.val_version = ''.join(rd.choice(string.ascii_letters) for i in range(8))
-        self.val_version = "1.0.6 - 28.06.2024"
+        self.val_version = "1.0.7 - 02.07.2024"
 
         ## Colors
         self.green_dark = "#282D28"

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name="PySILLS",
-    version="1.0.6",
+    version="1.0.7",
     packages=find_packages(),
     url="https://github.com/MABeeskow/PySILLS",
     license="LGPL-3.0",