From dc7c8e7ac64133ca625887d51f18016e7a7ee2e5 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 8 Dec 2022 11:25:10 +0100 Subject: [PATCH 1/6] Pin packaging to below 22 --- packages/util/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util/requirements.txt b/packages/util/requirements.txt index 0c51c78cf5c..b1e2a5b8190 100644 --- a/packages/util/requirements.txt +++ b/packages/util/requirements.txt @@ -3,7 +3,7 @@ boltons docutils importlib_resources MarkupSafe -packaging +packaging<22 # packaging 22.0 dropped LegacyVersion pycryptodome PyYAML requests From b3eedc1049f892af55484bebed8a9eee3d9a2c56 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Wed, 7 Dec 2022 03:51:07 +0000 Subject: [PATCH 2/6] Update minikube-setup-action and use more recent k8s version The older minikube/k8s fail to launch under Ubuntu 22.04, which is being deployed on GitHub action workers: --- .github/workflows/integration.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml index 25bb0d3783a..e4dc499ef02 100644 --- a/.github/workflows/integration.yaml +++ b/.github/workflows/integration.yaml @@ -45,11 +45,15 @@ jobs: run: docker system prune -a -f - name: Clean dotnet folder for space run: rm -Rf /usr/share/dotnet + - name: Install packages + # conntrack: mandatory for later k8s versions + # ffmpeg: ffprobe needed by media datatypes + run: sudo apt-get update && sudo apt-get -y install conntrack ffmpeg - name: Setup Minikube id: minikube - uses: CodingNagger/minikube-setup-action@v1.0.3 + uses: CodingNagger/minikube-setup-action@v1.0.6 with: - minikube-version: "1.9.0-0_amd64" + k8s-version: '1.19.16' - name: Launch Minikube run: eval ${{ steps.minikube.outputs.launcher }} - name: Check pods @@ -76,8 +80,6 @@ jobs: with: path: .venv key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-integration - - name: Install ffmpeg - run: sudo apt-get update && sudo apt-get -y install ffmpeg - name: Run tests run: | . .ci/minikube-test-setup/start_services.sh From 173177e12ec14cfaadb1d0fb75740add3ec94482 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 8 Dec 2022 11:47:48 +0100 Subject: [PATCH 3/6] Add missing pyparsing dependency to galaxy-util --- packages/util/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/util/requirements.txt b/packages/util/requirements.txt index b1e2a5b8190..7e73f390244 100644 --- a/packages/util/requirements.txt +++ b/packages/util/requirements.txt @@ -5,6 +5,7 @@ importlib_resources MarkupSafe packaging<22 # packaging 22.0 dropped LegacyVersion pycryptodome +pyparsing PyYAML requests Routes From c818c1e36a3fafb61a33893690b9852fc3913e26 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 8 Dec 2022 12:27:36 +0100 Subject: [PATCH 4/6] Update changelog --- packages/util/HISTORY.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/util/HISTORY.rst b/packages/util/HISTORY.rst index de409719eff..6af347fc083 100644 --- a/packages/util/HISTORY.rst +++ b/packages/util/HISTORY.rst @@ -6,10 +6,17 @@ History .. to_doc --------------------- -21.1.1.dev0 +22.1.2 (2022-12-08) --------------------- +* Pin packaging dependency to < 22, fixes ``LegacyVersion`` import errors +* Add missing pyparsing dependency +--------------------- +22.1.1 (2022-08-22) +--------------------- + +* First release from the 22.01 branch of Galaxy --------------------- 21.1.0 (2021-03-19) From 438012be66a26f5497b57ab9546305503238e8bb Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 8 Dec 2022 12:28:19 +0100 Subject: [PATCH 5/6] Bump galaxy-util version to 22.1.2 --- packages/util/galaxy/project_galaxy_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util/galaxy/project_galaxy_util.py b/packages/util/galaxy/project_galaxy_util.py index 1e3a594ab85..fe13ad26bd6 100644 --- a/packages/util/galaxy/project_galaxy_util.py +++ b/packages/util/galaxy/project_galaxy_util.py @@ -1,4 +1,4 @@ -__version__ = "22.1.2.dev0" +__version__ = "22.1.2" PROJECT_NAME = "galaxy-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject" From 4523cf97021403dfb3b0a4852e6ff3b2e9a505f9 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 8 Dec 2022 12:32:19 +0100 Subject: [PATCH 6/6] Bump to next dev version --- packages/util/galaxy/project_galaxy_util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/util/galaxy/project_galaxy_util.py b/packages/util/galaxy/project_galaxy_util.py index fe13ad26bd6..33e0403c447 100644 --- a/packages/util/galaxy/project_galaxy_util.py +++ b/packages/util/galaxy/project_galaxy_util.py @@ -1,4 +1,4 @@ -__version__ = "22.1.2" +__version__ = "22.1.3.dev0" PROJECT_NAME = "galaxy-util" PROJECT_OWNER = PROJECT_USERAME = "galaxyproject"