small fixes from merge

NREL · Mar 22, 2024 · 44706a0 · 44706a0
1 parent f33b6ea
commit 44706a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,15 +97,11 @@ ENV/
 # vscode
 .vscode/
 
-# PVDEMICE tests
+# PVDICE tests
 tests/results/
 
-# PVDEMICE temp folder
-<<<<<<< HEAD
+# PVICE temp folder
 PV_ICE/TEMP/
 
 # Traning Jupyter-book
 training/_build/
-=======
-# PV_ICE/TEMP/
->>>>>>> be4860f9b4c2ce5a2b887e2d153f7cfea32b3a6c
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright 2020-2023 Alliance for Sustainable Energy, LLC 
+Copyright 2020-2024 Alliance for Sustainable Energy, LLC 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

diff --git a/requirements.txt b/requirements.txt
@@ -2,11 +2,9 @@ configparser==5.0.0
 coverage==5.1
 matplotlib==3.2.1
 numpy==1.22.0
-pandas==1.0.3
+pandas==2.1.0
 pytest==5.4.1
 pytest-cov==2.8.1
 python-dateutil==2.8.1
-sphinx-autoapi==1.1.0
-sphinx-rtd-theme==0.4.3
 requests
 future
diff --git a/setup.py b/setup.py
@@ -87,10 +87,9 @@
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
     install_requires=['matplotlib',
-                       'numpy',
+                      'numpy',
                       'pandas',
-                      'tqdm >= 4.32.1',
-                      'sphinx >= 1.8.0'
+                      'tqdm >= 4.32.1'
                       ],
 
     # List additional groups of dependencies here (e.g. development