Skip to content

Commit

Permalink
Bump version to 2024.2.0 and release prep (#1161)
Browse files Browse the repository at this point in the history
  • Loading branch information
anamileva authored Oct 4, 2024
1 parent 23d2e44 commit 1821050
Show file tree
Hide file tree
Showing 9 changed files with 176 additions and 157 deletions.
226 changes: 111 additions & 115 deletions db/db_schema.sql

Large diffs are not rendered by default.

5 changes: 1 addition & 4 deletions doc/source/database.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,16 @@ This chapter describes the following:
* :ref:`building-the-database-section-ref` : instructions on how to build the
database
* :ref:`database-testing-section-ref` : instructions on how to validate the
database inputs
database inputs

.. _database-section-ref:

Database Structure
##################

.. automodule:: db


.. _building-the-database-section-ref:

Building the Database
#####################

Expand Down Expand Up @@ -455,4 +453,3 @@ To run the validation suite from the command line, navigate to the
:code:`gridpath/gridpath` folder and type::

validate_inputs.py --scenario SCENARIO_NAME --database PATH/TO/DATABASE

8 changes: 4 additions & 4 deletions doc/source/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ Running GridPath requires a Python 3 installation. GridPath is `tested nightly
Python 3.9, 3.10, and 3.11. You can get Python `here <https://www.python.org/downloads/>`__.

.. _python-virtual-env-section-ref:

Python Virtual Environment
--------------------------
You must set up a Python virtual environment for GridPath to ensure
Expand Down Expand Up @@ -83,8 +82,8 @@ instructions for Windows `here <https://www.java.com/en/download/help/path
Installing GridPath
===================

Before installing, **make sure to activate your :ref:`GridPath virtual environment
<python-virtual-env-section-ref>`**.
Before installing, make sure to activate your
:ref:`GridPath Python virtual environment<python-virtual-env-section-ref>`.

Installation from PyPi
----------------------
Expand Down Expand Up @@ -162,4 +161,5 @@ We recommend `SQLite Studio <https://sqlitestudio.pl/index.rvt>`_ as an SQLite
database GUI.

We have implemented various tools to help you build your database. See the
:ref:`database-section-ref` section of the documentation for more information.
:ref:`building-the-database-section-ref` section of the documentation
for more information.
84 changes: 55 additions & 29 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,63 +1,89 @@
alabaster==0.7.16
aniso8601==9.0.1
Babel==2.14.0
black==24.2.0
asttokens==2.4.1
attrs==24.2.0
babel==2.16.0
black==24.8.0
bokeh==2.2.3
certifi==2024.2.2
certifi==2024.8.30
charset-normalizer==3.3.2
click==8.1.7
coverage==6.5.0
coveralls==3.3.1
coverage==7.6.1
coveralls==4.0.1
decorator==5.1.1
df2img==0.2.19
dill==0.3.7
dnspython==2.4.2
docopt==0.6.2
docutils==0.20.1
eventlet==0.33.3
executing==2.1.0
fastjsonschema==2.20.0
Flask==2.0.1
Flask-RESTful==0.3.9
Flask-SocketIO==4.3.2
greenlet==3.0.3
GridPath==2024.1.0
gurobipy==11.0.0
idna==3.6
greenlet==3.1.1
GridPath==2024.2.0
gurobipy==11.0.3
idna==3.10
imagesize==1.4.1
itsdangerous==2.1.2
ipython==8.28.0
itsdangerous==2.2.0
jedi==0.19.1
Jinja2==3.0.3
jsonschema==4.23.0
jsonschema-specifications==2023.12.1
jupyter_core==5.7.2
kaleido==0.2.1
MarkupSafe==2.1.5
matplotlib-inline==0.1.7
mypy-extensions==1.0.0
nbformat==5.10.4
networkx==3.1
nose==1.3.7
numpy==1.26.4
packaging==23.2
packaging==24.1
pandas==2.2.1
parso==0.8.4
pathspec==0.12.1
pillow==10.2.0
platformdirs==4.2.0
pexpect==4.9.0
pillow==10.4.0
platformdirs==4.3.6
plotly==5.24.1
ply==3.11
prompt_toolkit==3.0.48
pscript==0.7.5
psutil==5.9.6
Pygments==2.17.2
Pyomo==6.7.1
python-dateutil==2.8.2
ptyprocess==0.7.0
pure_eval==0.2.3
Pygments==2.18.0
Pyomo==6.8.0
python-dateutil==2.9.0.post0
python-engineio==3.14.2
python-socketio==4.6.1
pytz==2024.1
pytz==2024.2
PyUtilib==6.0.0
PyYAML==6.0.1
requests==2.31.0
PyYAML==6.0.2
referencing==0.35.1
requests==2.32.3
rpds-py==0.20.0
six==1.16.0
snowballstemmer==2.2.0
Sphinx==7.2.6
sphinx-argparse==0.4.0
sphinxcontrib-applehelp==1.0.8
sphinxcontrib-devhelp==1.0.6
sphinxcontrib-htmlhelp==2.0.5
sphinxcontrib-applehelp==2.0.0
sphinxcontrib-devhelp==2.0.0
sphinxcontrib-htmlhelp==2.1.0
sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.7
sphinxcontrib-serializinghtml==1.1.10
tornado==6.4
typing_extensions==4.10.0
tzdata==2024.1
urllib3==2.2.1
websocket-client==1.7.0
sphinxcontrib-qthelp==2.0.0
sphinxcontrib-serializinghtml==2.0.0
stack-data==0.6.3
tenacity==9.0.0
tornado==6.4.1
traitlets==5.14.3
typing_extensions==4.12.2
tzdata==2024.2
urllib3==2.2.3
wcwidth==0.2.13
websocket-client==1.8.0
Werkzeug==2.0.2
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
keywords=["energy", "electricity", "power", "renewables", "planning", "operations"],
packages=find_packages(),
install_requires=[
"Pyomo==6.7.1", # Optimization modeling language
"Pyomo==6.8.0", # Optimization modeling language
"pandas==2.2.1", # Data-processing
"bokeh==2.2.3", # Visualization library (required - see #779)
"pscript==0.7.5", # Python to JavaScript compiler (for viz)
Expand Down
2 changes: 1 addition & 1 deletion ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "gridpath-ui",
"version": "2024.1.0",
"version": "2024.2.0",
"main": "src/electron-main.js",
"scripts": {
"ng": "ng",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>GridPath v2024.1.0</title>
<title>GridPath v2024.2.0</title>
<base href="./">

<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
2 changes: 1 addition & 1 deletion version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "v2024.1.0"
__version__ = "v2024.2.0"

0 comments on commit 1821050

Please sign in to comment.