Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/max py version #54

Merged
merged 3 commits into from
Aug 21, 2024
Merged

Bug/max py version #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ac47da
set max py version to 3.10
crvernon Aug 21, 2024
fe7fdb6
fix future dep warning for year designation
crvernon Aug 21, 2024
da08edc
update to version 1.2.1
crvernon Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
project = 'TELL'
copyright = '2022, Batelle Memorial Institute'
author = 'Casey Burleyson, Casey McGrath'
version = 'v1.2.0'
version = '1.2.1'



Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def readme():
description='A model to predict total electricity loads',
long_description=readme(),
long_description_content_type="text/markdown",
python_requires='>=3.9',
python_requires='>=3.9, <3.11',
include_package_data=True,
install_requires=[
'setuptools>=49.2.1',
Expand Down
2 changes: 1 addition & 1 deletion tell/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
from .visualization import *

# Set the current version of TELL:
__version__ = '1.2.0'
__version__ = '1.2.1'
2 changes: 1 addition & 1 deletion tell/execute_forward.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def process_population_scenario(scenario_to_process: str, population_data_input_
population_dft.set_index('yr', inplace=True)

# Interpolate the populations to an annual time-step and transpose the results:
population_interp_df = population_dft.resample('1Y').mean().interpolate('linear').T
population_interp_df = population_dft.resample('1YE').mean().interpolate('linear').T

# Convert the dataframe from a wide format to a long format and name the population variable:
population_interp_df = population_interp_df.stack().reset_index()
Expand Down
23 changes: 13 additions & 10 deletions tell/install_forcing_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ class InstallForcingSample:

# URL for DOI minted example data hosted on Zenodo

DATA_VERSION_URLS = {'0.0.1': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.0': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.1': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.2': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.3': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.4': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.5': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'1.0.0': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'1.1.0': 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1',
'1.2.0': 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1'}
DATA_VERSION_URLS = {
'0.0.1': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.0': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.1': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.2': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.3': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.4': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'0.1.5': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'1.0.0': 'https://zenodo.org/record/6354665/files/sample_forcing_data.zip?download=1',
'1.1.0': 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1',
'1.2.0': 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1',
'1.2.1': 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1',
}

DEFAULT_VERSION = 'https://zenodo.org/records/13344803/files/sample_forcing_data.zip?download=1'

Expand Down
23 changes: 13 additions & 10 deletions tell/install_quickstarter_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ class InstallQuickstarterData:

# URL for DOI minted example data hosted on Zenodo

DATA_VERSION_URLS = {'0.0.1': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.0': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.1': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.2': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.3': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.4': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.5': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'1.0.0': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'1.1.0': 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1',
'1.2.0': 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1'}
DATA_VERSION_URLS = {
'0.0.1': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.0': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.1': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.2': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.3': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.4': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'0.1.5': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'1.0.0': 'https://zenodo.org/record/6804242/files/tell_quickstarter_data.zip?download=1',
'1.1.0': 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1',
'1.2.0': 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1',
'1.2.1': 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1',
}

DEFAULT_VERSION = 'https://zenodo.org/records/13344957/files/tell_quickstarter_data.zip?download=1'

Expand Down
3 changes: 2 additions & 1 deletion tell/install_raw_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class InstallRawData:
'1.0.0': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
'1.1.0': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
'1.1.1': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
'1.2.0': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1'
'1.2.0': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
'1.2.1': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
}

DEFAULT_VERSION = 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1'
Expand Down
Loading