Merge pull request #2 from galaxyproject/dev

Stays up-to-date with galaxy dev branch

CONTRIBUTORS.md

@@ -20,6 +20,7 @@ The following individuals have contributed code to Galaxy:
 * Dave Bouvier <[email protected]>
 * Adam Brenner <[email protected]>
 * Anthony Bretaudeau <[email protected]> <[email protected]>
+* Christian Y. Brenninkmeijer <[email protected]>
 * Freek de Bruijn <[email protected]>
 * Richard Burhans <[email protected]>
 * Jennifer Cabral <[email protected]>
@@ -37,14 +38,19 @@ The following individuals have contributed code to Galaxy:
 * Michael R. Crusoe <[email protected]>
 * Gianmauro Cuccuru <[email protected]>
 * Frederik Delaere <[email protected]>
+* Matthias Desmet <[email protected]>
 * Olivia Doppelt <[email protected]>
+* Shane Dowling <[email protected]>
 * John Duddy <[email protected]>
 * Carl Eberhard <[email protected]>
+* Mark Einon <[email protected]>
 * Kyle Ellrott <[email protected]> <[email protected]>
 * Eric Enns <[email protected]>
+* fescudie <[email protected]>
 * Dorine Francheteau <[email protected]>
 * Jaime Frey <[email protected]>
 * Carrie Ganote <[email protected]>
+* Ryan Golhar <[email protected]>
 * Jeremy Goecks <[email protected]> <[email protected]>
 * Nuwan Goonasekera <[email protected]>
 * Björn Grüning <[email protected]> <[email protected]>
@@ -67,27 +73,35 @@ The following individuals have contributed code to Galaxy:
 * Rory Kirchner <[email protected]>
 * Brad Langhorst <[email protected]>
 * Ross Lazarus <[email protected]> <[email protected]>
+* Gildas Le Corguillé @lecorguille
 * Simone Leo <[email protected]>
 * Kanwei Li <[email protected]>
 * Michael Li <[email protected]>
+* Mikael Loaec <[email protected]>
 * Philip Mabon <[email protected]>
 * Remi Marenco <[email protected]> <[email protected]>
+* Zipho Mashologu <[email protected]>
 * Thomas McGowan <[email protected]>
 * Scott McManus <[email protected]> <[email protected]>
 * Hunter Moseley <[email protected]>
+* Takao Nakaguchi <[email protected]>
 * Arjun Nath <[email protected]>
 * Anton Nekrutenko <[email protected]> <[email protected]>
 * Eric Paniagua <[email protected]>
 * Richard Park <[email protected]>
 * Lance Parsons <[email protected]>
 * Chinmay Rao <[email protected]>
+* Matt Ralston <[email protected]>
 * Eric Rasche <[email protected]> <[email protected]> <[email protected]>
 * Andrew Robinson <[email protected]>
+* Michael Sauria <[email protected]>
 * Andrea Sbardellati <[email protected]>
 * Ian Schenck <[email protected]>
 * Nick Semenkovich <[email protected]>
 * Matthew Shirley <[email protected]>
+* Sourav Singh <[email protected]>
 * Clare Sloggett <[email protected]>
+* Eteri Sokhoyan @Sokhoyan
 * Nicola Soranzo <[email protected]> <[email protected]> <[email protected]>
 * Roy Storey <[email protected]>
 * Hanfei Sun <[email protected]>
@@ -97,13 +111,17 @@ The following individuals have contributed code to Galaxy:
 * David Trudgian <[email protected]> <[email protected]>
 * Nitesh Turaga <[email protected]>
 * Clayton Turner <[email protected]>
+* Jesse c j van Dam <[email protected]>
 * Marek Vavruša <[email protected]>
 * Martijn Vermaat <[email protected]>
 * Kelly Vincent <[email protected]>
 * Greg Von Kuster <[email protected]>
+* Pavan Videm <[email protected]>
 * Hiral Vora <[email protected]>
 * Andrew Warren <[email protected]>
 * Trevor Wennblom <[email protected]>
+* Thomas Wollmann <[email protected]> <[email protected]>
+* Jay Young <[email protected]>
 * Yi Zhang <[email protected]>
 
 # Institutional sponsors

Makefile

@@ -5,6 +5,7 @@ RELEASE_NEXT:=16.04
 #RELEASE_NEXT_BRANCH:=release_$(RELEASE_NEXT)
 RELEASE_NEXT_BRANCH:=dev
 RELEASE_UPSTREAM:=upstream
+MY_UPSTREAM:=origin
 # Location of virtualenv used for development.
 VENV?=.venv
 # Source virtualenv to execute command (flake8, sphinx, twine, etc...)
@@ -63,10 +64,7 @@ grunt: npm-deps ## Calls out to Grunt to build client
 style: npm-deps ## Calls the style task of Grunt
 	cd client && node_modules/grunt-cli/bin/grunt style
 
-webpack: npm-deps ## Pack javascript
-	cd client && node_modules/webpack/bin/webpack.js -p
-
-client: grunt style webpack ## Rebuild all client-side artifacts
+client: grunt style ## Rebuild all client-side artifacts
 
 grunt-docker-image: ## Build docker image for running grunt
 	docker build -t ${GRUNT_DOCKER_NAME} client
@@ -79,12 +77,12 @@ clean-grunt-docker-image: ## Remove grunt docker image
 
 
 # Release Targets
-release-create-rc: release-ensure-upstream ## Create a release-candidate branch 
+release-create-rc: release-ensure-upstream ## Create a release-candidate branch
 	git checkout dev
 	git pull --ff-only $(RELEASE_UPSTREAM) dev
-	git push origin dev
+	git push $(MY_UPSTREAM) dev
 	git checkout -b release_$(RELEASE_CURR)
-	git push origin release_$(RELEASE_CURR)
+	git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
 	git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
 	git checkout -b version-$(RELEASE_CURR)
 	sed -i "s/^VERSION_MAJOR = .*/VERSION_MAJOR = \"$(RELEASE_CURR)\"/" lib/galaxy/version.py
@@ -102,24 +100,25 @@ release-create-rc: release-ensure-upstream ## Create a release-candidate branch
 	git checkout --ours lib/galaxy/version.py
 	git add lib/galaxy/version.py
 	git commit -m "Merge branch 'version-$(RELEASE_CURR)' into version-$(RELEASE_NEXT).dev"
-	git push origin version-$(RELEASE_CURR):version-$(RELEASE_CURR)
-	git push origin version-$(RELEASE_NEXT).dev:version-$(RELEASE_NEXT).dev
+	git push $(MY_UPSTREAM) version-$(RELEASE_CURR):version-$(RELEASE_CURR)
+	git push $(MY_UPSTREAM) version-$(RELEASE_NEXT).dev:version-$(RELEASE_NEXT).dev
 	git branch -d version-$(RELEASE_CURR)
 	git branch -d version-$(RELEASE_NEXT).dev
 	# TODO: Use hub to automate these PR creations or push directly.
 	@echo "Open a PR from version-$(RELEASE_CURR) of your fork to release_$(RELEASE_CURR)"
 	@echo "Open a PR from version-$(RELEASE_NEXT).dev of your fork to dev"
 
-create_release: release-ensure-upstream ## Create a release branch
+release-create: release-ensure-upstream ## Create a release branch
+	git checkout master
 	git pull --ff-only $(RELEASE_UPSTREAM) master
-	git push origin master
+	git push $(MY_UPSTREAM) master
 	git checkout release_$(RELEASE_CURR)
 	git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
-	#git push origin release_$(RELEASE_CURR)
+	#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
 	git checkout dev
 	git pull --ff-only $(RELEASE_UPSTREAM) dev
-	#git push origin dev
-	# Test run of merging. If there are conflicts, it will fail here here.
+	#git push $(MY_UPSTREAM) dev
+	# Test run of merging. If there are conflicts, it will fail here.
 	git merge release_$(RELEASE_CURR)
 	git checkout release_$(RELEASE_CURR)
 	sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = None/" lib/galaxy/version.py
@@ -134,20 +133,20 @@ create_release: release-ensure-upstream ## Create a release branch
 	git commit -m "Merge branch 'release_$(RELEASE_CURR)' into dev"
 	git checkout master
 	git merge release_$(RELEASE_CURR)
-	#git push origin release_$(RELEASE_CURR):release_$(RELEASE_CURR)
-	#git push origin dev:dev
-	#git push origin master:master
-	#git push origin --tags
+	#git push $(RELEASE_UPSTREAM) release_$(RELEASE_CURR):release_$(RELEASE_CURR)
+	#git push $(RELEASE_UPSTREAM) dev:dev
+	#git push $(RELEASE_UPSTREAM) master:master
+	#git push $(RELEASE_UPSTREAM) --tags
 
-create_point_release: ## Create a point release
+release-create-point: ## Create a point release
 	git pull --ff-only $(RELEASE_UPSTREAM) master
-	git push origin master
+	git push $(MY_UPSTREAM) master
 	git checkout release_$(RELEASE_CURR)
 	git pull --ff-only $(RELEASE_UPSTREAM) release_$(RELEASE_CURR)
-	#git push origin release_$(RELEASE_CURR)
+	#git push $(MY_UPSTREAM) release_$(RELEASE_CURR)
 	git checkout $(RELEASE_NEXT_BRANCH)
 	git pull --ff-only $(RELEASE_UPSTREAM) $(RELEASE_NEXT_BRANCH)
-	#git push origin $(RELEASE_NEXT_BRANCH)
+	#git push $(MY_UPSTREAM) $(RELEASE_NEXT_BRANCH)
 	git merge release_$(RELEASE_CURR)
 	git checkout release_$(RELEASE_CURR)
 	sed -i "s/^VERSION_MINOR = .*/VERSION_MINOR = \"$(RELEASE_CURR_MINOR_NEXT)\"/" lib/galaxy/version.py

README.rst

@@ -22,7 +22,7 @@ The latest information about Galaxy is available via `https://galaxyproject.org/
 Galaxy Quickstart
 =================
 
-Galaxy requires Python 2.6 or 2.7. To check your python version, run:
+Galaxy requires Python 2.7 To check your python version, run:
 
 .. code:: console
 

client/bower.json

@@ -8,14 +8,14 @@
   ],
   "homepage": "usegalaxy.org",
   "dependencies": {
-    "jquery": "~1.11.1",
+    "jquery": "~1.12",
     "tracekit": "*",
-    "ravenjs": "~1.1.16",
-    "underscore": "~1.7.0",
-    "backbone": "~1.1.2",
+    "ravenjs": "~3",
+    "underscore": "~1",
+    "backbone": "~1.3",
     "bootstrap": "~3.3.2",
     "bootstrap-tour": "~0.10.2",
-    "d3": "~3.5.3",
+    "d3": "~3",
     "farbtastic": "~2.0.0-alpha.1",
     "toastr": "~2.1.0",
     "jQTouch": "git://github.com/senchalabs/jQTouch#~1.0.0",
@@ -31,11 +31,10 @@
     "jstree": "~3.0.9",
     "jquery-ui": "git://github.com/jquery/jquery-ui.git#~1.11.2",
     "threedubmedia.jquery.event": "*",
-    "jquery-migrate": "~1.2.1",
-    "requirejs": "~2.1.17"
+    "jquery-migrate": "~1.4",
+    "requirejs": "~2"
   },
   "resolutions": {
-    "jquery": "~1.11.1"
-  },
-  "devDependencies": {}
+    "jquery": "~1.12"
+  }
 }