diff --git a/.ci/py3_sources.txt b/.ci/py3_sources.txt deleted file mode 100644 index 9f3df8c309d8..000000000000 --- a/.ci/py3_sources.txt +++ /dev/null @@ -1,84 +0,0 @@ -client/galaxy/style/source_material/circle.py -contrib/ -cron/ -doc/parse_gx_xsd.py -doc/patch.py -lib/galaxy/actions/ -lib/galaxy/auth/ -lib/galaxy/config.py -lib/galaxy/containers/ -lib/galaxy/dataset_collections/ -lib/galaxy/datatypes/ -lib/galaxy/dependencies/ -lib/galaxy/eggs/ -lib/galaxy/exceptions/ -lib/galaxy/external_services/ -lib/galaxy/forms/ -lib/galaxy/jobs/ -lib/galaxy/managers/ -lib/galaxy/model/ -lib/galaxy/objectstore/ -lib/galaxy/openid/ -lib/galaxy/quota/ -lib/galaxy/sample_tracking/ -lib/galaxy/security/ -lib/galaxy/tags/ -lib/galaxy/tools/ -lib/galaxy/tours/ -lib/galaxy/util/ -lib/galaxy/visualization/ -lib/galaxy/web/ -lib/galaxy/webapps/galaxy/api/histories.py -lib/galaxy/webapps/galaxy/api/library_datasets.py -lib/galaxy/webapps/galaxy/api/tours.py -lib/galaxy/webapps/galaxy/api/users.py -lib/galaxy/webapps/galaxy/api/workflows.py -lib/galaxy/webapps/galaxy/buildapp.py -lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py -lib/galaxy/webapps/galaxy/controllers/external_services.py -lib/galaxy/webapps/galaxy/controllers/forms.py -lib/galaxy/webapps/galaxy/controllers/history.py -lib/galaxy/webapps/galaxy/controllers/library_common.py -lib/galaxy/webapps/galaxy/controllers/search.py -lib/galaxy/webapps/galaxy/controllers/userskeys.py -lib/galaxy/webapps/reports/config.py -lib/galaxy/webapps/reports/controllers/tools.py -lib/galaxy/webapps/reports/__init__.py -lib/galaxy/webapps/tool_shed/config.py -lib/galaxy/webapps/tool_shed/controllers/groups.py -lib/galaxy/webapps/tool_shed/controllers/user.py -lib/galaxy/webapps/tool_shed/framework/middleware/remoteuser.py -lib/galaxy/webapps/tool_shed/__init__.py -lib/galaxy/webapps/tool_shed/model/__init__.py -lib/galaxy/webapps/tool_shed/search/repo_search.py -lib/galaxy/webapps/tool_shed/util/ratings_util.py -lib/galaxy/webhooks/ -lib/galaxy/work/ -lib/galaxy/workflow/ -lib/galaxy_ext/ -lib/log_tempfile.py -lib/mimeparse.py -lib/psyco_full.py -lib/tool_shed/ -scripts/api/ -scripts/auth/ -scripts/bootstrap_history.py -scripts/build_toolbox.py -scripts/check_eggs.py -scripts/check_galaxy.py -scripts/check_python.py -scripts/cleanup_datasets/ -scripts/communication/ -scripts/data_libraries/build_whoosh_index.py -scripts/db_shell.py -scripts/drmaa_external_runner.py -scripts/metagenomics/ -scripts/microbes/BeautifulSoup.py -scripts/microbes/harvest_bacteria.py -scripts/secret_decoder_ring.py -scripts/tool_shed/api/common.py -scripts/tool_shed/build_ts_whoosh_index.py -scripts/tool_shed/deprecate_repositories_without_metadata.py -test/ -tool_list.py -tools/ diff --git a/client/galaxy/scripts/apps/admin.js b/client/galaxy/scripts/apps/admin.js index 92858c8acab8..41597424892b 100644 --- a/client/galaxy/scripts/apps/admin.js +++ b/client/galaxy/scripts/apps/admin.js @@ -10,7 +10,7 @@ import QueryStringParsing from "utils/query-string-parsing"; import Router from "layout/router"; import Utils from "utils/utils"; import Page from "layout/page"; -import Vue from "libs/vue"; +import Vue from "vue"; import UserAPIKeys from "components/UserAPIKeys.vue"; window.app = function app(options, bootstrapped) { diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js index 4c191c2e4d0e..db946e372e84 100644 --- a/client/galaxy/scripts/apps/analysis.js +++ b/client/galaxy/scripts/apps/analysis.js @@ -22,7 +22,7 @@ import Ui from "mvc/ui/ui-misc"; import DatasetError from "mvc/dataset/dataset-error"; import DatasetEditAttributes from "mvc/dataset/dataset-edit-attributes"; import Citations from "components/Citations.vue"; -import Vue from "libs/vue"; +import Vue from "vue"; /** define the 'Analyze Data'/analysis/main/home page for Galaxy * * has a masthead diff --git a/client/galaxy/scripts/galaxy.interactive_environments.js b/client/galaxy/scripts/galaxy.interactive_environments.js index 19f41e02f545..e17b3a62835d 100644 --- a/client/galaxy/scripts/galaxy.interactive_environments.js +++ b/client/galaxy/scripts/galaxy.interactive_environments.js @@ -6,9 +6,7 @@ export function append_notebook(url) { clear_main_area(); $("#main").append( - `` + `` ); } @@ -21,9 +19,7 @@ export function clear_main_area() { export function display_spinner() { $("#main").append( - `` + `` ); } diff --git a/client/galaxy/scripts/galaxy.pages.js b/client/galaxy/scripts/galaxy.pages.js index ac9b367579f7..c5af3df58b07 100644 --- a/client/galaxy/scripts/galaxy.pages.js +++ b/client/galaxy/scripts/galaxy.pages.js @@ -154,11 +154,7 @@ WYMeditor.editor.prototype.dialog = function(dialogType, dialogFeatures, bodyHtm } show_modal( "Create Link", - `


`, + `


`, { "Make link": function() { // Get URL, name/title. diff --git a/client/galaxy/scripts/layout/modal.js b/client/galaxy/scripts/layout/modal.js index d359f59fef55..4f8120f29a70 100644 --- a/client/galaxy/scripts/layout/modal.js +++ b/client/galaxy/scripts/layout/modal.js @@ -154,9 +154,9 @@ function show_in_overlay(options) { closeButton: true, title: " ", body: $( - `
` + `
` ) }); modal.show({ backdrop: true }); diff --git a/client/galaxy/scripts/reports/grid/grid-model.js b/client/galaxy/scripts/legacy/grid/grid-model.js similarity index 98% rename from client/galaxy/scripts/reports/grid/grid-model.js rename to client/galaxy/scripts/legacy/grid/grid-model.js index 6e3fc1698f93..f25a4313abed 100644 --- a/client/galaxy/scripts/reports/grid/grid-model.js +++ b/client/galaxy/scripts/legacy/grid/grid-model.js @@ -1,6 +1,4 @@ -// dependencies - -// grid model +// legacy grid model, used by reports and toolshed export default Backbone.Model.extend({ defaults: { url_base: "", diff --git a/client/galaxy/scripts/reports/grid/grid-template.js b/client/galaxy/scripts/legacy/grid/grid-template.js similarity index 91% rename from client/galaxy/scripts/reports/grid/grid-template.js rename to client/galaxy/scripts/legacy/grid/grid-template.js index 5fafae695b16..e5fda7d790f2 100644 --- a/client/galaxy/scripts/reports/grid/grid-template.js +++ b/client/galaxy/scripts/legacy/grid/grid-template.js @@ -112,14 +112,12 @@ export default { body: function(options) { // initialize var tmpl = ""; - var num_rows_rendered = 0; var items_length = options.items.length; // empty grid? if (items_length === 0) { // No results. tmpl += 'No Items'; - num_rows_rendered = 1; } // create rows @@ -180,9 +178,7 @@ export default { if (options.operations.length !== 0) { tmpl += `
`; } - tmpl += `${value}`; + tmpl += `${value}`; if (options.operations.length !== 0) { tmpl += "
"; } @@ -195,7 +191,6 @@ export default { } } tmpl += ""; - num_rows_rendered++; } return tmpl; }, @@ -262,21 +257,13 @@ export default { if (page_index == options.cur_page_num) { tmpl += `${page_index}`; } else { - tmpl += `${ - page_index - }`; + tmpl += `${page_index}`; } } // show last page if (max_page < num_pages) { - tmpl += `...${ - num_pages - }`; + tmpl += `...${num_pages}`; } tmpl += ""; @@ -386,9 +373,7 @@ export default { // // standard search // - var tmpl = `