From a14e90930bd3f6befa3163abab5875b446e23bff Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 14 Oct 2019 14:18:16 +0200 Subject: [PATCH 01/11] Bump version 1.5 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 89423267..d7cff02d 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import setup -VERSION = "1.4" +VERSION = "1.5" setup( name="builder", From 0ebc4ce39267d9095cd4cba213d4259a7324388a Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2019 18:39:30 +0200 Subject: [PATCH 02/11] Bump numpy from 1.17.2 to 1.17.3 (#45) Bumps [numpy](https://github.com/numpy/numpy) from 1.17.2 to 1.17.3. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt) - [Commits](https://github.com/numpy/numpy/compare/v1.17.2...v1.17.3) Signed-off-by: dependabot-preview[bot] --- requirements_build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_build.txt b/requirements_build.txt index cb4061b9..caa49762 100644 --- a/requirements_build.txt +++ b/requirements_build.txt @@ -1,2 +1,2 @@ Cython==0.29.13 -numpy==1.17.2 +numpy==1.17.3 From 46cce5357bbf549917979f7b51f2ca4e8df72b83 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2019 15:04:24 +0200 Subject: [PATCH 03/11] Bump pylint from 2.4.2 to 2.4.3 (#46) Bumps [pylint](https://github.com/PyCQA/pylint) from 2.4.2 to 2.4.3. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.4.2...pylint-2.4.3) Signed-off-by: dependabot-preview[bot] --- requirements_tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_tests.txt b/requirements_tests.txt index e9669d5d..28d8be47 100644 --- a/requirements_tests.txt +++ b/requirements_tests.txt @@ -1,3 +1,3 @@ flake8==3.7.8 -pylint==2.4.2 +pylint==2.4.3 black==19.3b0 From b7f83c7510127b0afff36a09e7dff6e0ddbfaf97 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 23:24:53 +0100 Subject: [PATCH 04/11] Bump black from 19.3b0 to 19.10b0 (#47) Bumps [black](https://github.com/psf/black) from 19.3b0 to 19.10b0. - [Release notes](https://github.com/psf/black/releases) - [Commits](https://github.com/psf/black/commits) Signed-off-by: dependabot-preview[bot] --- requirements_tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_tests.txt b/requirements_tests.txt index 28d8be47..89e6bdde 100644 --- a/requirements_tests.txt +++ b/requirements_tests.txt @@ -1,3 +1,3 @@ flake8==3.7.8 pylint==2.4.3 -black==19.3b0 +black==19.10b0 From e2b4f08e7ec6c10fe3bdb6f74835a9033ff4732d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Oct 2019 23:25:14 +0100 Subject: [PATCH 05/11] Bump flake8 from 3.7.8 to 3.7.9 (#48) Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.7.8 to 3.7.9. - [Release notes](https://gitlab.com/pycqa/flake8/tags) - [Commits](https://gitlab.com/pycqa/flake8/compare/3.7.8...3.7.9) Signed-off-by: dependabot-preview[bot] --- requirements_tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_tests.txt b/requirements_tests.txt index 89e6bdde..b6e316fd 100644 --- a/requirements_tests.txt +++ b/requirements_tests.txt @@ -1,3 +1,3 @@ -flake8==3.7.8 +flake8==3.7.9 pylint==2.4.3 black==19.10b0 From 58dbaccad857bdbd64f9f64034a20b937d9d9006 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2019 11:34:41 +0100 Subject: [PATCH 06/11] Bump pylint from 2.4.3 to 2.4.4 (#51) Bumps [pylint](https://github.com/PyCQA/pylint) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/PyCQA/pylint/releases) - [Changelog](https://github.com/PyCQA/pylint/blob/master/ChangeLog) - [Commits](https://github.com/PyCQA/pylint/compare/pylint-2.4.3...pylint-2.4.4) Signed-off-by: dependabot-preview[bot] --- requirements_tests.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_tests.txt b/requirements_tests.txt index b6e316fd..74c1d2ff 100644 --- a/requirements_tests.txt +++ b/requirements_tests.txt @@ -1,3 +1,3 @@ flake8==3.7.9 -pylint==2.4.3 +pylint==2.4.4 black==19.10b0 From fa2f26126fbe0850c6118c25a31e061ff0af9043 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2019 11:42:28 +0100 Subject: [PATCH 07/11] Bump cython from 0.29.13 to 0.29.14 (#49) Bumps [cython](https://github.com/cython/cython) from 0.29.13 to 0.29.14. - [Release notes](https://github.com/cython/cython/releases) - [Changelog](https://github.com/cython/cython/blob/master/CHANGES.rst) - [Commits](https://github.com/cython/cython/compare/0.29.13...0.29.14) Signed-off-by: dependabot-preview[bot] --- requirements_build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_build.txt b/requirements_build.txt index caa49762..5c18f0b0 100644 --- a/requirements_build.txt +++ b/requirements_build.txt @@ -1,2 +1,2 @@ -Cython==0.29.13 +Cython==0.29.14 numpy==1.17.3 From 3b053e3bc330292410604f3e1a68a56889e0815b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2019 10:51:15 +0100 Subject: [PATCH 08/11] Bump numpy from 1.17.3 to 1.17.4 (#50) Bumps [numpy](https://github.com/numpy/numpy) from 1.17.3 to 1.17.4. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt) - [Commits](https://github.com/numpy/numpy/compare/v1.17.3...v1.17.4) Signed-off-by: dependabot-preview[bot] --- requirements_build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_build.txt b/requirements_build.txt index 5c18f0b0..69af0e14 100644 --- a/requirements_build.txt +++ b/requirements_build.txt @@ -1,2 +1,2 @@ Cython==0.29.14 -numpy==1.17.3 +numpy==1.17.4 From 6c4a164367a1a2ad9f09a189bb44e8a4f0bd884c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 13:59:46 +0100 Subject: [PATCH 09/11] Bump numpy from 1.17.4 to 1.18.1 (#54) Bumps [numpy](https://github.com/numpy/numpy) from 1.17.4 to 1.18.1. - [Release notes](https://github.com/numpy/numpy/releases) - [Changelog](https://github.com/numpy/numpy/blob/master/doc/HOWTO_RELEASE.rst.txt) - [Commits](https://github.com/numpy/numpy/compare/v1.17.4...v1.18.1) Signed-off-by: dependabot-preview[bot] --- requirements_build.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_build.txt b/requirements_build.txt index 69af0e14..0d8447b7 100644 --- a/requirements_build.txt +++ b/requirements_build.txt @@ -1,2 +1,2 @@ Cython==0.29.14 -numpy==1.17.4 +numpy==1.18.1 From da3eb546860e2ea5943023c7eb0c342a7c106fe1 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2020 14:00:22 +0100 Subject: [PATCH 10/11] Bump click-pathlib from 2019.6.13.1 to 2019.12.28.7 (#53) Bumps [click-pathlib](https://github.com/adamtheturtle/click-pathlib) from 2019.6.13.1 to 2019.12.28.7. - [Release notes](https://github.com/adamtheturtle/click-pathlib/releases) - [Changelog](https://github.com/adamtheturtle/click-pathlib/blob/master/CHANGELOG.rst) - [Commits](https://github.com/adamtheturtle/click-pathlib/compare/2019.06.13.1...2019.12.28.7) Signed-off-by: dependabot-preview[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0eadd2a7..c588f8db 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ click==7.0 -click-pathlib==2019.6.13.1 +click-pathlib==2019.12.28.7 requests==2.22.0 wheel==0.33.6 From b9255fb9433f957112bffef4414d895febcd081b Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 8 Jan 2020 14:10:45 +0100 Subject: [PATCH 11/11] Support python 3.7 / 3.8 - Alpine 3.9 / 3.10 / 3.11 (#55) * Update files * Expand tags --- .devcontainer/devcontainer.json | 3 +- azure-pipelines-ci.yml | 58 +++++------ azure-pipelines-release.yml | 179 ++++++++++++++++++++------------ requirements.txt | 1 + 4 files changed, 145 insertions(+), 96 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 2112d3fb..988fd98b 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -4,7 +4,8 @@ "context": "..", "dockerFile": "Dockerfile", "extensions": [ - "ms-python.python" + "ms-python.python", + "esbenp.prettier-vscode" ], "settings": { "python.pythonPath": "/usr/local/bin/python", diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index 6e28a61b..e551b15d 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -4,38 +4,36 @@ trigger: batch: true branches: include: - - master - - dev + - master + - dev pr: -- dev + - dev variables: -- name: versionHadolint - value: 'v1.16.3' + - name: versionHadolint + value: "v1.16.3" jobs: + - job: "Tox" + pool: + vmImage: "ubuntu-latest" + steps: + - task: UsePythonVersion@0 + displayName: "Use Python $(python.version)" + inputs: + versionSpec: "3.7" + - script: pip install tox + displayName: "Install Tox" + - script: tox + displayName: "Run Tox" -- job: 'Tox' - pool: - vmImage: 'ubuntu-latest' - steps: - - task: UsePythonVersion@0 - displayName: 'Use Python $(python.version)' - inputs: - versionSpec: '3.7' - - script: pip install tox - displayName: 'Install Tox' - - script: tox - displayName: 'Run Tox' - - -- job: 'Hadolint' - pool: - vmImage: 'ubuntu-latest' - steps: - - script: sudo docker pull hadolint/hadolint:$(versionHadolint) - displayName: 'Install Hadolint' - - script: | - sudo docker run --rm -i \ - -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \ - hadolint/hadolint:$(versionHadolint) < Dockerfile - displayName: 'Run Hadolint' + - job: "Hadolint" + pool: + vmImage: "ubuntu-latest" + steps: + - script: sudo docker pull hadolint/hadolint:$(versionHadolint) + displayName: "Install Hadolint" + - script: | + sudo docker run --rm -i \ + -v $(pwd)/.hadolint.yaml:/.hadolint.yaml:ro \ + hadolint/hadolint:$(versionHadolint) < Dockerfile + displayName: "Run Hadolint" diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml index dc59e4c6..b626bfa7 100644 --- a/azure-pipelines-release.yml +++ b/azure-pipelines-release.yml @@ -3,76 +3,125 @@ trigger: tags: include: - - '*' + - "*" pr: none variables: -- name: versionBuilder - value: '4.4' -- group: docker + - name: versionBuilder + value: "4.4" + - group: docker resources: repositories: - - repository: azure - type: github - name: 'home-assistant/ci-azure' - endpoint: 'home-assistant' - + - repository: azure + type: github + name: "home-assistant/ci-azure" + endpoint: "home-assistant" stages: + - stage: "Validate" + jobs: + - template: templates/azp-job-version.yaml@azure + parameters: + ignoreDev: true -- stage: 'Validate' - jobs: - - template: templates/azp-job-version.yaml@azure - parameters: - ignoreDev: true - -- stage: 'Wheels' - jobs: - - template: templates/azp-job-wheels.yaml@azure - parameters: - jobName: 'Wheels_Alpine39' - builderVersion: 'dev-3.7-alpine3.9' - builderApk: 'build-base;libffi-dev;openssl-dev' - wheelsRequirement: 'requirements_all.txt' - preBuild: - - script: | - cat requirements.txt requirements_build.txt > requirements_all.txt - displayName: 'Prepare requirements' - - template: templates/azp-job-wheels.yaml@azure - parameters: - jobName: 'Wheels_Alpine310' - builderVersion: 'dev-3.7-alpine3.10' - builderApk: 'build-base;libffi-dev;openssl-dev' - wheelsRequirement: 'requirements_all.txt' - preBuild: - - script: | - cat requirements.txt requirements_build.txt > requirements_all.txt - displayName: 'Prepare requirements' + - stage: "Wheels" + jobs: + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_37_Alpine39" + builderVersion: "dev-3.7-alpine3.9" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_37_Alpine310" + builderVersion: "dev-3.7-alpine3.10" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_37_Alpine311" + builderVersion: "dev-3.7-alpine3.11" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_38_Alpine39" + builderVersion: "dev-3.8-alpine3.9" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_38_Alpine310" + builderVersion: "dev-3.8-alpine3.10" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" + - template: templates/azp-job-wheels.yaml@azure + parameters: + jobName: "Wheels_38_Alpine311" + builderVersion: "dev-3.8-alpine3.11" + builderApk: "build-base;libffi-dev;openssl-dev" + wheelsRequirement: "requirements_all.txt" + preBuild: + - script: | + cat requirements.txt requirements_build.txt > requirements_all.txt + displayName: "Prepare requirements" -- stage: 'Release' - jobs: - - job: 'Release' - pool: - vmImage: 'ubuntu-latest' - strategy: - maxParallel: 2 - matrix: - 37-Alpine39: - buildPython: '3.7-alpine3.9' - buildArgs: '' - 37-Alpine310: - buildPython: '3.7-alpine3.10' - buildArgs: '--release-tag' - steps: - - script: sudo docker login -u $(dockerUser) -p $(dockerPassword) - displayName: 'Docker hub login' - - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder) - displayName: 'Install Builder' - - script: | - sudo docker run --rm --privileged \ - -v ~/.docker:/root/.docker \ - -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \ - homeassistant/amd64-builder:$(versionBuilder) \ - --builder-wheels $(buildPython) --all \ - $(buildArgs) --version $(Build.SourceBranchName) \ - -t /data --docker-hub homeassistant - displayName: 'Build Release' + - stage: "Release" + jobs: + - job: "Release" + pool: + vmImage: "ubuntu-latest" + strategy: + matrix: + 37-Alpine39: + buildPython: "3.7-alpine3.9" + buildArgs: "" + 37-Alpine310: + buildPython: "3.7-alpine3.10" + buildArgs: "" + 37-Alpine311: + buildPython: "3.7-alpine3.11" + buildArgs: "" + 38-Alpine39: + buildPython: "3.8-alpine3.9" + buildArgs: "" + 38-Alpine310: + buildPython: "3.8-alpine3.10" + buildArgs: "" + 38-Alpine311: + buildPython: "3.8-alpine3.11" + buildArgs: "--release-tag" + steps: + - script: sudo docker login -u $(dockerUser) -p $(dockerPassword) + displayName: "Docker hub login" + - script: sudo docker pull homeassistant/amd64-builder:$(versionBuilder) + displayName: "Install Builder" + - script: | + sudo docker run --rm --privileged \ + -v ~/.docker:/root/.docker \ + -v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \ + homeassistant/amd64-builder:$(versionBuilder) \ + --builder-wheels $(buildPython) --all \ + $(buildArgs) --version $(Build.SourceBranchName) \ + -t /data --docker-hub homeassistant + displayName: "Build Release" diff --git a/requirements.txt b/requirements.txt index c588f8db..155edb6d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ click==7.0 click-pathlib==2019.12.28.7 requests==2.22.0 wheel==0.33.6 +setuptools==44.0.0