Skip to content

Commit

Permalink
Merge pull request #58 from IMMM-SFA/dev
Browse files Browse the repository at this point in the history
Upgrade to v1.3.0
  • Loading branch information
crvernon authored Sep 17, 2024
2 parents 31f4e8a + 87ffb2d commit 419b968
Show file tree
Hide file tree
Showing 11 changed files with 103 additions and 154 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install .
- name: Test and generate coverage report
run: |
Expand Down
24 changes: 0 additions & 24 deletions .github/workflows/draft-pdf.yml

This file was deleted.

2 changes: 1 addition & 1 deletion docs/source/conf.py
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 = '1.2.1'
version = '1.3.0'



Expand Down
97 changes: 97 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
[build-system]
requires = ["hatchling"]
build-backend = "hatchling.build"

[project]
name = "tell"
description = "An open-source Python package to model future hourly total electricity loads."
readme = "README.md"
version = "1.3.0"
requires-python = ">=3.9,<3.11"
license = {file = "LICENSE"}
authors = [
{name = "Casey McGrath", email = "casey.mcgrath@pnnl.gov"},
{name = "Casey Burleyson", email = "casey.burleyson@pnnl.gov"},
{name = "Chris Vernon", email = "chris.vernon@pnnl.gov"},
{name = "Em Rexer", email = "emily.rexer@pnnl.gov"},
{name = "Aowabin Rahman", email = "aowabin.rahman@pnnl.gov"},
]
maintainers = [
{name = "Casey McGrath", email = "casey.mcgrath@pnnl.gov"},
{name = "Casey Burleyson", email = "casey.burleyson@pnnl.gov"},
{name = "Chris Vernon", email = "chris.vernon@pnnl.gov"},
{name = "Em Rexer", email = "emily.rexer@pnnl.gov"},
]
dependencies = [
"setuptools>=49.2.1",
"attrs>=21.4.0",
"certifi>=2021.10.8",
"charset-normalizer>=2.0.12",
"click>=8.0.3",
"click-plugins>=1.1.1",
"cligj>=0.7.2",
"convertdate>=2.4.0",
"cycler>=0.11.0",
"Fiona>=1.8.21",
"fonttools>=4.29.1",
"geopandas>=0.10.2",
"hijri-converter>=2.2.3",
"holidays>=0.13",
"idna>=3.3",
"joblib>=1.1.0",
"kiwisolver>=1.3.2",
"korean-lunar-calendar>=0.2.1",
"matplotlib>=3.5.1",
"munch>=2.5.0",
"numpy>=1.21.5,<2",
"openpyxl>=3.0.9",
"packaging>=21.3",
"pandas>=1.3.5",
"Pillow>=9.0.1",
"PyMeeus>=0.5.11",
"pyparsing>=3.0.7",
"pyproj>=3.2.1",
"python-dateutil>=2.8.2",
"pytz>=2021.3",
"PyYAML>=6.0",
"requests>=2.27.1",
"Rtree>=0.9.7",
"scikit-learn==1.0.2",
"scipy>=1.7.3",
"Shapely>=1.8.0",
"six>=1.16.0",
"threadpoolctl>=3.1.0",
"urllib3>=1.26.8",
"fastparquet>=0.8.3"
]

classifiers = [
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
]

[project.optional-dependencies]
test = [
"pytest>=6.2.4",
"pytest-cov>=2.12.1"
]
docs = [
"build>=0.5.1",
"nbsphinx>=0.8.6",
"recommonmark>=0.7.1",
"setuptools>=57.0.0",
"sphinx>=4.0.2",
"sphinx-panels>=0.6.0",
"sphinx-rtd-theme>=1.0.0",
]
deploy = [
"twine>=3.4.1",
]

[project.urls]
Repository = "https://github.com/IMMM-SFA/tell"
Documentation = "https://immm-sfa.github.io/tell"

[tool.hatch.build]
packages = ["tell"] # set importable package name to "tell"
include = ["tell"]
41 changes: 0 additions & 41 deletions requirements.txt

This file was deleted.

3 changes: 0 additions & 3 deletions setup.cfg

This file was deleted.

83 changes: 0 additions & 83 deletions setup.py

This file was deleted.

2 changes: 1 addition & 1 deletion tell/__init__.py
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.1'
__version__ = '1.3.0'
1 change: 1 addition & 0 deletions tell/install_forcing_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class InstallForcingSample:
'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',
'1.3.0': '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
1 change: 1 addition & 0 deletions tell/install_quickstarter_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class InstallQuickstarterData:
'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',
'1.3.0': '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
1 change: 1 addition & 0 deletions tell/install_raw_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ class InstallRawData:
'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.1': 'https://zenodo.org/record/6378036/files/tell_raw_data.zip?download=1',
'1.3.0': '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

0 comments on commit 419b968

Please sign in to comment.