Merge pull request #58 from home-assistant/dev

Release 1.6
home-assistant · Jan 8, 2020 · 440022f · 440022f
2 parents 052178b + b64ecba
commit 440022f
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 66 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ COPY requirements.txt /usr/src/
 RUN apk add --no-cache \
         rsync \
         openssh-client \
-    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \
+    && pip3 install --no-cache-dir --find-links \
         "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \
         -r /usr/src/requirements.txt \
     && rm -f /usr/src/requirements.txt

diff --git a/azure-pipelines-release.yml b/azure-pipelines-release.yml
@@ -1,6 +1,9 @@
 # https://dev.azure.com/home-assistant
 
 trigger:
+  branches:
+    include:
+      - dev
   tags:
     include:
       - "*"
@@ -23,69 +26,6 @@ stages:
         parameters:
           ignoreDev: true
 
-  - 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"

diff --git a/azure-pipelines-wheel.yml b/azure-pipelines-wheel.yml
@@ -0,0 +1,81 @@
+# https://dev.azure.com/home-assistant
+
+trigger:
+  branches:
+    include:
+      - dev
+pr: none
+variables:
+  - name: versionBuilder
+    value: "4.4"
+  - group: docker
+resources:
+  repositories:
+    - repository: azure
+      type: github
+      name: "home-assistant/ci-azure"
+      endpoint: "home-assistant"
+
+stages:
+  - 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"
diff --git a/builder/utils.py b/builder/utils.py
@@ -5,7 +5,7 @@
 
 import requests
 
-RE_WHEEL_PLATFORM = re.compile(r"^(?P<name>.*-)cp\d{2}m-linux_\w+\.whl$")
+RE_WHEEL_PLATFORM = re.compile(r"^(?P<name>.*-)cp\d{2}m?-linux_\w+\.whl$")
 
 
 def alpine_version() -> str:

diff --git a/setup.py b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-VERSION = "1.5"
+VERSION = "1.6"
 
 setup(
     name="builder",