Skip to content

Commit

Permalink
Merge pull request #18538 from davelopez/update_toolshed2_dev_exp
Browse files Browse the repository at this point in the history
Fix some Toolshed 2.0 development paper-cuts
  • Loading branch information
davelopez authored Jul 15, 2024
2 parents 4fec21e + 985184b commit 0cca58b
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 20 deletions.
45 changes: 28 additions & 17 deletions lib/tool_shed/webapp/frontend/vite.config.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,34 @@
import { fileURLToPath } from 'url'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
import { quasar, transformAssetUrls } from '@quasar/vite-plugin'
import { fileURLToPath } from "url"
import { defineConfig } from "vite"
import vue from "@vitejs/plugin-vue"
import { quasar, transformAssetUrls } from "@quasar/vite-plugin"

// https://vitejs.dev/config/
export default defineConfig({
plugins: [
vue({
template: { transformAssetUrls },
}),
plugins: [
vue({
template: { transformAssetUrls },
}),

quasar({
sassVariables: 'src/quasar-variables.sass',
}),
],
build: {},
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url)),
quasar({
sassVariables: "src/quasar-variables.sass",
}),
],
build: {},
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
},
},
server: {
proxy: {
"/api": {
// This is the URL of the backend server
// The address is the default when running `make run_test_backend`
target: "http://127.0.0.1:9009/",
changeOrigin: true,
secure: false,
},
},
},
},
})
4 changes: 1 addition & 3 deletions scripts/bootstrap_test_shed.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
Optional,
)

from galaxy.util import requests

sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, "lib")))


from galaxy.tool_shed.util.hg_util import clone_repository
from galaxy.util import requests
from tool_shed.test.base.api import ensure_user_with_email
from tool_shed.test.base.api_util import (
create_user,
Expand Down

0 comments on commit 0cca58b

Please sign in to comment.