Unverified Commit e7b8e923 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #15148 from mvdbeek/pin_packaging 

[22.01] Pin packaging to below 22
parents 81ddf416 173177e1

.github/workflows/integration.yaml

+6 −4
Original line number Diff line number Diff line
@@ -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

packages/util/requirements.txt

+2 −1
Original line number Diff line number Diff line
@@ -3,8 +3,9 @@ boltons 
docutils

importlib_resources

MarkupSafe

packaging

packaging<22  # packaging 22.0 dropped LegacyVersion

pycryptodome

pyparsing

PyYAML

requests

Routes