updating package infrastructure for compatability with Texas-7k(2030)…

… and Python v3.11
PrincetonUniversity · Apr 9, 2023 · 957b59d · 957b59d
1 parent 0d2aad3
commit 957b59d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/README.md b/README.md
@@ -29,9 +29,13 @@ pip install .
 The Vatic repository includes the [May 2021 version of the Texas-7k grid dataset](
 https://electricgrids.engr.tamu.edu/electric-grid-test-cases/datasets-for-arpa-e-perform-program/)
 produced by [Adam Birchfield et al.](https://ieeexplore.ieee.org/stamp/stamp.jsp?arnumber=8423655) at Texas A&M with a
-few modifications (see release notes). You can also download the smaller testing
-[RTS-GMLC](https://github.com/GridMod/RTS-GMLC) grid for use with Vatic by running
-```cd Vatic; git submodule init; git submodule update; pip install .```.
+few modifications (see release notes).
+
+We have also included a hypothetical 2030 version of the Texas-7k grid in which renewables penetration has
+been increased to roughly 50%, as opposed to 20% in the default 2020 version.
+
+You can additionally download the smaller testing [RTS-GMLC](https://github.com/GridMod/RTS-GMLC) grid for
+use with Vatic by running ```cd Vatic; git submodule init; git submodule update; pip install .```.
 
 
 ## Running Vatic ##
@@ -41,7 +45,7 @@ is:
 
 ```vatic-det $input_grid $start_date $num_days ```
 
-`input_grid` can be either of the currently supported grids: "RTS-GMLC" or "Texas-7k".
+`input_grid` can be either of the currently supported grids: "RTS-GMLC", "Texas-7k", or "Texas-7k_2030."
 
 `start_date` is the first day that will be simulated by Vatic, given in YYYY-MM-DD format. For RTS-GMLC, only dates in
 2020 are supported, while the Texas grids only support dates in 2018.

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setuptools.setup(
     name='Vatic',
-    version='0.4.0',
+    version='0.4.1-a0',
     description='lightweight PJM power grid interface for Egret + Pyomo',
 
     author='Michal Radoslaw Grzadkowski',
@@ -17,7 +17,7 @@
             ],
         },
 
-    python_requires='>=3.8,<3.11',
+    python_requires='>=3.8,<3.12',
     install_requires=[
         'numpy>1.21', 'pandas', 'scipy', 'dill', 'matplotlib',
         'pyomo>=6', 'gurobipy',