From 1e4fba1360bf71dbf185c58519d884f86b727d05 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 10 Nov 2010 10:26:07 -0500 Subject: [PATCH] Backed out changeset 081ce300b688 (some files accidentally committed). --- scripts/taxonomy/processTaxonomy.sh | 4 - static/welcome.html | 217 ++---------------------- test/functional/test_sample_tracking.py | 2 - 3 files changed, 13 insertions(+), 210 deletions(-) diff --git a/scripts/taxonomy/processTaxonomy.sh b/scripts/taxonomy/processTaxonomy.sh index 3c82f45776c..95c6c973a69 100755 --- a/scripts/taxonomy/processTaxonomy.sh +++ b/scripts/taxonomy/processTaxonomy.sh @@ -10,9 +10,5 @@ cat gi_taxid_nucl.dmp gi_taxid_prot.dmp > gi_taxid_all.dmp echo "Sorting gi2tax files..." sort -n -k 1 gi_taxid_all.dmp > gi_taxid_sorted.txt rm gi_taxid_nucl.dmp gi_taxid_prot.dmp gi_taxid_all.dmp -echo "Removing parenthesis from names.dmp" -cat names.dmp | sed s/\(/_/g | sed s/\)/_/g > names.temporary -mv names.dmp names.dmp.orig -mv names.temporary names.dmp diff --git a/static/welcome.html b/static/welcome.html index 28447e46e67..b90fba2ad82 100644 --- a/static/welcome.html +++ b/static/welcome.html @@ -2,211 +2,20 @@ - - - - - - - + + -
-

Here is what's happening...

-
- - - - - -
- -

Live Quickies

- - - - - -
-
-
-
- -

The Galaxy team is a part of BX at Penn State.

- -This project is supported in part by NSF, NHGRI, The Huck Institutes of the Life Sciences, and The Institute for CyberScience at Penn State. -

Galaxy build: $Rev 3885:1ab9d6b0ddfc$

-
- +
+
+ Hello world! It's running... +
+ To customize this page edit static/welcome.html +
+
+ WWFSMD? +
+ This project is supported in part by NSF, NHGRI, and the Huck Institutes of the Life Sciences. +
diff --git a/test/functional/test_sample_tracking.py b/test/functional/test_sample_tracking.py index 46b50a03093..3282d1275b9 100644 --- a/test/functional/test_sample_tracking.py +++ b/test/functional/test_sample_tracking.py @@ -388,7 +388,6 @@ class TestFormsAndRequests( TwillTestCase ): % ( request_two.name, request_two.states.REJECTED ) def test_055_reset_data_for_later_test_runs( self ): """Reseting data to enable later test runs to pass""" - ''' # Logged in as admin_user ################## # Delete request_type permissions @@ -433,4 +432,3 @@ class TestFormsAndRequests( TwillTestCase ): # Manually delete the group from the database refresh( group ) delete( group ) - '''