diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 28a8043..d20c868 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,45 +39,3 @@ jobs: run: docker build . --target=test --build-arg PYTHON_VERSION=${PYTHON_VERSION} env: PYTHON_VERSION: "3.10" - - # Builds to validate Ubuntu PPA - build-37-ppa: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run unit tests - run: | - docker build . -f ppa.dockerfile -t python-ppa --build-arg PYTHON_VERSION=${PYTHON_VERSION} - docker build . --target=test --build-arg BASE_IMAGE=python-ppa --build-arg RUN_FMT=false - env: - PYTHON_VERSION: "3.7" - build-38-ppa: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run unit tests - run: | - docker build . -f ppa.dockerfile -t python-ppa --build-arg PYTHON_VERSION=${PYTHON_VERSION} - docker build . --target=test --build-arg BASE_IMAGE=python-ppa --build-arg RUN_FMT=false - env: - PYTHON_VERSION: "3.8" - build-39-ppa: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run unit tests - run: | - docker build . -f ppa.dockerfile -t python-ppa --build-arg PYTHON_VERSION=${PYTHON_VERSION} - docker build . --target=test --build-arg BASE_IMAGE=python-ppa --build-arg RUN_FMT=false - env: - PYTHON_VERSION: "3.9" - build-310-ppa: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Run unit tests - run: | - docker build . -f ppa.dockerfile -t python-ppa --build-arg PYTHON_VERSION=${PYTHON_VERSION} - docker build . --target=test --build-arg BASE_IMAGE=python-ppa --build-arg RUN_FMT=false - env: - PYTHON_VERSION: "3.10" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a33010..a0af085 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: black exclude: imports - repo: https://github.com/PyCQA/isort - rev: 5.6.3 + rev: 5.11.5 hooks: - id: isort exclude: imports diff --git a/ppa.dockerfile b/ppa.dockerfile deleted file mode 100644 index aaec5ed..0000000 --- a/ppa.dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# This dockerfile builds a base image that can be used to validate the library -# against ubuntu PPA python builds -# -# Reference: https://github.com/IBM/import-tracker/issues/40 -################################################################################ - -FROM ubuntu:18.04 - -ARG PYTHON_VERSION=3.7 -RUN true && \ - apt-get update && \ - apt-get install software-properties-common curl -y && \ - add-apt-repository ppa:deadsnakes/ppa -y && \ - apt-get update && \ - DEBIAN_FRONTEND="noninteractive" apt-get install -y \ - python${PYTHON_VERSION} \ - python${PYTHON_VERSION}-distutils && \ - curl -sS https://bootstrap.pypa.io/get-pip.py | python${PYTHON_VERSION} && \ - ln -s $(which python${PYTHON_VERSION}) /usr/local/bin/python && \ - ln -s $(which python${PYTHON_VERSION}) /usr/local/bin/python3 && \ - true