fixes finos#1334, adds py39 now that brew defaults this on osx

timkpaine · Feb 25, 2021 · 1ea93f5 · 1ea93f5
1 parent 283fd5c
commit 1ea93f5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -104,6 +104,16 @@ jobs:
           python_flag: '--python38'
           manylinux_flag: '--manylinux2014'
           artifact_name: 'cp38-cp38-manylinux2014_x86_64'
+        Python39ManyLinux2010:
+          python.version: '3.9'
+          python_flag: '--python39'
+          manylinux_flag: '--manylinux2010'
+          artifact_name: 'cp39-cp39-manylinux2010_x86_64'
+        Python39ManyLinux2014:
+          python.version: '3.9'
+          python_flag: '--python39'
+          manylinux_flag: '--manylinux2014'
+          artifact_name: 'cp39-cp39-manylinux2014_x86_64'
 
   steps:
     - task: UsePythonVersion@0
@@ -176,6 +186,9 @@ jobs:
         Python38:
           python.version: '3.8'
           python_flag: '--python38'
+        Python39:
+          python.version: '3.9'
+          python_flag: '--python39'
 
   steps:
     - task: UsePythonVersion@0
@@ -239,6 +252,10 @@ jobs:
         python.version: '3.7'
         python_flag: ''
         artifact_name: 'cp37-cp37m-macosx_10_15_x86_64'
+      Python39:
+        python.version: '3.9'
+        python_flag: ''
+        artifact_name: 'cp39-cp39-macosx_10_15_x86_64'
 
       ${{ if startsWith(variables['build.sourceBranch'], 'refs/tags/v') }}:
         Python36:
@@ -251,6 +268,11 @@ jobs:
           python_flag: '--python38'
           artifact_name: 'cp38-cp38-macosx_10_15_x86_64'
 
+        Python39:
+          python.version: '3.9'
+          python_flag: '--python39'
+          artifact_name: 'cp39-cp39-macosx_10_15_x86_64'
+
   steps:
     - task: UsePythonVersion@0
       inputs:

diff --git a/python/perspective/setup.py b/python/perspective/setup.py
@@ -6,20 +6,20 @@
 # the Apache License 2.0.  The full license can be found in the LICENSE file.
 #
 from __future__ import print_function
-from setuptools import setup, find_packages, Extension
-from setuptools.command.build_ext import build_ext
-from setuptools.command.sdist import sdist
-from distutils.version import LooseVersion
-from codecs import open
 
 import io
 import os
 import os.path
-import re
 import platform
-import sys
+import re
 import subprocess
+import sys
+from codecs import open
+from distutils.version import LooseVersion
 
+from setuptools import Extension, find_packages, setup
+from setuptools.command.build_ext import build_ext
+from setuptools.command.sdist import sdist
 
 try:
     from shutil import which
@@ -75,6 +75,7 @@ def which(x):
     "pytz>=2018.9",
     "Sphinx>=1.8.4",
     "sphinx-markdown-builder>=0.5.2",
+    "wheel",
 ] + requires
 
 requires_dev = [

diff --git a/scripts/_wheel_python.js b/scripts/_wheel_python.js
@@ -12,7 +12,7 @@ const fs = require("fs-extra");
 const IS_DOCKER = process.env.PSP_DOCKER;
 const IS_MACOS = getarg("--macos");
 const IS_PY2 = getarg("--python2");
-const PYTHON = IS_PY2 ? "python2" : getarg("--python38") ? "python3.8" : getarg("--python36") ? "python3.6" : "python3.7";
+const PYTHON = IS_PY2 ? "python2" : getarg("--python39") ? "python3.9" : getarg("--python38") ? "python3.8" : getarg("--python36") ? "python3.6" : "python3.7";
 
 let IMAGE = "manylinux2014";
 let MANYLINUX_VERSION;
@@ -64,7 +64,7 @@ try {
 
         // These are system deps that may only be in place from pep-517/518 so
         // lets reinstall them to be sure
-        cmd += `${PYTHON} -m pip install 'numpy>=1.13.1' && `;
+        cmd += `${PYTHON} -m pip install -U 'numpy>=1.13.1' wheel twine && `;
 
         // remove the build folder so we completely rebuild (and pick up the
         // libs we just installed above, since this build method won't use