Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/converter_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Clone galaxyproject/galaxy-test-data
uses: actions/checkout@v5
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/cwl_conformance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/first_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Set up Python
uses: actions/setup-python@v6
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/framework_tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/framework_workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/integration_selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Restore client cache
uses: actions/cache@v4
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/main_tools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/osx_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Cache pip dir
uses: actions/cache@v4
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/performance.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/reports_startup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- name: Set up Python
uses: actions/setup-python@v6
with:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/selenium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test_galaxy_packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/toolshed.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/unit-postgres.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ jobs:
- name: Read Node.js version
id: node-version
run: echo "version=$(cat 'galaxy root/client/.node_version')" >> $GITHUB_OUTPUT
- uses: actions/setup-node@v5
with:
node-version: ${{ steps.node-version.outputs.version }}
cache: 'yarn'
cache-dependency-path: 'galaxy root/client/yarn.lock'
- uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
Expand Down
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -180,19 +180,15 @@ skip-client: ## Run only the server, skipping the client build.

node-deps: ## Install NodeJS dependencies.
ifndef YARN
@echo $(NO_YARN_MSG)
false;
else
$(IN_VENV) yarn install $(YARN_INSTALL_OPTS)
npm install -g yarn;
endif
$(IN_VENV) yarn install $(YARN_INSTALL_OPTS)

client-node-deps: ## Install NodeJS dependencies for the client.
ifndef YARN
@echo $(NO_YARN_MSG)
false;
else
$(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS)
npm install -g yarn;
endif
$(IN_VENV) cd client && yarn install $(YARN_INSTALL_OPTS)

format-xsd:
xmllint --format --output galaxy-tmp.xsd lib/galaxy/tool_util/xsd/galaxy.xsd
Expand Down
2 changes: 1 addition & 1 deletion lib/galaxy/dependencies/pinned-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ mypy-extensions==1.1.0
networkx==3.2.1 ; python_full_version < '3.10'
networkx==3.4.2 ; python_full_version == '3.10.*'
networkx==3.5 ; python_full_version >= '3.11'
nodeenv==1.9.1
nodejs-wheel==22.13.0
numpy==2.0.2 ; python_full_version < '3.10'
numpy==2.2.6 ; python_full_version == '3.10.*'
numpy==2.3.3 ; python_full_version >= '3.11'
Expand Down
1 change: 1 addition & 0 deletions packages/app/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ install_requires =
Markdown
MarkupSafe
mercurial>=6.8.2
nodejs-wheel>=22,<23
packaging
paramiko!=2.9.0,!=2.9.1
pebble
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ dependencies = [
"mercurial>=6.8.2", # Python 3.13 support
"mrcfile",
"msal",
"nodeenv",
"nodejs-wheel==22",
"numpy>=1.26.0", # Python 3.12 support
"numpy>=2.1.0 ; python_version>='3.10'", # Python 3.13 support
"openpyxl>=3.1.5", # Minimum version ever tested with
Expand Down
20 changes: 0 additions & 20 deletions scripts/common_startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ CREATE_VENV=1
COPY_SAMPLE_FILES=1
SET_VENV=1
SKIP_CLIENT_BUILD=${GALAXY_SKIP_CLIENT_BUILD:-0}
SKIP_NODE=${GALAXY_SKIP_NODE:-0}
INSTALL_PREBUILT_CLIENT=${GALAXY_INSTALL_PREBUILT_CLIENT:-0}
NODE_VERSION=${GALAXY_NODE_VERSION:-"$(cat client/.node_version)"}
: "${YARN_INSTALL_OPTS:=--network-timeout 300000 --check-files}"
: "${GALAXY_CONDA_PYTHON_VERSION:=3.9}"

Expand All @@ -28,7 +26,6 @@ for arg in "$@"; do
[ "$arg" = "--stop-daemon" ] && FETCH_WHEELS=0
[ "$arg" = "--skip-samples" ] && COPY_SAMPLE_FILES=0
[ "$arg" = "--skip-client-build" ] && SKIP_CLIENT_BUILD=1
[ "$arg" = "--skip-node" ] && SKIP_NODE=1
done

SAMPLES="
Expand Down Expand Up @@ -198,23 +195,6 @@ if [ $FETCH_WHEELS -eq 1 ]; then
fi
fi

# Install node if not installed
if [ $SKIP_NODE -eq 0 ]; then
if ! command -v node >/dev/null || [ "$(node --version)" != "v${NODE_VERSION}" ]; then
if [ -n "$CONDA_DEFAULT_ENV" ] && [ -n "$CONDA_EXE" ]; then
echo "Installing node into '$CONDA_DEFAULT_ENV' Conda environment with conda."
$CONDA_EXE install --yes --override-channels --channel conda-forge --name "$CONDA_DEFAULT_ENV" nodejs="$NODE_VERSION"
elif [ -n "$VIRTUAL_ENV" ]; then
echo "Installing node into $VIRTUAL_ENV with nodeenv."
if [ -d "${VIRTUAL_ENV}/lib/node_modules" ]; then
echo "Removing old ${VIRTUAL_ENV}/lib/node_modules directory."
rm -rf "${VIRTUAL_ENV}/lib/node_modules"
fi
nodeenv -n "$NODE_VERSION" -p
fi
fi
fi

# Check client build state.
if [ $SKIP_CLIENT_BUILD -eq 0 ]; then
if [ -f static/client_build_hash.txt ]; then
Expand Down
Loading