Merge pull request #213 from nasa/hotfix/v1.7.1

Author: teubert

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "progpy"
-version = "1.7.0"
+version = "1.7.1"
 dependencies = [
     "scipy",
     "pandas",  # For data downloading features

sphinx-config/releases.rst

@@ -4,6 +4,13 @@ Release Notes
 .. ..  contents:: 
 ..     :backlinks: top
 
+Updates in v1.7.1
+----------------------
+
+progpy
+**************
+Hotfix fixing issue with dataset download
+
 Updates in v1.7
 ----------------------
 

src/progpy/__init__.py

@@ -11,7 +11,7 @@
 
 import warnings
 
-__version__ = '1.7.0'
+__version__ = '1.7.1'
 
 def run_prog_playback(obs, pred, future_loading, output_measurements, **kwargs):
     warnings.warn("Depreciated in 1.2.0, will be removed in a future release.", DeprecationWarning)

src/progpy/datasets/nasa_battery.py

@@ -9,34 +9,34 @@
 
 # Map of battery to url for data
 urls = {
-    'RW1': "https://data.nasa.gov/download/ed33-vxp2/application%2Fzip",
-    'RW2': "https://data.nasa.gov/download/ed33-vxp2/application%2Fzip",
-    'RW3': "https://data.nasa.gov/download/qghr-qkfw/application%2Fzip",
-    'RW4': "https://data.nasa.gov/download/qghr-qkfw/application%2Fzip",
-    'RW5': "https://data.nasa.gov/download/qghr-qkfw/application%2Fzip",
-    'RW6': "https://data.nasa.gov/download/qghr-qkfw/application%2Fzip",
-    'RW7': "https://data.nasa.gov/download/ed33-vxp2/application%2Fzip",
-    'RW8': "https://data.nasa.gov/download/ed33-vxp2/application%2Fzip",
-    'RW9': "https://data.nasa.gov/download/ugxu-9kjx/application%2Fzip",
-    'RW10': "https://data.nasa.gov/download/ugxu-9kjx/application%2Fzip",
-    'RW11': "https://data.nasa.gov/download/ugxu-9kjx/application%2Fzip",
-    'RW12': "https://data.nasa.gov/download/ugxu-9kjx/application%2Fzip",
-    'RW13': "https://data.nasa.gov/download/sb48-rsbc/application%2Fzip",
-    'RW14': "https://data.nasa.gov/download/sb48-rsbc/application%2Fzip",
-    'RW15': "https://data.nasa.gov/download/sb48-rsbc/application%2Fzip",
-    'RW16': "https://data.nasa.gov/download/sb48-rsbc/application%2Fzip",
-    'RW17': "https://data.nasa.gov/download/tcjd-g74p/application%2Fzip",
-    'RW18': "https://data.nasa.gov/download/tcjd-g74p/application%2Fzip",
-    'RW19': "https://data.nasa.gov/download/tcjd-g74p/application%2Fzip",
-    'RW20': "https://data.nasa.gov/download/tcjd-g74p/application%2Fzip",
-    'RW21': "https://data.nasa.gov/download/5uxu-h2h6/application%2Fzip",
-    'RW22': "https://data.nasa.gov/download/5uxu-h2h6/application%2Fzip",
-    'RW23': "https://data.nasa.gov/download/5uxu-h2h6/application%2Fzip",
-    'RW24': "https://data.nasa.gov/download/5uxu-h2h6/application%2Fzip",
-    'RW25': "https://data.nasa.gov/download/gah6-q2es/application%2Fzip",
-    'RW26': "https://data.nasa.gov/download/gah6-q2es/application%2Fzip",
-    'RW27': "https://data.nasa.gov/download/gah6-q2es/application%2Fzip",
-    'RW28': "https://data.nasa.gov/download/gah6-q2es/application%2Fzip",
+    'RW1': "https://zenodo.org/records/15277374/files/3.%20Battery_Uniform_Distribution_Variable_Charge_Room_Temp_DataSet_2Post.zip",
+    'RW2': "https://zenodo.org/records/15277374/files/3.%20Battery_Uniform_Distribution_Variable_Charge_Room_Temp_DataSet_2Post.zip",
+    'RW3': "https://zenodo.org/records/15277374/files/2.%20Battery_Uniform_Distribution_Discharge_Room_Temp_DataSet_2Post.zip",
+    'RW4': "https://zenodo.org/records/15277374/files/2.%20Battery_Uniform_Distribution_Discharge_Room_Temp_DataSet_2Post.zip",
+    'RW5': "https://zenodo.org/records/15277374/files/2.%20Battery_Uniform_Distribution_Discharge_Room_Temp_DataSet_2Post.zip",
+    'RW6': "https://zenodo.org/records/15277374/files/2.%20Battery_Uniform_Distribution_Discharge_Room_Temp_DataSet_2Post.zip",
+    'RW7': "https://zenodo.org/records/15277374/files/3.%20Battery_Uniform_Distribution_Variable_Charge_Room_Temp_DataSet_2Post.zip",
+    'RW8': "https://zenodo.org/records/15277374/files/3.%20Battery_Uniform_Distribution_Variable_Charge_Room_Temp_DataSet_2Post.zip",
+    'RW9': "https://zenodo.org/records/15277374/files/1.%20Battery_Uniform_Distribution_Charge_Discharge_DataSet_2Post.zip",
+    'RW10': "https://zenodo.org/records/15277374/files/1.%20Battery_Uniform_Distribution_Charge_Discharge_DataSet_2Post.zip",
+    'RW11': "https://zenodo.org/records/15277374/files/1.%20Battery_Uniform_Distribution_Charge_Discharge_DataSet_2Post.zip",
+    'RW12': "https://zenodo.org/records/15277374/files/1.%20Battery_Uniform_Distribution_Charge_Discharge_DataSet_2Post.zip",
+    'RW13': "https://zenodo.org/records/15277374/files/7.%20RW_Skewed_Low_Room_Temp_DataSet_2Post.zip",
+    'RW14': "https://zenodo.org/records/15277374/files/7.%20RW_Skewed_Low_Room_Temp_DataSet_2Post.zip",
+    'RW15': "https://zenodo.org/records/15277374/files/7.%20RW_Skewed_Low_Room_Temp_DataSet_2Post.zip",
+    'RW16': "https://zenodo.org/records/15277374/files/7.%20RW_Skewed_Low_Room_Temp_DataSet_2Post.zip",
+    'RW17': "https://zenodo.org/records/15277374/files/5.%20RW_Skewed_High_Room_Temp_DataSet_2Post.zip",
+    'RW18': "https://zenodo.org/records/15277374/files/5.%20RW_Skewed_High_Room_Temp_DataSet_2Post.zip",
+    'RW19': "https://zenodo.org/records/15277374/files/5.%20RW_Skewed_High_Room_Temp_DataSet_2Post.zip",
+    'RW20': "https://zenodo.org/records/15277374/files/5.%20RW_Skewed_High_Room_Temp_DataSet_2Post.zip",
+    'RW21': "https://zenodo.org/records/15277374/files/6.%20RW_Skewed_Low_40C_DataSet_2Post.zip?download=1",
+    'RW22': "https://zenodo.org/records/15277374/files/6.%20RW_Skewed_Low_40C_DataSet_2Post.zip?download=1",
+    'RW23': "https://zenodo.org/records/15277374/files/6.%20RW_Skewed_Low_40C_DataSet_2Post.zip?download=1",
+    'RW24': "https://zenodo.org/records/15277374/files/6.%20RW_Skewed_Low_40C_DataSet_2Post.zip?download=1",
+    'RW25': "https://zenodo.org/records/15277374/files/4.%20RW_Skewed_High_40C_DataSet_2Post.zip",
+    'RW26': "https://zenodo.org/records/15277374/files/4.%20RW_Skewed_High_40C_DataSet_2Post.zip",
+    'RW27': "https://zenodo.org/records/15277374/files/4.%20RW_Skewed_High_40C_DataSet_2Post.zip",
+    'RW28': "https://zenodo.org/records/15277374/files/4.%20RW_Skewed_High_40C_DataSet_2Post.zip",
 }
 
 cache = {}  # Cache for downloaded data