Merge remote-tracking branch 'upstream/develop' into weis

ewquon · Mar 18, 2021 · d748c9f · d748c9f
2 parents 9b123f1 + 53343d1
commit d748c9f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 57 deletions.
diff --git a/HISTORY.md b/HISTORY.md
diff --git a/docs/conf.py b/docs/conf.py
@@ -74,8 +74,10 @@
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-version = "2.1.1"
-release = "2.3.0"
+# The short X.Y version.
+version = '2.2'
+# The full version, including alpha/beta/rc tags.
+release = 'v2.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -41,7 +41,7 @@
 EMAIL = 'nikhar.abbas@nrel.gov'
 AUTHOR = 'NREL National Wind Technology Center'
 REQUIRES_PYTHON = '>=3.4'
-VERSION = '2.1.0'
+VERSION = '2.2.0'
 
 # These packages are required for all of the code to be executed. 
 # - Maybe you can get away with older versions...