Merge pull request #426 from ESMValGroup/version2_initial_release

Prepare for 2.0a0 release
ESMValGroup · Jun 19, 2018 · 82daa49 · 82daa49
2 parents 321b511 + a39e88e
commit 82daa49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,6 +1,6 @@
 
 
-Earth System Model Evaluation Tool VERSION 1.1.0 (the Software) License
+Earth System Model Evaluation Tool VERSION 2 (the Software) License
 
 
 PLEASE READ THIS SOFTWARE LICENSE ("LICENSE") CAREFULLY. USE
@@ -14,7 +14,7 @@ DATE: 26 January 2017
 ========================================================================
 
 
-THIS LICENSE APPLIES TO THE ESMValTool Version 1.1.0 VERSION THAT IS RELEASED AS
+THIS LICENSE APPLIES TO THE ESMValTool Version 2 VERSION THAT IS RELEASED AS
 OPEN-SOURCE SOFTWARE UNDER the Apache License, Version 2.0
 
 ========================================================================

diff --git a/doc/RELEASE_NOTES → RELEASE_NOTES b/doc/RELEASE_NOTES → RELEASE_NOTES
@@ -2,6 +2,12 @@
 ####### ESMValTool - Earth System Model Evaluation Tool - RELEASE NOTES #######
 ###############################################################################
 
+===============================================================================
+Version 2.0aX - June 2018
+===============================================================================
+Completely revised version of ESMValTool. This are alpha releases, intended
+to be used solely as a preview of the upcoming version 2 release.
+
 ===============================================================================
 Version 1.1.0 - January 2017
 ===============================================================================

diff --git a/esmvaltool/_version.py b/esmvaltool/_version.py
@@ -1,2 +1,2 @@
 """ESMValTool version"""
-__version__ = '2.0.0'
+__version__ = '2.0a0'
diff --git a/meta.yaml b/meta.yaml
@@ -13,10 +13,10 @@ package:
 
 source:
   # Use these two lines to build a release:
-  # git_rev: v{{ version }}
-  # git_url: https://github.com/ESMValGroup/ESMValTool.git
+  git_rev: v{{ version }}
+  git_url: https://github.com/ESMValGroup/ESMValTool.git
   # Use this line instead of the above to test building without a release:
-  path: .
+  # path: .
 
 build:
   # Increment the build number when building a new conda package of the same