Update conda environment

environment.yml

@@ -1,50 +1,47 @@
-name: reeds2
+name: reeds
 channels:
-  - defaults
   - conda-forge
 dependencies:
-  - python=3.11
-  - bokeh=3.2
-  - click=8.0
-  - git-lfs=2.13
+  - python=3.14
+  - bokeh=3.9
+  - click=8.3
+  - cmocean=4.0
+  - geopandas=1.1
+  - git-lfs=3.7
   - gitpython=3.1
-  - h5py=3.9
-  - matplotlib=3.7
-  - numpy=1.26
-  - openpyxl=3.0
-  - pandas=2.0
-  - pip=23.2
-  - pytables=3.8
-  - pytest=7.4
-  - requests=2.31
-  - scikit-learn=1.2
-  - scipy=1.11
-  - tqdm=4.65
+  - h5py=3.16
+  - matplotlib=3.10
+  - numpy=2.4
+  - openpyxl=3.1
+  - pandas=3.0
+  - pip=26.1
+  - pytables=3.11
+  - pytest=9.0
+  - requests=2.33
+  - scikit-learn=1.8
+  - scipy=1.17
+  - shapely=2.1
+  - tqdm=4.67
   ## vvv The next packages are optional for default settings and may
   ## vvv be excluded if you're having trouble building the environment.
-  - ipykernel=6.25 # for interactive python in VS Code
-  - ipywidgets=8.0 # for jupyter notebooks
-  - mapclassify=2.5 # more mapping tools
+  - fiona=1.10 # for interactive maps
+  - folium=0.20 # for interactive maps
+  - ipykernel=7.2 # for interactive python in VS Code
+  - ipywidgets=8.1 # for jupyter notebooks
+  - mapclassify=2.10 # more mapping tools
   - mscorefonts=0.0 # extra fonts for plotting (only relevant on linux/HPC)
-  - networkx=3.1 # for uncommonly-used network analysis postprocessing
-  - notebook=6.5 # for jupyter notebooks
+  - myst-parser=5.0 # for building documentation
+  - networkx=3.6 # for uncommonly-used network analysis postprocessing
+  - notebook=7.5 # for jupyter notebooks
+  - python-pptx=1.0 # for postprocessing/compare_cases.py
+  - sphinx=9.1 # for building documentation
+  - sphinx_rtd_theme=3.1 # for documentation
+  - sphinxcontrib-bibtex=2.6 # for documentation
   ## ^^^
   - pip:
-    - cmocean==3.0.3
-    - gdxpds==1.4.0
-    - geopandas==0.14.0
-    - pulp==2.7.0
-    - shapely==2.0.1
+    - gamsapi[transfer]==53.5.0
+    - gdxpds==4.0.0
+    - pulp==3.3.2
     ## vvv The next packages are optional for default settings and may
     ## vvv be excluded if they cause trouble building the environment.
-    - fiona==1.9.5 # for interactive maps
-    - folium==0.14.0 # for interactive maps
-    - gamspy_base==50.5.0 # for tests on the github runner
-    - myst-parser==2.0.0 # for building documentation
-    - proj==0.2.0 # for plotting maps
-    - pyproj==3.6.1 # for plotting maps
-    - python-pptx==0.6.22 # for postprocessing/compare_cases.py
-    - sphinx_rtd_theme==2.0.0 # for documentation
-    - sphinx==7.2.6 # for building documentation
-    - sphinxcontrib-bibtex==2.6.2 # for documentation
-    ## ^^^
+    - gamspy_base==53.5.0 # for tests on the github runner

hourlize/agg_buildings/agg_buildings.py

@@ -28,10 +28,10 @@
     cnty_fips = [int(c[1:3] + c[4:7]) for c in counties]
     bas = [county_map[c] if c in county_map else 'undefined' for c in cnty_fips]
     df.columns = bas
-    df_sum = df.groupby(df.columns, axis=1).sum()
+    df_sum = df.T.groupby(df.columns).sum().T
     ls_df.append(df_sum)
 
 df_sum = pd.concat(ls_df, axis=1)
-df_sum = df_sum.groupby(df_sum.columns, axis=1).sum()
+df_sum = df_sum.T.groupby(df_sum.columns).sum().T
 df_sum = df_sum/1000 #Convert to GWh
 df_sum.to_csv(f'{bldg_path}/agg_{bldg_type}_eulp_hvac_elec_GWh_{bldg_tech}.csv')

hourlize/resource.py

@@ -788,7 +788,7 @@ def save_sc_outputs(
             ret_year_ls = list(range(start_year,max_exog_ret_year + 1))
             df_exog = df_exog.pivot_table(index=[profile_id_col,'class'], columns='retire_year', values='existing_capacity')
             # Make a column for every year until the largest retirement year
-            df_exog = df_exog.reindex(columns=ret_year_ls).fillna(method='bfill', axis='columns')
+            df_exog = df_exog.reindex(columns=ret_year_ls).bfill(axis='columns')
             df_exog = pd.melt(
                 df_exog.reset_index(), id_vars= [profile_id_col,'class'],
                 value_vars=ret_year_ls, var_name='year', value_name='capacity')