From 2a7e15f0fe638a7c51c7bf15a1f09e6e49b62b75 Mon Sep 17 00:00:00 2001 From: Tully Foote Date: Thu, 4 May 2023 16:04:13 -0700 Subject: [PATCH] Upgrading CI versions due to deprecated results (#228) * move to actions/checkout@v3 * move to actions/setup-python@v4 * Pin back urllib3<2 due to regression https://github.com/docker/docker-py/issues/3113 * Remove old workaround which upstream has merged a fix for. * upgrade codecov action to v3 * upgrade to coactions/setup-xvfb@v1 Signed-off-by: Tully Foote --- .github/workflows/basic-ci.yaml | 10 ++++------ setup.py | 1 + 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/basic-ci.yaml b/.github/workflows/basic-ci.yaml index efacbf1f..49db856f 100644 --- a/.github/workflows/basic-ci.yaml +++ b/.github/workflows/basic-ci.yaml @@ -9,20 +9,18 @@ jobs: matrix: python-version: [3.8, '3.10'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install Dependencies And Self run: | python -m pip install --upgrade pip setuptools wheel - # Workaround for https://github.com/docker/docker-py/issues/2807 - python -m pip install six python -m pip install -e .[test] codecov pytest-cov - name: Run headless tests - uses: GabrielBB/xvfb-action@v1 + uses: coactions/setup-xvfb@v1 with: run: python -m pytest -s -v --cov=rocker -m "not nvidia" - name: Upload coverage to Codecov - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v3 diff --git a/setup.py b/setup.py index 3ba780ef..a12bc8d1 100644 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ 'empy', 'pexpect', 'packaging', + 'urllib3<2', # Workaround for https://github.com/docker/docker-py/issues/3113 ] # docker API used to be in a package called `docker-py` before the 2.0 release