Skip to content

Commit 10b9408

Browse files
authored
V2.3 (NREL#182)
* bump the version * update the copyright year * update the readme and contributing guidelines * update credits
1 parent ad8e55a commit 10b9408

File tree

7 files changed

+44
-18
lines changed

7 files changed

+44
-18
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22
All notable changes to this project will be documented in this file. If you make a notable change to the project, please add a line describing the change to the "unreleased" section. The maintainers will make an effort to keep the [Github Releases](https://github.com/NREL/OpenOA/releases) page up to date with this changelog. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
33

4-
## [UNRELEASED]
4+
## [2.3 - 2022-01-18]
55
- Replaced hard-coded reanalysis dates in plant analysis with automatic valid date selection and added optional user-defined end date argument. Fixed bug in normalization to 30-day months.
66
- Toolkit added for downloading reanalysis data using the PlanetOS API
77
- Added hourly resolution to AEP calculation

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2020, Alliance for Sustainable Energy LLC, All rights reserved.
3+
Copyright (c) 2022, Alliance for Sustainable Energy LLC, All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
66

contributing.md

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,30 @@ All code should be paired with a corresponding unit or integration test.
7777
OpenOA uses pytest and the built in unittest framework.
7878
For instructions on running tests, please see the [Readme](https://github.com/NREL/OpenOA/tree/develop#Testing).
7979

80-
## Deploying a Package to PyPi
81-
82-
The repository is equipped with a github action to build and publish new versions to PyPi.
83-
A maintainer can invoke this workflow by pushing a tag to the NREL/OpenOA reposiory with prefix "v", such as "v1.1.0".
84-
The action is defined in `.github/workflows/tags-to-pypi.yml`.
85-
86-
```
87-
git tag -a v1.2.3 -m "Tag messgae for v1.2.3"
88-
git push origin v1.2.3
89-
```
80+
## Release Process
81+
82+
- Bump version number and metadata in
83+
- operational_analysis/__init__.py
84+
- operational_analysis/setup.py
85+
- sphinx/config.py
86+
- Bump version numbers of any dependencies in
87+
- setup.py
88+
- requirements.txt
89+
- sphinx/requirements.txt
90+
- Update the changelog, removing the UNRELEASED section and converting it into a release heading.
91+
- Make a pull request into develop with these updates
92+
- Note: Ensure all tests pass and the documentation is building correctly prior to merging
93+
- Merge develop into main through the git command line
94+
```
95+
git checkout main
96+
git merge develop
97+
git push
98+
```
99+
- Tag the new release version:
100+
```
101+
git tag -a v1.2.3 -m "Tag messgae for v1.2.3"
102+
git push origin v1.2.3
103+
```
104+
- Deploying a Package to PyPi
105+
- The repository is equipped with a github action to build and publish new versions to PyPi. A maintainer can invoke this workflow by pushing a tag to the NREL/OpenOA reposiory with prefix "v", such as "v1.1.0".
106+
- The action is defined in `.github/workflows/tags-to-pypi.yml`.

operational_analysis/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "2.2"
1+
__version__ = "2.3"
22
"""
33
When bumping version, please be sure to also update parameters in sphinx/conf.py
44
"""
@@ -10,7 +10,7 @@
1010

1111

1212
def setup_logging(default_path="logging.json", default_level=logging.INFO, env_key="LOG_CFG"):
13-
"""Setup logging configuration """
13+
"""Setup logging configuration"""
1414
path = default_path
1515
value = os.getenv(env_key, None)
1616
if value:

readme.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ If you use this software in your work, please cite our JOSS article with the fol
4343

4444
### Requirements
4545

46-
* Python 3.6-3.8 with pip.
47-
48-
OpenOA should be compatible with newer versions of Python, but one of its dependencies, Shapely, does not yet have binary wheels in pip for Python 3.9 on Mac.
46+
* Python 3.6+ with pip.
4947

5048
We strongly recommend using the Anaconda Python distribution and creating a new conda environment for OpenOA. You can download Anaconda through [their website.](https://www.anaconda.com/products/individual)
5149

@@ -96,6 +94,12 @@ pip install -e "./OpenOA[develop]"
9694
pre-commit install
9795
```
9896

97+
Occasionally, you will need to update the dependencies in the pre-commit workflow, which will provide an error when this needs to happen. When it does, this can normally be resolved with the below code, after which you can continue with your normal git workflow:
98+
```
99+
pre-commit autoupdate
100+
git add .pre-commit-config.yaml
101+
```
102+
99103
#### Example Notebooks and Data
100104

101105
The example data will be automaticaly extracted as needed by the tests. To manually extract the example data for use with the example notebooks, use the following command:

sphinx/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979

8080
# General information about the project.
8181
project = "OpenOA"
82-
copyright = "2021, NREL"
82+
copyright = "2022, NREL"
8383
author = "NREL PRUF OA Team"
8484

8585

sphinx/credit.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,20 @@ Credit
55
******
66

77
Alphabetically:
8+
Nathan Agarwal,
9+
Nicola Bodini,
810
Anna Craig,
911
Jason Fields,
12+
Rob Hammond,
1013
Travis Kemper,
1114
Joseph Lee,
1215
Monte Lunacek,
1316
John Meissner,
1417
Mike Optis,
1518
Jordan Perr-Sauer,
19+
Sebastian Pfaffel,
1620
Caleb Phillips,
21+
Charlie Plumley,
1722
Eliot Quon,
1823
Sheungwen Sheng,
1924
Eric Simley, and

0 commit comments

Comments
 (0)