Merge pull request #66 from dmitry-shibanov/v-dmshib/fix-StrictVersion

Replace StrictVersion to LooseVersion
Update python-config-test.py
2025-12-15 15:32:11 +00:00 · 2020-11-25 19:14:54 +03:00 · 2020-11-24 22:41:59 +03:00 · 2020-11-23 17:35:28 +03:00 · 2020-11-23 16:47:07 +03:00 · 2020-11-23 13:29:46 +03:00
9 changed files with 36 additions and 25 deletions
--- a/azure-pipelines/templates/build-job.yml
+++ b/azure-pipelines/templates/build-job.yml
@@ -8,6 +8,16 @@ jobs:
  - checkout: self
    submodules: true

+# We need this temporary step to have a consistent version of PowerShell on all images.
+  - task: PowerShell@2
+    displayName: 'Update PowerShell version for macOS'
+    condition: eq(variables['Platform'], 'darwin')
+    inputs:
+      TargetType: inline
+      script: |
+        brew update
+        brew cask upgrade powershell
+
  - task: PowerShell@2
    displayName: 'Build Python $(VERSION)'
    inputs:
--- a/azure-pipelines/templates/test-job.yml
+++ b/azure-pipelines/templates/test-job.yml
@@ -27,6 +27,7 @@ jobs:
      archiveFilePatterns: '$(Build.BinariesDirectory)/python-$(VERSION)-$(Platform)-$(Architecture).*'
      destinationFolder: $(Build.BinariesDirectory)
      cleanDestinationFolder: false
+      overwriteExistingFiles: true

  - task: PowerShell@2
    displayName: 'Apply build artifact to the local machines'
--- a/builders/build-python.ps1
+++ b/builders/build-python.ps1
@@ -1,6 +1,6 @@
-using module "./builders/win-python-builder.psm1"
-using module "./builders/ubuntu-python-builder.psm1"
-using module "./builders/macos-python-builder.psm1"
+using module "./win-python-builder.psm1"
+using module "./ubuntu-python-builder.psm1"
+using module "./macos-python-builder.psm1"

 <#
 .SYNOPSIS
--- a/builders/macos-python-builder.psm1
+++ b/builders/macos-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/nix-python-builder.psm1"
+using module "./nix-python-builder.psm1"

 class macOSPythonBuilder : NixPythonBuilder {
    <#
--- a/builders/nix-python-builder.psm1
+++ b/builders/nix-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/python-builder.psm1"
+using module "./python-builder.psm1"

 class NixPythonBuilder : PythonBuilder {
    <#
--- a/builders/ubuntu-python-builder.psm1
+++ b/builders/ubuntu-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/nix-python-builder.psm1"
+using module "./nix-python-builder.psm1"

 class UbuntuPythonBuilder : NixPythonBuilder {
    <#
--- a/builders/win-python-builder.psm1
+++ b/builders/win-python-builder.psm1
@@ -1,4 +1,4 @@
-using module "./builders/python-builder.psm1"
+using module "./python-builder.psm1"

 class WinPythonBuilder : PythonBuilder {
    <#
--- a/tests/sources/python-config-test.py
+++ b/tests/sources/python-config-test.py
@@ -1,5 +1,5 @@
 import distutils.sysconfig
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 import sysconfig
 import sys
 import platform
@@ -43,7 +43,7 @@ else:
 ### Validate macOS
 if os_type == 'Darwin':
    ### Validate openssl links
-    if StrictVersion(nativeVersion) < StrictVersion("3.7.0"):
+    if LooseVersion(nativeVersion) < LooseVersion("3.7.0"):
        expected_ldflags = '-L/usr/local/opt/openssl@1.1/lib'
        ldflags = sysconfig.get_config_var('LDFLAGS')

--- a/versions-manifest.json
+++ b/versions-manifest.json
@@ -1232,19 +1232,19 @@
  {
    "version": "3.4.4",
    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.4.4-87823",
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.4.4-88098",
    "files": [
      {
        "filename": "python-3.4.4-win32-x64.zip",
        "arch": "x64",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.4.4-87823/python-3.4.4-win32-x64.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.4.4-88098/python-3.4.4-win32-x64.zip"
      },
      {
        "filename": "python-3.4.4-win32-x86.zip",
        "arch": "x86",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.4.4-87823/python-3.4.4-win32-x86.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.4.4-88098/python-3.4.4-win32-x86.zip"
      }
    ]
  },
@@ -1265,76 +1265,76 @@
  {
    "version": "3.3.5",
    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.3.5-87822",
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.3.5-88104",
    "files": [
      {
        "filename": "python-3.3.5-win32-x64.zip",
        "arch": "x64",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.3.5-87822/python-3.3.5-win32-x64.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.3.5-88104/python-3.3.5-win32-x64.zip"
      },
      {
        "filename": "python-3.3.5-win32-x86.zip",
        "arch": "x86",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.3.5-87822/python-3.3.5-win32-x86.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.3.5-88104/python-3.3.5-win32-x86.zip"
      }
    ]
  },
  {
    "version": "3.2.5",
    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.2.5-87821",
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.2.5-88105",
    "files": [
      {
        "filename": "python-3.2.5-win32-x64.zip",
        "arch": "x64",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.2.5-87821/python-3.2.5-win32-x64.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.2.5-88105/python-3.2.5-win32-x64.zip"
      },
      {
        "filename": "python-3.2.5-win32-x86.zip",
        "arch": "x86",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.2.5-87821/python-3.2.5-win32-x86.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.2.5-88105/python-3.2.5-win32-x86.zip"
      }
    ]
  },
  {
    "version": "3.1.4",
    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.1.4-87820",
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.1.4-88106",
    "files": [
      {
        "filename": "python-3.1.4-win32-x64.zip",
        "arch": "x64",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.1.4-87820/python-3.1.4-win32-x64.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.1.4-88106/python-3.1.4-win32-x64.zip"
      },
      {
        "filename": "python-3.1.4-win32-x86.zip",
        "arch": "x86",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.1.4-87820/python-3.1.4-win32-x86.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.1.4-88106/python-3.1.4-win32-x86.zip"
      }
    ]
  },
  {
    "version": "3.0.1",
    "stable": true,
-    "release_url": "https://github.com/actions/python-versions/releases/tag/3.0.1-87819",
+    "release_url": "https://github.com/actions/python-versions/releases/tag/3.0.1-88107",
    "files": [
      {
        "filename": "python-3.0.1-win32-x64.zip",
        "arch": "x64",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.0.1-87819/python-3.0.1-win32-x64.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.0.1-88107/python-3.0.1-win32-x64.zip"
      },
      {
        "filename": "python-3.0.1-win32-x86.zip",
        "arch": "x86",
        "platform": "win32",
-        "download_url": "https://github.com/actions/python-versions/releases/download/3.0.1-87819/python-3.0.1-win32-x86.zip"
+        "download_url": "https://github.com/actions/python-versions/releases/download/3.0.1-88107/python-3.0.1-win32-x86.zip"
      }
    ]
  },
Author	SHA1	Message	Date
MaksimZhukov	650a155a9a	Merge pull request #66 from dmitry-shibanov/v-dmshib/fix-StrictVersion Replace StrictVersion to LooseVersion	2020-11-25 19:14:54 +03:00
Dmitry Shibanov	28d23216d1	Update python-config-test.py	2020-11-24 22:41:59 +03:00
MaksimZhukov	6468490367	Merge pull request #64 from actions/v-mazhuk/fix-powerhell-issue-with-paths Fix PowerShell issue with relative paths	2020-11-23 17:35:28 +03:00
MaksimZhukov	4be9a4cca1	Update overwriteExistingFiles input	2020-11-23 16:47:07 +03:00
MaksimZhukov	89a619f4b9	Fix PowerShell issue with relative paths	2020-11-23 13:29:46 +03:00
MaksimZhukov	ac42875cb8	Merge pull request #63 from actions/update-versions-manifest-file [versions-manifest] Update for release from 11/09/2020	2020-11-09 16:00:27 +03:00
Service account	280f63ac35	Update versions-manifest	2020-11-09 12:34:15 +00:00