From 2c3983ae5ba6fb78076d9147e48940b4e7c93ef3 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 12 Aug 2021 11:05:35 +0300 Subject: [PATCH 1/5] Replace EOL Xenial with Focal --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39b4db14..caf0e232 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,36 +15,36 @@ services: docker jobs: include: - - name: "3.6 Xenial aarch64" + - name: "3.6 Focal aarch64" arch: arm64 env: - PLAT=aarch64 - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.6 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - - name: "3.7 Xenial aarch64" + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} + - name: "3.7 Focal aarch64" arch: arm64 env: - PLAT=aarch64 - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.7 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - - name: "3.8 Xenial aarch64" + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} + - name: "3.8 Focal aarch64" os: linux arch: arm64 env: - PLAT=aarch64 - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.8 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} - - name: "3.9 Xenial aarch64" + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} + - name: "3.9 Focal aarch64" os: linux arch: arm64 env: - PLAT=aarch64 - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.9 - - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT} + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} before_install: - source multibuild/common_utils.sh From 520fa0858ae2acf8fdf73e5378efa0c8be009b23 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 12 Aug 2021 11:06:43 +0300 Subject: [PATCH 2/5] Build on Python 3.10-dev --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index caf0e232..775783da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,14 @@ jobs: - MB_ML_VER=2014 - MB_PYTHON_VERSION=3.9 - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} + - name: "3.10 Focal aarch64" + os: linux + arch: arm64 + env: + - PLAT=aarch64 + - MB_ML_VER=2014 + - MB_PYTHON_VERSION=3.10 + - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT} before_install: - source multibuild/common_utils.sh From c0626ba28e22aa2f2d461f22813d2e5c9012d44a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 12 Aug 2021 11:09:50 +0300 Subject: [PATCH 3/5] Add linting --- .github/workflows/lint.yml | 12 ++++++++++++ .pre-commit-config.yaml | 6 ++++++ 2 files changed, 18 insertions(+) create mode 100644 .github/workflows/lint.yml create mode 100644 .pre-commit-config.yaml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 00000000..e63ebd10 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,12 @@ +name: Lint + +on: [push, pull_request] + +jobs: + lint: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + - uses: pre-commit/action@v2.0.3 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 00000000..a9d3e53a --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.0.1 + hooks: + - id: check-merge-conflict + - id: check-yaml From 0a6334416c7511793ea3c99ed7b147f41e4e288b Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Thu, 12 Aug 2021 21:17:51 +1000 Subject: [PATCH 4/5] pre-commit autoupdate --freeze --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a9d3e53a..b7036941 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 + rev: 38b88246ccc552bffaaf54259d064beeee434539 # frozen: v4.0.1 hooks: - id: check-merge-conflict - id: check-yaml From b2983b18b3aabca634a3235d0f3871bc5fb40269 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Thu, 12 Aug 2021 15:40:05 +0300 Subject: [PATCH 5/5] Autoupdate quarterly --- .pre-commit-config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b7036941..ae194a33 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,3 +4,6 @@ repos: hooks: - id: check-merge-conflict - id: check-yaml + +ci: + autoupdate_schedule: quarterly