Skip to content

Commit f4490ba

Browse files
committed
Merge branch 'release/gitools-2.2.3'
2 parents 5519e7c + 21c94c0 commit f4490ba

File tree

57 files changed

+1133
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1133
-397
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
language: java

changelog.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Gitools 2.2.3
2+
------------------------------------------------------------
3+
* Biomart sources update
4+
* Windows .executable at root: gitools.exe
5+
* Unix (Linux & OS X) executable at root: gitools
6+
* Use always the proxy settings if present
7+
* Reduce network connection timeout
8+
* Fix empty string header sort
9+
* Fix proxy issues for downloading datasets
10+
* Improve hierarchical cluster sorting
11+
* Hierarchical clusters color palettes
12+
* Choose visible levels of hierarchical clustering
13+
* Choose amount of levels for hierarchical clusters
14+
115
Gitools 2.2.2
216
------------------------------------------------------------
317
* Preliminary mutex analysis
@@ -6,7 +20,7 @@ Gitools 2.2.2
620
* Bugfix: Numeric header sorting
721
* Non-0 event function for linear numeric (color) scale
822
* Numeric Header value formatter
9-
23+
* Update color scale load in numeric header wizard
1024

1125
Gitools 2.2.1
1226
-------------------------------------------------------------

doc/source/Tutorials_Tutorial21.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Files needed
1818
Import human KEGG pathway modules using Gitools
1919
-----------------------------------------------
2020

21-
- Import human KEGG pathways. See `this chapter <UserGuide_KEGG.rst>`__ of the user guide for further guidance.
21+
- Import human KEGG pathways. See :doc:`this chapter <UserGuide_KEGG>` of the user guide for further guidance.
2222

2323
- Select “Affy HG U133-PLUS-2” as identifiers for the genes, which correspond to the probe identifiers we have in our dataset.
2424

@@ -30,7 +30,7 @@ Import human KEGG pathway modules using Gitools
3030
Perform an enrichment analysis with Gitools
3131
-------------------------------------------
3232

33-
- See `this chapter <UserGuide_Enrichment.rst>`__ for details on how to perform enrichment analysis
33+
- See :doc:`this chapter <UserGuide_Enrichment>` for details on how to perform enrichment analysis
3434

3535
- Select gse19188\_median-centered.cdm.gz as data file
3636

@@ -42,7 +42,7 @@ Perform an enrichment analysis with Gitools
4242

4343
- Give a name to the analysis. Select a directory where to safe it and click Finish.
4444

45-
- If you have a memory problem, see memory configuration in ( `Installation Guide <UserGuide_Installation.rst>`__ ) to increase the memory allocated to run Gitools.
45+
- If you have a memory problem, see memory configuration in ( `Installation Guide <UserGuide_Installation>` ) to increase the memory allocated to run Gitools.
4646

4747

4848
Use annotations for pathways and annotation colors for samples

doc/source/UserGuide_Installation.rst

Lines changed: 78 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -4,149 +4,150 @@ Installation
44

55
.. contents::
66

7-
8-
Installing Gitools locally
9-
-----------------------------
7+
Extract and execute
8+
---------------------
109

1110
You can download the last version of Gitools from `http://www.gitools.org/download <http://www.gitools.org/download>`__
1211

13-
Gitools depends on Java 7 or higher. Java must be installed in order to run Gitools. Once Java is set up, follow
12+
Gitools depends on Java 7 (also called 1.7) or higher. Java must be installed in order to run Gitools. Once Java is set up, follow
1413
the steps below.
1514

1615
* Download the latest Gitools version
1716
* Uncompress the zip file into a folder (preferably in your Applications folder)
18-
* Enter the Gitools-folder called where you find another folder called, ``bin``. *Depending on your operating system* you will have to click or double click one of the following files:
19-
* Windows: **gitools-2GB.bat**
17+
* Enter the Gitools-folder. *Depending on your operating system* you will have to click or double click one of the following files:
18+
* Windows: **gitools.exe**
2019
* Mac OS X: **gitools**
2120
* Linux: **gitools**
2221

2322

24-
Setting up Java JDK
23+
Windows
2524
--------------------------------------
2625

27-
If your system doesn not have Java already installed, dwonload the latest version of
28-
**Java 7 JDK**, from `www.oracle.com/technetwork/java/javase/downloads <www.oracle.com/technetwork/java/javase/downloads>`__.
29-
30-
Depending on your platform download the file for:
31-
32-
* Linux x64
33-
* Mac OS X x64
34-
* Windows x64
26+
Specific instructions for Windows
3527

36-
If your machine is not a 64-bit machine, download the x86 version
28+
Java JDK installation
29+
##########################
3730

38-
Depending on the platform the installation is different:
31+
If Java is not yet installed download the **Java 7 JDK** from `http://www.oracle.com/technetwork/java/javase/downloads <http://www.oracle.com/technetwork/java/javase/downloads>`__.
3932

40-
**Windows**
33+
* If your machine is not a 64-bit machine, download the x86 version.
34+
* Install the .exe file
4135

42-
Install the .exe file
36+
Memory configuration
37+
########################
4338

44-
**OS X**
39+
The windows executable (gitools.exe) tries to find out how much RAM is available and assigns it to the application.
40+
If you get an error that says *java.lang.OutOfMemoryException*, please free some RAM before running Gitools
4541

46-
Install the .dmg file normally. Note that you need to install the JDK version of Java, otherwise Gitools
47-
does not have access to the updated java.
42+
Adding Gitools to the command line (optional)
43+
###############################################
4844

49-
**Linux**
45+
- You need to have java installed. Go to this website to download and install; `http://www.java.com/en/download/You <http://www.java.com/en/download/You>`__
46+
- `http://www.java.com/en/download/You <http://www.java.com/en/download/You>`__ need to add path of java after set up; go here to do this: `http://www.java.com/en/download/help/path.xml. <http://www.java.com/en/download/help/path.xml.>`__ This will tell your computer where to find the java program add these two paths: **c:\\ java-directory\\ bin** and **c:\\ java-directory\\ lib** where c:\\ javadirectory will be the place where java is installed and where the bin and lib directors are found in the java installation directory.
47+
- You need to add the path of the Gitools bin directory also in order to run the Gitools in the same path variable ( just like you added the other two paths) add ** c:\\ gitoolsdirectory\\ bin** and **c:\\ gitoolsdirectory\\ lib** to the path variable. All path variables must be added to existing path (be careful not to delete anything which is already there) and separate each new path with a semicolon. The new path can be added to the front of the existing path followed by a semicolon to separte other existing entries.
48+
- To run the Gitools; just click on the gitools.bat file. You can make a shortcut for this file by righclick and say send to ‘desktop’ and it will creat a shortcut on your desktop for future use.
5049

51-
* Extract the download Java file into a folder
52-
* Open the file ``~/.bashrc`` in order to edit system variables:
53-
* Export the ``JAVA_HOME`` java installation folder as follows: ``export JAVA_HOME="/path/to/folder/jdk1.7.0_60``
54-
* Add the bin filder to your path as follows: ``export PATH = $JAVA_HOME/bin:$PATH``
55-
* Save the file and start gitools from a new terminal
5650

57-
Memory configuration
58-
-----------------------
51+
OS X
52+
--------------------------------------
5953

60-
Gitools is a Java application, and by default it starts with the default memory requirements stablished by most of the Java applications (usually 256 Megabytes). But most probably you will need more than the default, you will realize this when you obtain an exception like this:
54+
Specific instructions for OS X
6155

62-
*java.lang.OutOfMemoryException*
56+
Java JDK installation
57+
##########################
6358

64-
There is a way to configure the memory limits for Gitools the same way that Java does, using the option *-Xmx*. But this configuration should be specified through an enviroment variable called **GITOOLS\_JAVA\_OPTS**. Let’s see some examples of how to do this with different operating systems:
59+
If Java is not yet installed download the **Java 7 JDK** from `http://www.oracle.com/technetwork/java/javase/downloads <http://www.oracle.com/technetwork/java/javase/downloads>`__.
6560

66-
**Windows**
6761

62+
Install the .dmg file normally. Note that you need to install the JDK version of Java, otherwise Gitools
63+
does not have access to the updated java.
6864

69-
- Right-click the **My Computer** icon on
70-
- your desktop and select **Properties**.
71-
- Click the Advanced tab. Click the
72-
- Environment Variables button. Under System Variables, click New.
73-
- Enter the variable name as **GITOOLS\_JAVA\_OPTS**.
74-
- Enter the variable value as follows for 2 GB: **-Xmx2g**.
75-
- Click OK.
76-
- Click Apply Changes.
65+
Memory configuration
66+
########################
7767

78-
**Linux**
7968

80-
Imagine that you want to use 1024 megabytes of memory for Gitools, then edit the **~/.bashrc** file adding a line like this:
69+
Imagine that you want to use 1024 megabytes of memory for Gitools, then edit the **bin/gitools.vmoptions** and **bin/gitools64.vmoptions**
70+
changing the first line accordingly:
8171

82-
``export GITOOLS\_JAVA\_OPTS = ’-Xmx1024m``
72+
``-Xmx1024m``
8373

8474
You can also specify 2 gigabytes like this:
8575

86-
``export GITOOLS\_JAVA\_OPTS = ’-Xmx2g``
76+
``-Xmx2g``
8777

88-
**Mac OS X**
78+
Adding Gitools to the command line (optional)
79+
###############################################
8980

90-
Imagine that you want to use 1024 megabytes of memory for Gitools, then edit the **~/.profile** file adding a line like this:
9181

92-
``export GITOOLS\_JAVA\_OPTS =”-Xmx1024m”``
82+
Imagine that you have uncompressed the zip file into */opt/gitools-2.2.0-bin*. In this case you can add
83+
Gitools to the command line changing the *PATH* variable. In order to do this, just open **~/.profile** file and add
84+
this line at the bottom :
9385

94-
You can also specify 2 gigabytes like this:
86+
``export PATH=/opt/gitools-2.2.0-bin:$PATH``
9587

96-
``export GITOOLS\_JAVA\_OPTS =”-Xmx2g”``
88+
Start a new terminal and you should be able to run Gitools graphical interface typing:
9789

90+
``gitools``
9891

9992

100-
Java Web Start
101-
--------------
10293

103-
Java Web Start is a technology that allows running Java applications directly from the web. This method is very convenient to evaluate the tool, but when used for daily work and to use big amounts of data is better to install it locally.
10494

105-
In the `main page of Gitools <http://www.gitools.org>`__ there is an orange button that says *Launch*. Simply click on it and the application will be downloaded and executed automatically.
106-
107-
It is very easy to use but sometimes the internet navigator doesn’t know how to communicate with Java and launch the application. You can use the following terminal command to launch it:
95+
Linux
96+
--------------------------------------
10897

109-
``javaws http://webstart.gitools.org/default/gitools.jnlp``
98+
Specific instructions for Linux
11099

111100

101+
Java JDK installation
102+
##########################
112103

104+
If Java is not yet installed download the **Java 7 JDK** from `http://www.oracle.com/technetwork/java/javase/downloads <http://www.oracle.com/technetwork/java/javase/downloads>`__.
113105

114-
Adding Gitools to the command line (Advanced)
115-
-----------------------------------------------
106+
* If your machine is not a 64-bit machine, download the x86 version.
107+
* Extract the download Java file into a folder
108+
* Open the file ``~/.bashrc`` in order to edit system variables:
109+
* Export the ``JAVA_HOME`` java installation folder as follows: ``export JAVA_HOME="/path/to/folder/jdk1.7.0_60``
110+
* Add the bin filder to your path as follows: ``export PATH = $JAVA_HOME/bin:$PATH``
111+
* Save the file and start gitools from a new terminal
116112

117-
**Mac OS X**
113+
Memory configuration
114+
########################
118115

119-
Imagine that you have uncompressed the zip file into */opt/gitools-1.5.0-bin*, then you can define the *PATH* variable in
120-
the **~/.profile** file adding a line like this:
121116

122-
``export PATH =/opt/gitools-1.5.0-bin/bin: $PATH``
117+
Imagine that you want to use 1024 megabytes of memory for Gitools, then edit the **bin/gitools.vmoptions** and **bin/gitools64.vmoptions**
118+
changing the first line accordingly:
123119

124-
Start a new terminal and you should be able to run Gitools graphical interface typing:
120+
``-Xmx1024m``
125121

126-
``gitools``
122+
You can also specify 2 gigabytes like this:
127123

124+
``-Xmx2g``
128125

129126

130-
**Linux**
127+
Adding Gitools to the command line (optional)
128+
###############################################
131129

132-
Imagine that you have uncompressed the zip file into * /opt/gitools-1.5.0-bin*, then you can define the *PATH* variable
133-
in the **~/.bashrc** file adding a line like this:
130+
Imagine that you have uncompressed the zip file into */opt/gitools-2.2.0-bin*. In this case you can add
131+
Gitools to the command line changing the *PATH* variable. In order to do this, just open **~/.bashrc** file and add
132+
this line at the bottom :
134133

135-
``export PATH =/opt/gitools-1.5.0-bin/bin: $PATH``
134+
``export PATH=/opt/gitools-2.2.0-bin:$PATH``
136135

137136
Start a new terminal and you should be able to run Gitools graphical interface typing:
138137

139138
``gitools``
140139

141140

142-
**Windows**
141+
Java Web Start
142+
--------------
143+
144+
Java Web Start is a technology that allows running Java applications directly from the web. This method is very convenient to evaluate the tool, but when used for daily work and to use big amounts of data is better to install it locally.
143145

144-
- You need to have java installed. Go to this website to download and install; `http://www.java.com/en/download/You <http://www.java.com/en/download/You>`__
145-
- `http://www.java.com/en/download/You <http://www.java.com/en/download/You>`__ need to add path of java after set up; go here to do this: `http://www.java.com/en/download/help/path.xml. <http://www.java.com/en/download/help/path.xml.>`__ This will tell your computer where to find the java program add these two paths: **c:\\ java-directory\\ bin** and **c:\\ java-directory\\ lib** where c:\\ javadirectory will be the place where java is installed and where the bin and lib directors are found in the java installation directory.
146-
- You need to add the path of the Gitools bin directory also in order to run the Gitools in the same path variable ( just like you added the other two paths) add ** c:\\ gitoolsdirectory\\ bin** and **c:\\ gitoolsdirectory\\ lib** to the path variable. All path variables must be added to existing path (be careful not to delete anything which is already there) and separate each new path with a semicolon. The new path can be added to the front of the existing path followed by a semicolon to separte other existing entries.
147-
- To run the Gitools; just click on the gitools.bat file. You can make a shortcut for this file by righclick and say send to ‘desktop’ and it will creat a shortcut on your desktop for future use.
146+
In the `main page of Gitools <http://www.gitools.org>`__ there is an orange button that says *Launch*. Simply click on it and the application will be downloaded and executed automatically.
148147

148+
It is very easy to use but sometimes the internet navigator doesn’t know how to communicate with Java and launch the application. You can use the following terminal command to launch it:
149149

150+
``javaws http://webstart.gitools.org/default/gitools.jnlp``
150151

151152

152153
Source code
@@ -165,7 +166,7 @@ Download from github or checkout via the command ``[email protected]:gitools/gitool
165166
166167
# Extract it and run
167168
cd target
168-
unzip gitools-2.0.0-bin.zip
169-
gitools-2.0.0/bin/gitools
169+
unzip gitools-2.2.3-bin.zip
170+
gitools-2.2.3/gitools
170171
171172

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
# General information about the project.
4545
project = 'Gitools'
46-
copyright = '2014, Biomedical Lab, Barcelona'
46+
copyright = '2015, Biomedical Lab, Barcelona'
4747

4848
# The version info for the project you're documenting, acts as replacement for
4949
# |version| and |release|, also used in various other places throughout the
@@ -52,7 +52,7 @@
5252
# The short X.Y version.
5353
version = '2.2'
5454
# The full version, including alpha/beta/rc tags.
55-
release = '2.2.2'
55+
release = '2.2.3'
5656

5757
# The language for content autogenerated by Sphinx. Refer to documentation
5858
# for a list of supported languages.

howto-release.txt

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ git pull
66
git push
77

88
# Start a new release or hotfix
9-
git-flow release start gitools-2.2.1
10-
git-flow hotfix start gitools-2.2.1
9+
git-flow release start gitools-2.2.2
10+
git-flow hotfix start gitools-2.2.2
1111

1212
# Update pom.xml version
1313
# The following command only prints to display
1414
# Check that you are going to update only the correct versions:
15-
find . -name pom.xml | awk '{ system("sed 0,/2.1.0/s//2.2.1/ "$0)}' | grep -A2 -B3 2.2.1
15+
find . -name pom.xml | awk '{ system("sed 0,/2.3.0-SNAPSHOT/s//2.2.2/ "$0)}' | grep -A2 -B3 2.2.2
1616

1717
# The following command will apply the changes
1818
# Update all like this:
19-
find . -name pom.xml | awk '{ system("sed -i 0,/2.1.0/s//2.2.1/ "$0)}'
19+
find . -name pom.xml | awk '{ system("sed -i 0,/2.3.0-SNAPSHOT/s//2.2.2/ "$0)}'
2020

2121
# Go to Documentation folder.
2222
# Check in src/conf.py if the version numbers are up to date
@@ -35,16 +35,16 @@ mvn -P test-analysis clean install assembly:assembly
3535

3636
# Test new release
3737
cd target
38-
unzip gitools-2.2.1-bin.zip
39-
gitools-2.2.1/bin/gitools
38+
unzip gitools-2.2.2-bin.zip
39+
gitools-2.2.2/bin/gitools
4040
cd ..
4141

4242
# Deploy ZIP file
43-
scp target/gitools-2.2.1-bin.zip bgadmin@ankara:/usr/local/gitools/www/downloads/
43+
scp target/gitools-2.2.2-bin.zip bgadmin@ankara:/usr/local/gitools/www/downloads/
4444

4545
# Deploy Webstart
4646
# change back to the gitools root folder
47-
./webstart-deploy.sh 2.2.1
47+
./webstart-deploy.sh 2.2.2
4848

4949
# Update this file on the server:
5050
/usr/local/gitools/www/downloads/latest.txt
@@ -56,22 +56,25 @@ make clean
5656
cd ..
5757

5858
# Commit the changes
59-
git commit -a -m "Release version 2.2.1"
59+
git commit -a -m "Release version 2.2.2"
6060

6161
# Finish the release or hotfix
62-
git flow release finish gitools-2.2.1
63-
git flow hotfix finish gitools-2.2.1
62+
git flow release finish gitools-2.2.2
63+
git flow hotfix finish gitools-2.2.2
64+
#if you do it manually, do not forget to create a tag:
65+
git tag -a gitools-2.2.2 -m 'Release 2.2.2'
66+
git push origin --tags
6467

6568
# Check that you are on develop branch
6669
git checkout develop
6770

6871
# Update pom.xml versions to new SNAPSHOT version
6972

7073
# Check that you are going to update only the correct versions:
71-
find . -name pom.xml | awk '{ system("sed 0,/2.2.1/s//2.3.0-SNAPSHOT/ "$0)}' | grep -A2 -B3 2.3.0-SNAPSHOT
74+
find . -name pom.xml | awk '{ system("sed 0,/2.2.2/s//2.3.0-SNAPSHOT/ "$0)}' | grep -A2 -B3 2.3.0-SNAPSHOT
7275

7376
# Update all like this:
74-
find . -name pom.xml | awk '{ system("sed -i 0,/2.2.1/s//2.3.0-SNAPSHOT/ "$0)}'
77+
find . -name pom.xml | awk '{ system("sed -i 0,/2.2.2/s//2.3.0-SNAPSHOT/ "$0)}'
7578

7679
# Commit
7780
git commit -a -m "Next iteration version 2.3.0-SNAPSHOT"

org.gitools.analysis/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>gitools</artifactId>
77
<groupId>org.gitools</groupId>
8-
<version>2.2.2</version>
8+
<version>2.2.3</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

0 commit comments

Comments
 (0)