Updated version for v2.2.2 release

VisTrails · Jul 9, 2015 · 244ecd1 · 244ecd1
1 parent 9bd2afa
commit 244ecd1
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,6 @@
 RELEASE NOTES
 -------------
-Release Name: v2.2.2 build f82afe43c098 from v2.2 branch
+Release Name: v2.2.2 build 9bd2afa387a4 from v2.2 branch
 
 Bug fixes:
  - prevents introducing cycles in pipeline view (#1097)

diff --git a/doc/usersguide/conf.py b/doc/usersguide/conf.py
@@ -45,9 +45,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = 'master'
+version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.1'
+release = '2.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/scripts/create_release_wiki_table.py b/scripts/create_release_wiki_table.py
@@ -6,11 +6,11 @@
 """
 from datetime import date
 #Release version
-VT_VERSION = "2.2.1"
-VT_REVISION = "c366dbcb640c"
+VT_VERSION = "2.2.2"
+VT_REVISION = "9bd2afa387a4"
 #Sourceforge information
 SF_ROOT_URL = "http://downloads.sourceforge.net/project/vistrails/vistrails/"
-SF_FOLDER_NAME = "v2.2.1"
+SF_FOLDER_NAME = "v2.2.2"
 SF_DOWNLOAD_URL = "%s%s"%(SF_ROOT_URL,SF_FOLDER_NAME)
 #binaries names
 MAC_64_BIN = "vistrails-mac-10.6-intel-%s-%s.dmg"%(VT_VERSION, VT_REVISION)

diff --git a/scripts/dist/common/splash/splash.svg b/scripts/dist/common/splash/splash.svg
diff --git a/scripts/dist/mac/make_app b/scripts/dist/mac/make_app
@@ -17,7 +17,7 @@ exit 0
 fi
 VOL="$1"
 DMG="$VOL.dmg"
-ALPS_VERSION="2.2.b3-r7568"
+ALPS_VERSION="2.2.b4"
 ALPS_URL="http://archive.comp-phys.org/software/vistrails/"
 ALPS_FILE="alps-vistrails-${ALPS_VERSION}-macosx-10.6.tar.gz"
 echo "removing build and dist folders..."

diff --git a/scripts/dist/mac/setup.py b/scripts/dist/mac/setup.py
@@ -43,7 +43,7 @@
 from setuptools import setup
 import sys
 
-VERSION = '2.2.1'
+VERSION = '2.2.2'
 
 # Add VTK 6.2 to path
 sys.path.insert(0,'/Users/vistrails/src/VTK6/build/Wrapping/Python')

diff --git a/scripts/dist/source/make-vistrails-src-build.py b/scripts/dist/source/make-vistrails-src-build.py
@@ -34,13 +34,13 @@
 EXPORT_PATHS = "vistrails doc examples extensions scripts CHANGELOG LICENSE".split()
 
 # VisTrails Release Version
-VT_VERSION = '2.2.1'
+VT_VERSION = '2.2.2'
 
 # Branch to be used to build release
-VT_BRANCH = 'master'
+VT_BRANCH = 'v2.2'
 
 # Hash used in the release
-VT_HASH = 'c366dbcb640c'
+VT_HASH = '9bd2afa387a4'
 
 # Distribution Tarball name (Do not add ".tar.gz")
 #TARBALL_NAME = "vistrails-src-%s-%s" % (VT_VERSION, VT_HASH)

diff --git a/scripts/dist/windows/vistrails-gdal.iss b/scripts/dist/windows/vistrails-gdal.iss
@@ -38,7 +38,7 @@
 
 [Setup]
 AppName=VisTrails
-AppVerName=VisTrails 2.2.1
+AppVerName=VisTrails 2.2.2
 OutputBaseFilename=vistrails-gdal-setup
 DefaultGroupName=VisTrails
 

diff --git a/scripts/dist/windows/vistrails.iss b/scripts/dist/windows/vistrails.iss
@@ -38,7 +38,7 @@
 
 [Setup]
 AppName=VisTrails
-AppVerName=VisTrails 2.2.1
+AppVerName=VisTrails 2.2.2
 OutputBaseFilename=vistrails-setup
 DefaultGroupName=VisTrails
 

diff --git a/scripts/dist/windows/vistrailsx64-gdal.iss b/scripts/dist/windows/vistrailsx64-gdal.iss
@@ -39,7 +39,7 @@
 
 [Setup]
 AppName=VisTrails x64
-AppVerName=VisTrails x64 2.2.1
+AppVerName=VisTrails x64 2.2.2
 OutputBaseFilename=vistrails-x64-gdal-setup
 DefaultGroupName=VisTrails x64
 

diff --git a/scripts/dist/windows/vistrailsx64.iss b/scripts/dist/windows/vistrailsx64.iss
@@ -39,7 +39,7 @@
 
 [Setup]
 AppName=VisTrails x64
-AppVerName=VisTrails x64 2.2.1
+AppVerName=VisTrails x64 2.2.2
 ArchitecturesInstallIn64BitMode=x64
 OutputBaseFilename=vistrails-x64-setup
 DefaultGroupName=VisTrails x64

diff --git a/scripts/get_usersguide.py b/scripts/get_usersguide.py
@@ -42,7 +42,7 @@
 
 this_dir = os.path.dirname(os.path.abspath(__file__))
 
-DOWNLOAD_URL = "http://www.vistrails.org/usersguide/dev/html/VisTrails.pdf"
+DOWNLOAD_URL = "http://www.vistrails.org/usersguide/v2.2/html/VisTrails.pdf"
 SAVE_TO = os.path.abspath(sys.argv[1]) if len(sys.argv) > 1 else this_dir
 
 # http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python

diff --git a/setup.py b/setup.py
@@ -39,7 +39,7 @@
 Who we are: http://www.vistrails.org/index.php/People
 """
 setup(name='vistrails',
-      version='2.2.1',
+      version='2.2.2',
       packages=packages,
       include_package_data=True,
       entry_points={

diff --git a/vistrails/core/system/__init__.py b/vistrails/core/system/__init__.py
@@ -298,7 +298,7 @@ def default_connections_file():
     """
     return os.path.join(current_dot_vistrails(), 'connections.xml')
 
-VERSION = '2.2.1'
+VERSION = '2.2.2'
 def vistrails_version():
     """vistrails_version() -> string - Returns the current VisTrails version."""
     # 0.1 was the Vis2005 version

diff --git a/vistrails/gui/resources/images/vistrails_splash.png b/vistrails/gui/resources/images/vistrails_splash.png