Merge pull request #118 from oemof/Fix_ci_warnings

Fix pands future warnings
oemof · Apr 18, 2023 · 2865840 · 2865840
2 parents 671b952 + 23f72d0
commit 2865840
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/tox_pytests.yml b/.github/workflows/tox_pytests.yml
@@ -34,12 +34,3 @@ jobs:
         pip install tox tox-gh-actions coverage coveralls
     - name: Test with tox
       run: tox
-
-    - name: Check test coverage
-      run: coverage report -m --fail-under=${{ matrix.vcs == 'bzr' && 24 || 25 }}
-
-    - name: Report to coveralls
-      run: coveralls
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        COVERALLS_SERVICE_NAME: github
diff --git a/dhnx/simulation.py b/dhnx/simulation.py
@@ -190,7 +190,7 @@ def _concat_scalars(self, name):
         ]
 
         if select_scalars:
-            select_scalars = pd.concat(select_scalars, 0)
+            select_scalars = pd.concat(select_scalars, axis=0)
 
         else:
             select_scalars = None
@@ -217,7 +217,7 @@ def _concat_sequences(self, name):
             if name in d
         ]
 
-        concat_sequences = pd.concat(select_sequences, 1)
+        concat_sequences = pd.concat(select_sequences, axis=1)
 
         return concat_sequences
 
@@ -652,8 +652,9 @@ def _calculate_pump_power(self, global_pressure_losses):
             if data['component_type'] == 'Producer'
         ]
 
-        mass_flow_producers = \
-            self.results['pipes-mass_flow'].loc[:, idx[producers, :]].sum(axis=1)
+        mass_flow_producers = self.results['pipes-mass_flow'].iloc[
+            :, self.results['pipes-mass_flow'].columns.isin(
+                producers, level=0)].sum(axis=1)
 
         pump_power = mass_flow_producers * global_pressure_losses / (self.eta_pump * self.rho)
 

diff --git a/docs/whatsnew/v0-0-3.rst b/docs/whatsnew/v0-0-3.rst
@@ -36,7 +36,8 @@ Bug fixes
 Known issues
 ^^^^^^^^^^^^^^^^^^^^
 
-* something
+* Simulation tests do not test, as check_if_csv_files_equal
+  from helpers module is incomplete.
 
 
 Testing

diff --git a/tests/helpers.py b/tests/helpers.py
@@ -51,6 +51,8 @@ def check_if_csv_files_equal(csv_file_a, csv_file_b, check_arrays=False, **kwarg
     r"""
     Compares two csv files.
 
+    TODO: Check not working. Nothing happens, if check fails!
+
     Parameters
     ----------
     csv_file_a : str

diff --git a/tests/test_results.py b/tests/test_results.py
@@ -12,6 +12,8 @@
 
 def test_tree_simulation():
 
+    # TODO: Test not working! Nothing happens, if check fails!
+
     input_data = os.path.join(
         tests_path,
         '_files',
@@ -46,6 +48,8 @@ def test_tree_simulation():
 
 def test_tree_simulation_reverse_pipe_dir():
 
+    # TODO: Test not working! Nothing happens, if check fails!
+
     input_data = os.path.join(
         tests_path,
         '_files',