From 751503958fabda0aae278918b37466fd560ec2cb Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 8 Jul 2019 11:28:04 +0200 Subject: [PATCH] Fixes from PR review --- Makefile | 8 -------- lib/tool_shed/galaxy_install/migrate/check.py | 1 - .../{project_galaxy_util.py => project_galaxy_meta.py} | 2 +- packages/meta/setup.py | 2 +- 4 files changed, 2 insertions(+), 11 deletions(-) rename packages/meta/galaxy/{project_galaxy_util.py => project_galaxy_meta.py} (86%) diff --git a/Makefile b/Makefile index b19a30553d2..777f587abf9 100644 --- a/Makefile +++ b/Makefile @@ -171,14 +171,6 @@ client-eslint: node-deps ## Run client linting client-test-watch: client ## Watch and run qunit tests on changes via Karma cd client && yarn run test-watch -wheels: wheel-galaxy - -# FIXME: it'd be great if client time could be compared against the wheel and -# not rebuild client if unnecessary. But it's really only a problem in dev. -# When this stuff goes into production it won't be as big of a deal. -wheel-galaxy: client - python setup.py bdist_wheel - # Release Targets release-create-rc: release-ensure-upstream ## Create a release-candidate branch git checkout dev diff --git a/lib/tool_shed/galaxy_install/migrate/check.py b/lib/tool_shed/galaxy_install/migrate/check.py index f7a9c8747a6..b7b8582e18f 100644 --- a/lib/tool_shed/galaxy_install/migrate/check.py +++ b/lib/tool_shed/galaxy_install/migrate/check.py @@ -56,7 +56,6 @@ def verify_tools(app, url, galaxy_config_file=None, engine_options={}): if not app.config.running_functional_tests: if tool_shed_accessible: # Automatically update the value of the migrate_tools.version database table column. - # FIXME: this doesn't seem right. manage_tools = os.path.abspath(os.path.join(os.path.dirname(__file__), 'scripts', 'manage_tools.py')) cmd = [executable, manage_tools, 'upgrade', 'tools'] if galaxy_config_file: diff --git a/packages/meta/galaxy/project_galaxy_util.py b/packages/meta/galaxy/project_galaxy_meta.py similarity index 86% rename from packages/meta/galaxy/project_galaxy_util.py rename to packages/meta/galaxy/project_galaxy_meta.py index ade2b2ef107..96958e8d653 100644 --- a/packages/meta/galaxy/project_galaxy_util.py +++ b/packages/meta/galaxy/project_galaxy_meta.py @@ -7,7 +7,7 @@ PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" PROJECT_URL = "https://github.com/galaxyproject/galaxy" PROJECT_AUTHOR = 'Galaxy Project and Community' PROJECT_DESCRIPTION = 'Galaxy Server Metapackage' -PROJECT_EMAIL = 'jmchilton@gmail.com' +PROJECT_EMAIL = 'galaxy-committers@lists.galaxyproject.org' RAW_CONTENT_URL = "https://raw.github.com/%s/%s/master/" % ( PROJECT_USERAME, PROJECT_NAME ) diff --git a/packages/meta/setup.py b/packages/meta/setup.py index 0edfd7a4e2d..ba0cd02ba7b 100644 --- a/packages/meta/setup.py +++ b/packages/meta/setup.py @@ -13,7 +13,7 @@ SOURCE_DIR = "galaxy" _version_re = re.compile(r'__version__\s+=\s+(.*)') -with open('%s/project_galaxy_util.py' % SOURCE_DIR, 'rb') as f: +with open('%s/project_galaxy_meta.py' % SOURCE_DIR, 'rb') as f: init_contents = f.read().decode('utf-8') def get_var(var_name):