From 97dc468f2147808c2233b3642ccd2dc7c396f8f0 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Fri, 17 Sep 2021 17:38:45 -0700 Subject: [PATCH 01/22] preupdate python310 matrix --- .azure-pipelines/client.test.live.yml | 13 +++++++++++++ .azure-pipelines/client.yml | 21 +++++++++++++++++++++ .azure-pipelines/install_python_version.py | 2 +- .travis.yml | 7 +++++++ setup.py | 1 + 5 files changed, 43 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 29e740420..c48664223 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,6 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -36,6 +37,9 @@ jobs: x64 Python 3.9: PythonArchitecture: 'x64' PythonVersion: '$(PythonVersion39)' + x64 Python 3.10: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion310)' x86 Python 2.7: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion27)' @@ -52,6 +56,9 @@ jobs: x86 Python 3.9: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion39)' + x86 Python 3.10: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion310)' steps: - template: /.azure-pipelines/use-python-version.yml @@ -143,6 +150,9 @@ jobs: Python 3.9: PythonBin: 'python3' PythonVersion: '$(PythonVersion39)' + Python 3.10: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion310)' variables: MacOSXDeploymentTarget: '10.9' @@ -152,6 +162,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' + PythonVersion310: '3.10.0' steps: - task: DownloadPipelineArtifact@1 @@ -255,6 +266,8 @@ jobs: PythonVersion: '$(PythonVersion38)' Python 3.9: PythonVersion: '$(PythonVersion39)' + Python 3.10: + PythonVersion: '$(PythonVersion310)' steps: - template: /.azure-pipelines/use-python-version.yml diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 32c3587a8..5ba996cca 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,6 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -67,6 +68,9 @@ jobs: Python 3.9: PythonBin: 'python3' PythonVersion: '$(PythonVersion39)' + Python 3.10: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion310)' variables: MacOSXDeploymentTarget: '10.9' @@ -76,6 +80,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' + PythonVersion310: '3.10.0' steps: - task: DownloadPipelineArtifact@1 @@ -168,6 +173,9 @@ jobs: x64 Python 3.9: PythonArchitecture: 'x64' PythonVersion: '$(PythonVersion39)' + x64 Python 3.10: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion310)' x86 Python 2.7: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion27)' @@ -184,6 +192,9 @@ jobs: x86 Python 3.9: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion39)' + x86 Python 3.10: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion310)' steps: - template: /.azure-pipelines/use-python-version.yml @@ -254,6 +265,8 @@ jobs: PythonVersion: '$(PythonVersion38)' Python 3.9: PythonVersion: '$(PythonVersion39)' + Python 3.10: + PythonVersion: '$(PythonVersion310)' steps: - template: /.azure-pipelines/use-python-version.yml @@ -333,6 +346,10 @@ jobs: ContainerImage: 'manylinux_crypto_x64' PythonVersion: 'cp39-cp39' Platform: 'manylinux1_x86_64' + Python310-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp310-cp310' + Platform: 'manylinux1_x86_64' Python27m-manylinux2010: ContainerImage: 'manylinux2010_crypto_x64' PythonVersion: 'cp27-cp27m' @@ -357,6 +374,10 @@ jobs: ContainerImage: 'manylinux2010_crypto_x64' PythonVersion: 'cp39-cp39' Platform: 'manylinux2010_x86_64' + Python310-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64' + PythonVersion: 'cp310-cp310' + Platform: 'manylinux2010_x86_64' steps: - task: Docker@1 diff --git a/.azure-pipelines/install_python_version.py b/.azure-pipelines/install_python_version.py index 57fe949d3..ab1317d4b 100644 --- a/.azure-pipelines/install_python_version.py +++ b/.azure-pipelines/install_python_version.py @@ -141,7 +141,7 @@ def get_installer_url(requested_version, requested_arch, version_manifest): ) args = parser.parse_args() - max_precached_version = Version("3.9.0") + max_precached_version = Version("3.10.0") try: version_from_spec = Version(args.version_spec) except InvalidVersion: diff --git a/.travis.yml b/.travis.yml index d57d5565d..65b758d77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,13 @@ matrix: - pytest - python ./setup.py check -r -s - pylint --extension-pkg-whitelist=uamqp.c_uamqp uamqp + - os: linux + python: "3.10" + env: UAMQP_ENV=LINUX310 + script: + - pytest + - python ./setup.py check -r -s + - pylint --extension-pkg-whitelist=uamqp.c_uamqp uamqp sudo: required services: - docker diff --git a/setup.py b/setup.py index c968520cf..c351b0d50 100644 --- a/setup.py +++ b/setup.py @@ -360,6 +360,7 @@ def build_cmake(self, ext): 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', 'License :: OSI Approved :: MIT License' ], zip_safe=False, From 57288de4dd22a632d3399f40d88cb9e9f13cdd8a Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 28 Sep 2021 16:40:49 -0700 Subject: [PATCH 02/22] update dev requirement --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 504d8c294..9ba8cb726 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -2,7 +2,7 @@ cython==0.29.21 setuptools>=27.1.2 wheel>=0.32.0 pytest==6.2.4; python_version >= '3.10' -pytest==5.4.1; python_version >= '3.6' +pytest==5.4.1; python_version >= '3.6' and python_version < '3.10' pytest==4.6.9; python_version == '2.7' pytest-asyncio==0.10.0; python_version >= '3.6' docutils>=0.14 From 601c2f0dad997b4a7aa1ba3a29bf66b4cd60d712 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 14:51:39 -0700 Subject: [PATCH 03/22] adding new dockerfile based on previous docker output. updating manylinux2010 --- utils/ManyLinux1_64bit/Dockerfile | 6 +++++- utils/ManyLinux1_64bit/build.ps1 | 10 ++++++++++ utils/ManyLinux1_64bit_azsdk/Dockerfile | 2 ++ utils/ManyLinux1_64bit_azsdk/build.ps1 | 19 +++++++++++++++++++ utils/ManyLinux1_64bit_azsdk/build.sh | 8 ++++++++ utils/ManyLinux2010_64bit/Dockerfile | 2 +- utils/ManyLinux2010_64bit/build.ps1 | 10 ++++++++++ 7 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 utils/ManyLinux1_64bit/build.ps1 create mode 100644 utils/ManyLinux1_64bit_azsdk/Dockerfile create mode 100644 utils/ManyLinux1_64bit_azsdk/build.ps1 create mode 100644 utils/ManyLinux1_64bit_azsdk/build.sh create mode 100644 utils/ManyLinux2010_64bit/build.ps1 diff --git a/utils/ManyLinux1_64bit/Dockerfile b/utils/ManyLinux1_64bit/Dockerfile index e4e360f08..6eed8dd3f 100644 --- a/utils/ManyLinux1_64bit/Dockerfile +++ b/utils/ManyLinux1_64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM pyca/cryptography-manylinux1:x86_64 +FROM quay.io/pypa/manylinux1_x86_64:latest # Build cmake 3.11 RUN pushd /tmp && \ @@ -19,3 +19,7 @@ RUN pushd /tmp && \ make && \ make install && \ popd + +# RUN apt-get install software-properties-common git --yes +# RUN add-apt-repository ppa:deadsnakes/ppa -y +# RUN apt install python3.10 -y \ No newline at end of file diff --git a/utils/ManyLinux1_64bit/build.ps1 b/utils/ManyLinux1_64bit/build.ps1 new file mode 100644 index 000000000..984b0ffa3 --- /dev/null +++ b/utils/ManyLinux1_64bit/build.ps1 @@ -0,0 +1,10 @@ +param ( + [string] + $TAG +) + +az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages || exit 1 +az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG . +docker pull azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG +docker tag azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG azuresdkimages.azurecr.io/manylinux_crypto_x64:latest +docker push azuresdkimages.azurecr.io/manylinux_crypto_x64:latest diff --git a/utils/ManyLinux1_64bit_azsdk/Dockerfile b/utils/ManyLinux1_64bit_azsdk/Dockerfile new file mode 100644 index 000000000..9c494f353 --- /dev/null +++ b/utils/ManyLinux1_64bit_azsdk/Dockerfile @@ -0,0 +1,2 @@ +FROM azuresdkimages.azurecr.io/manylinux_crypto_x64:3.9 + diff --git a/utils/ManyLinux1_64bit_azsdk/build.ps1 b/utils/ManyLinux1_64bit_azsdk/build.ps1 new file mode 100644 index 000000000..8555e6fda --- /dev/null +++ b/utils/ManyLinux1_64bit_azsdk/build.ps1 @@ -0,0 +1,19 @@ +param ( + [string] + $TAG, + [bool] + $Deploy = $false +) + +if($Deploy -eq $true){ + az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages || exit 1 + az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG . + docker pull azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG + docker tag azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:latest + docker push azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:latest +} +else { + az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages || exit 1 + docker build -t azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG . +} + diff --git a/utils/ManyLinux1_64bit_azsdk/build.sh b/utils/ManyLinux1_64bit_azsdk/build.sh new file mode 100644 index 000000000..808f95e60 --- /dev/null +++ b/utils/ManyLinux1_64bit_azsdk/build.sh @@ -0,0 +1,8 @@ +#!/bin/sh +[ -z "$TAG" ] && echo "Must set \$TAG to a value (e.g. '3.8')" && exit 1 + +az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages || exit 1 +az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG . +docker pull azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG +docker tag azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG azuresdkimages.azurecr.io/manylinux_crypto_x64:latest +docker push azuresdkimages.azurecr.io/manylinux_crypto_x64:latest diff --git a/utils/ManyLinux2010_64bit/Dockerfile b/utils/ManyLinux2010_64bit/Dockerfile index e0eb9bc29..62ab16b20 100644 --- a/utils/ManyLinux2010_64bit/Dockerfile +++ b/utils/ManyLinux2010_64bit/Dockerfile @@ -1,4 +1,4 @@ -FROM pyca/cryptography-manylinux2010:x86_64 +FROM ghcr.io/pyca/cryptography-manylinux2010:x86_64 # Build cmake 3.11 RUN pushd /tmp && \ diff --git a/utils/ManyLinux2010_64bit/build.ps1 b/utils/ManyLinux2010_64bit/build.ps1 new file mode 100644 index 000000000..01559d3a4 --- /dev/null +++ b/utils/ManyLinux2010_64bit/build.ps1 @@ -0,0 +1,10 @@ +param ( + [string] + $TAG +) + +az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages +az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux2010_crypto_x64:$TAG . +docker pull azuresdkimages.azurecr.io/manylinux2010_crypto_x64:$TAG +docker tag azuresdkimages.azurecr.io/manylinux2010_crypto_x64:$TAG azuresdkimages.azurecr.io/manylinux2010_crypto_x64:latest +docker push azuresdkimages.azurecr.io/manylinux2010_crypto_x64:latest From 2f0ea3dd39a26a7fb37f9d1b4c526e4674245ce8 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:04:12 -0700 Subject: [PATCH 04/22] manylinux 3.10rc2 set up and ready --- utils/ManyLinux1_64bit_azsdk/Dockerfile | 18 ++ utils/ManyLinux1_64bit_azsdk/Setup | 377 ++++++++++++++++++++++++ 2 files changed, 395 insertions(+) create mode 100644 utils/ManyLinux1_64bit_azsdk/Setup diff --git a/utils/ManyLinux1_64bit_azsdk/Dockerfile b/utils/ManyLinux1_64bit_azsdk/Dockerfile index 9c494f353..ceb58ddc4 100644 --- a/utils/ManyLinux1_64bit_azsdk/Dockerfile +++ b/utils/ManyLinux1_64bit_azsdk/Dockerfile @@ -1,2 +1,20 @@ FROM azuresdkimages.azurecr.io/manylinux_crypto_x64:3.9 +# download source +RUN yum install gcc openssl-devel bzip2-devel libffi-devel -y \ + && curl -O https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc2.tgz \ + && tar -xzf ./Python-3.10.0rc2.tgz + +# copy file with necessary configurations for openssl +COPY Setup /root/Python-3.10.0rc2/Modules/Setup + +# ensure none of the lineendings in the copied file were wrong. install python3.10 +RUN sed -i -e 's/\r$//' /root/Python-3.10.0rc2/Modules/Setup \ + && cd Python-3.10.0rc2 \ + && ./configure --enable-optimizations \ + && make altinstall + +# ensure proper symlinks are in place as necessary for tooling +RUN mkdir -p /opt/python/cp310-cp310/bin \ + && ln -s /usr/local/bin/python3.10 /opt/python/cp310-cp310/bin/python \ + && ln -s /usr/local/bin/pip3.10 /opt/python/cp310-cp310/bin/pip diff --git a/utils/ManyLinux1_64bit_azsdk/Setup b/utils/ManyLinux1_64bit_azsdk/Setup new file mode 100644 index 000000000..c69b5fa4f --- /dev/null +++ b/utils/ManyLinux1_64bit_azsdk/Setup @@ -0,0 +1,377 @@ +# -*- makefile -*- +# The file Setup is used by the makesetup script to construct the files +# Makefile and config.c, from Makefile.pre and config.c.in, +# respectively. Note that Makefile.pre is created from Makefile.pre.in +# by the toplevel configure script. + +# (VPATH notes: Setup and Makefile.pre are in the build directory, as +# are Makefile and config.c; the *.in files are in the source directory.) + +# Each line in this file describes one or more optional modules. +# Modules configured here will not be compiled by the setup.py script, +# so the file can be used to override setup.py's behavior. +# Tag lines containing just the word "*static*", "*shared*" or "*disabled*" +# (without the quotes but with the stars) are used to tag the following module +# descriptions. Tag lines may alternate throughout this file. Modules are +# built statically when they are preceded by a "*static*" tag line or when +# there is no tag line between the start of the file and the module +# description. Modules are built as a shared library when they are preceded by +# a "*shared*" tag line. Modules are not built at all, not by the Makefile, +# nor by the setup.py script, when they are preceded by a "*disabled*" tag +# line. + +# Lines have the following structure: +# +# ... [ ...] [ ...] [ ...] +# +# is anything ending in .c (.C, .cc, .c++ are C++ files) +# is anything starting with -I, -D, -U or -C +# is anything ending in .a or beginning with -l or -L +# is anything else but should be a valid Python +# identifier (letters, digits, underscores, beginning with non-digit) +# +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# +# Lines can also have the form +# +# = +# +# which defines a Make variable definition inserted into Makefile.in +# +# The build process works like this: +# +# 1. Build all modules that are declared as static in Modules/Setup, +# combine them into libpythonxy.a, combine that into python. +# 2. Build all modules that are listed as shared in Modules/Setup. +# 3. Invoke setup.py. That builds all modules that +# a) are not builtin, and +# b) are not listed in Modules/Setup, and +# c) can be build on the target +# +# Therefore, modules declared to be shared will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options. Rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) +# +# NOTE: As a standard policy, as many modules as can be supported by a +# platform should be present. The distribution comes with all modules +# enabled that are supported by most platforms and don't require you +# to ftp sources from elsewhere. + + +# Some special rules to define PYTHONPATH. +# Edit the definitions below to indicate which options you are using. +# Don't add any whitespace or comments! + +# Directories where library files get installed. +# DESTLIB is for Python modules; MACHDESTLIB for shared libraries. +DESTLIB=$(LIBDEST) +MACHDESTLIB=$(BINLIBDEST) + +# NOTE: all the paths are now relative to the prefix that is computed +# at run time! + +# Standard path -- don't edit. +# No leading colon since this is the first entry. +# Empty since this is now just the runtime prefix. +DESTPATH= + +# Site specific path components -- should begin with : if non-empty +SITEPATH= + +# Standard path components for test modules +TESTPATH= + +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH) +PYTHONPATH=$(COREPYTHONPATH) + + +# The modules listed here can't be built as shared libraries for +# various reasons; therefore they are listed here instead of in the +# normal order. + +# This only contains the minimal set of modules required to run the +# setup.py script in the root of the Python source tree. + +posix -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal posixmodule.c # posix (UNIX) system calls +errno errnomodule.c # posix (UNIX) errno values +pwd pwdmodule.c # this is needed to find out the user's home dir + # if $HOME is not set +_sre -DPy_BUILD_CORE_BUILTIN _sre.c # Fredrik Lundh's new regular expressions +_codecs _codecsmodule.c # access to the builtin codecs and codec registry +_weakref _weakref.c # weak references +_functools -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _functoolsmodule.c # Tools for working with functions and callable objects +_operator -DPy_BUILD_CORE_BUILTIN _operator.c # operator.add() and similar goodies +_collections _collectionsmodule.c # Container types +_abc -DPy_BUILD_CORE_BUILTIN _abc.c # Abstract base classes +itertools itertoolsmodule.c # Functions creating iterators for efficient looping +atexit atexitmodule.c # Register functions to be run at interpreter-shutdown +_signal -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal signalmodule.c +_stat _stat.c # stat.h interface +time -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal timemodule.c # -lm # time operations and variables +_thread -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal _threadmodule.c # low-level threading interface + +# access to ISO C locale support +_locale -DPy_BUILD_CORE_BUILTIN _localemodule.c # -lintl + +# Standard I/O baseline +_io -DPy_BUILD_CORE_BUILTIN -I$(srcdir)/Include/internal -I$(srcdir)/Modules/_io _io/_iomodule.c _io/iobase.c _io/fileio.c _io/bytesio.c _io/bufferedio.c _io/textio.c _io/stringio.c + +# faulthandler module +faulthandler faulthandler.c + +# debug tool to trace memory blocks allocated by Python +# +# bpo-35053: The module must be builtin since _Py_NewReference() +# can call _PyTraceMalloc_NewReference(). +_tracemalloc _tracemalloc.c + +# The rest of the modules listed in this file are all commented out by +# default. Usually they can be detected and built as dynamically +# loaded modules by the new setup.py script added in Python 2.1. If +# you're on a platform that doesn't support dynamic loading, want to +# compile modules statically into the Python binary, or need to +# specify some odd set of compiler switches, you can uncomment the +# appropriate lines below. + +# ====================================================================== + +# The Python symtable module depends on .h files that setup.py doesn't track +_symtable symtablemodule.c + +# Uncommenting the following line tells makesetup that all following +# modules are to be built as shared libraries (see above for more +# detail; also note that *static* or *disabled* cancels this effect): + +#*shared* + +# GNU readline. Unlike previous Python incarnations, GNU readline is +# now incorporated in an optional module, configured in the Setup file +# instead of by a configure script switch. You may have to insert a +# -L option pointing to the directory where libreadline.* lives, +# and you may have to change -ltermcap to -ltermlib or perhaps remove +# it, depending on your system -- see the GNU readline instructions. +# It's okay for this to be a shared library, too. + +#readline readline.c -lreadline -ltermcap + + +# Modules that should always be present (non UNIX dependent): + +#array -DPy_BUILD_CORE_MODULE arraymodule.c # array objects +#cmath cmathmodule.c _math.c -DPy_BUILD_CORE_MODULE # -lm # complex math library functions +#math mathmodule.c _math.c -DPy_BUILD_CORE_MODULE # -lm # math library functions, e.g. sin() +#_contextvars _contextvarsmodule.c # Context Variables +#_struct -DPy_BUILD_CORE_MODULE _struct.c # binary structure packing/unpacking +#_weakref _weakref.c # basic weak reference support +#_testcapi _testcapimodule.c # Python C API test module +#_testinternalcapi _testinternalcapi.c -I$(srcdir)/Include/internal -DPy_BUILD_CORE_MODULE # Python internal C API test module +#_random _randommodule.c -DPy_BUILD_CORE_MODULE # Random number generator +#_elementtree -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DUSE_PYEXPAT_CAPI _elementtree.c # elementtree accelerator +#_pickle -DPy_BUILD_CORE_MODULE _pickle.c # pickle accelerator +#_datetime _datetimemodule.c # datetime accelerator +#_zoneinfo _zoneinfo.c -DPy_BUILD_CORE_MODULE # zoneinfo accelerator +#_bisect _bisectmodule.c # Bisection algorithms +#_heapq _heapqmodule.c -DPy_BUILD_CORE_MODULE # Heap queue algorithm +#_asyncio _asynciomodule.c # Fast asyncio Future +#_json -I$(srcdir)/Include/internal -DPy_BUILD_CORE_BUILTIN _json.c # _json speedups +#_statistics _statisticsmodule.c # statistics accelerator + +#unicodedata unicodedata.c -DPy_BUILD_CORE_BUILTIN # static Unicode character database + + +# Modules with some UNIX dependencies -- on by default: +# (If you have a really backward UNIX, select and socket may not be +# supported...) + +#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) +#spwd spwdmodule.c # spwd(3) +#grp grpmodule.c # grp(3) +#select selectmodule.c # select(2); not on ancient System V + +# Memory-mapped files (also works on Win32). +#mmap mmapmodule.c + +# CSV file helper +#_csv _csv.c + +# Socket module helper for socket(2) +#_socket socketmodule.c + +# Socket module helper for SSL support; you must comment out the other +# socket line above, and edit the OPENSSL variable: +OPENSSL=/opt/pyca/cryptography/openssl +_ssl _ssl.c \ + -I$(OPENSSL)/include -L$(OPENSSL)/lib \ + -lssl -lcrypto +_hashlib _hashopenssl.c \ + -I$(OPENSSL)/include -L$(OPENSSL)/lib \ + -lcrypto + +# To statically link OpenSSL: +_ssl _ssl.c \ + -I$(OPENSSL)/include -L$(OPENSSL)/lib \ + -l:libssl.a -Wl,--exclude-libs,libssl.a \ + -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a +_hashlib _hashopenssl.c \ + -I$(OPENSSL)/include -L$(OPENSSL)/lib \ + -l:libcrypto.a -Wl,--exclude-libs,libcrypto.a + +# The crypt module is now disabled by default because it breaks builds +# on many systems (where -lcrypt is needed), e.g. Linux (I believe). + +#_crypt _cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems + + +# Some more UNIX dependent modules -- off by default, since these +# are not supported by all UNIX systems: + +#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere +#termios termios.c # Steen Lumholt's termios module +#resource resource.c # Jeremy Hylton's rlimit interface + +#_posixsubprocess -DPy_BUILD_CORE_BUILTIN _posixsubprocess.c # POSIX subprocess module helper + +# Multimedia modules -- off by default. +# These don't work for 64-bit platforms!!! +# #993173 says audioop works on 64-bit platforms, though. +# These represent audio samples or images as strings: + +#audioop audioop.c # Operations on audio samples + + +# Note that the _md5 and _sha modules are normally only built if the +# system does not have the OpenSSL libs containing an optimized version. + +# The _md5 module implements the RSA Data Security, Inc. MD5 +# Message-Digest Algorithm, described in RFC 1321. + +#_md5 md5module.c + + +# The _sha module implements the SHA checksum algorithms. +# (NIST's Secure Hash Algorithms.) +#_sha1 sha1module.c +#_sha256 sha256module.c -DPy_BUILD_CORE_BUILTIN +#_sha512 sha512module.c -DPy_BUILD_CORE_BUILTIN +#_sha3 _sha3/sha3module.c + +# _blake module +#_blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c + +# The _tkinter module. +# +# The command for _tkinter is long and site specific. Please +# uncomment and/or edit those parts as indicated. If you don't have a +# specific extension (e.g. Tix or BLT), leave the corresponding line +# commented out. (Leave the trailing backslashes in! If you +# experience strange errors, you may want to join all uncommented +# lines and remove the backslashes -- the backslash interpretation is +# done by the shell's "read" command and it may not be implemented on +# every system. + +# *** Always uncomment this (leave the leading underscore in!): +# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ +# *** Uncomment and edit to reflect where your Tcl/Tk libraries are: +# -L/usr/local/lib \ +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: +# -I/usr/X11R6/include \ +# *** Or uncomment this for Solaris: +# -I/usr/openwin/include \ +# *** Uncomment and edit for Tix extension only: +# -DWITH_TIX -ltix8.1.8.2 \ +# *** Uncomment and edit for BLT extension only: +# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ +# *** Uncomment and edit for PIL (TkImaging) extension only: +# (See http://www.pythonware.com/products/pil/ for more info) +# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ +# *** Uncomment and edit for TOGL extension only: +# -DWITH_TOGL togl.c \ +# *** Uncomment and edit to reflect your Tcl/Tk versions: +# -ltk8.2 -ltcl8.2 \ +# *** Uncomment and edit to reflect where your X11 libraries are: +# -L/usr/X11R6/lib \ +# *** Or uncomment this for Solaris: +# -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ +# *** Always uncomment this; X11 libraries to link with: +# -lX11 + +# Lance Ellinghaus's syslog module +#syslog syslogmodule.c # syslog daemon interface + + +# Curses support, requiring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses). + +#_curses _cursesmodule.c -lcurses -ltermcap -DPy_BUILD_CORE_MODULE +# Wrapper for the panel library that's part of ncurses and SYSV curses. +#_curses_panel _curses_panel.c -lpanel -lncurses + + +# Modules that provide persistent dictionary-like semantics. You will +# probably want to arrange for at least one of them to be available on +# your machine, though none are defined by default because of library +# dependencies. The Python module dbm/__init__.py provides an +# implementation independent wrapper for these; dbm/dumb.py provides +# similar functionality (but slower of course) implemented in Python. + +#_dbm _dbmmodule.c # dbm(3) may require -lndbm or similar + +# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: + +#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm + + +# Helper module for various ascii-encoders +#binascii binascii.c + +# Andrew Kuchling's zlib module. +# This require zlib 1.1.3 (or later). +# See http://www.gzip.org/zlib/ +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz + +# Interface to the Expat XML parser +# More information on Expat can be found at www.libexpat.org. +# +#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI + +# Hye-Shik Chang's CJKCodecs + +# multibytecodec is required for all the other CJK codec modules +#_multibytecodec cjkcodecs/multibytecodec.c + +#_codecs_cn cjkcodecs/_codecs_cn.c +#_codecs_hk cjkcodecs/_codecs_hk.c +#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c +#_codecs_jp cjkcodecs/_codecs_jp.c +#_codecs_kr cjkcodecs/_codecs_kr.c +#_codecs_tw cjkcodecs/_codecs_tw.c + +# Example -- included for reference only: +# xx xxmodule.c + +# Another example -- the 'xxsubtype' module shows C-level subtyping in action +xxsubtype xxsubtype.c + +# Uncommenting the following line tells makesetup that all following modules +# are not built (see above for more detail). +# +#*disabled* +# +#_sqlite3 _tkinter _curses pyexpat +#_codecs_jp _codecs_kr _codecs_tw unicodedata From c875f6064f5122f56af162ede149e417495f4a7d Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:08:20 -0700 Subject: [PATCH 05/22] adjust target image. ensure that build.sh for azsdk version of manylinux1 aligns with build.ps1 for the same. --- .azure-pipelines/client.yml | 2 +- utils/ManyLinux1_64bit_azsdk/build.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 5ba996cca..2444f7cdc 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -347,7 +347,7 @@ jobs: PythonVersion: 'cp39-cp39' Platform: 'manylinux1_x86_64' Python310-manylinux1: - ContainerImage: 'manylinux_crypto_x64' + ContainerImage: 'manylinux_crypto_x64_azsdk' PythonVersion: 'cp310-cp310' Platform: 'manylinux1_x86_64' Python27m-manylinux2010: diff --git a/utils/ManyLinux1_64bit_azsdk/build.sh b/utils/ManyLinux1_64bit_azsdk/build.sh index 808f95e60..d235ebdac 100644 --- a/utils/ManyLinux1_64bit_azsdk/build.sh +++ b/utils/ManyLinux1_64bit_azsdk/build.sh @@ -2,7 +2,7 @@ [ -z "$TAG" ] && echo "Must set \$TAG to a value (e.g. '3.8')" && exit 1 az acr login --subscription "Azure SDK Engineering System" --name azuresdkimages || exit 1 -az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG . -docker pull azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG -docker tag azuresdkimages.azurecr.io/manylinux_crypto_x64:$TAG azuresdkimages.azurecr.io/manylinux_crypto_x64:latest -docker push azuresdkimages.azurecr.io/manylinux_crypto_x64:latest +az acr build --subscription "Azure SDK Engineering System" -r azuresdkimages -t azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG . +docker pull azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG +docker tag azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:$TAG azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:latest +docker push azuresdkimages.azurecr.io/manylinux_crypto_x64_azsdk:latest From 3195876d62539b11d42680d1cbc5f668fd020687 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:19:41 -0700 Subject: [PATCH 06/22] update target version of python 3.10 --- .azure-pipelines/client.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 2444f7cdc..d1fc22b5d 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10rc2' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: From 651afa286891dfd20a57c856deef9f036d0739c6 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:24:22 -0700 Subject: [PATCH 07/22] disabling all but 310 to ensure we don't choke the agent pull. revert this before merge --- .azure-pipelines/client.yml | 220 ++++++++++++++++++------------------ 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index d1fc22b5d..5f5b0dc18 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -52,22 +52,22 @@ jobs: strategy: matrix: - Python 2.7: - PythonBin: 'python2' - PythonVersion: '$(PythonVersion27)' - GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - Python 3.6: - PythonBin: 'python3' - PythonVersion: '$(PythonVersion36)' - Python 3.7: - PythonBin: 'python3' - PythonVersion: '$(PythonVersion37)' - Python 3.8: - PythonBin: 'python3' - PythonVersion: '$(PythonVersion38)' - Python 3.9: - PythonBin: 'python3' - PythonVersion: '$(PythonVersion39)' + # Python 2.7: + # PythonBin: 'python2' + # PythonVersion: '$(PythonVersion27)' + # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + # Python 3.6: + # PythonBin: 'python3' + # PythonVersion: '$(PythonVersion36)' + # Python 3.7: + # PythonBin: 'python3' + # PythonVersion: '$(PythonVersion37)' + # Python 3.8: + # PythonBin: 'python3' + # PythonVersion: '$(PythonVersion38)' + # Python 3.9: + # PythonBin: 'python3' + # PythonVersion: '$(PythonVersion39)' Python 3.10: PythonBin: 'python3' PythonVersion: '$(PythonVersion310)' @@ -157,41 +157,41 @@ jobs: strategy: matrix: - x64 Python 2.7: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion27)' - GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - x64 Python 3.6: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion36)' - x64 Python 3.7: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion37)' - x64 Python 3.8: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion38)' - x64 Python 3.9: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion39)' - x64 Python 3.10: - PythonArchitecture: 'x64' - PythonVersion: '$(PythonVersion310)' - x86 Python 2.7: - PythonArchitecture: 'x86' - PythonVersion: '$(PythonVersion27)' - GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - x86 Python 3.6: - PythonArchitecture: 'x86' - PythonVersion: '$(PythonVersion36)' - x86 Python 3.7: - PythonArchitecture: 'x86' - PythonVersion: '$(PythonVersion37)' - x86 Python 3.8: - PythonArchitecture: 'x86' - PythonVersion: '$(PythonVersion38)' - x86 Python 3.9: - PythonArchitecture: 'x86' - PythonVersion: '$(PythonVersion39)' + # x64 Python 2.7: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion27)' + # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + # x64 Python 3.6: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion36)' + # x64 Python 3.7: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion37)' + # x64 Python 3.8: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion38)' + # x64 Python 3.9: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion39)' + # x64 Python 3.10: + # PythonArchitecture: 'x64' + # PythonVersion: '$(PythonVersion310)' + # x86 Python 2.7: + # PythonArchitecture: 'x86' + # PythonVersion: '$(PythonVersion27)' + # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + # x86 Python 3.6: + # PythonArchitecture: 'x86' + # PythonVersion: '$(PythonVersion36)' + # x86 Python 3.7: + # PythonArchitecture: 'x86' + # PythonVersion: '$(PythonVersion37)' + # x86 Python 3.8: + # PythonArchitecture: 'x86' + # PythonVersion: '$(PythonVersion38)' + # x86 Python 3.9: + # PythonArchitecture: 'x86' + # PythonVersion: '$(PythonVersion39)' x86 Python 3.10: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion310)' @@ -254,17 +254,17 @@ jobs: strategy: matrix: - Python 2.7: - PythonVersion: '$(PythonVersion27)' - GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - Python 3.6: - PythonVersion: '$(PythonVersion36)' - Python 3.7: - PythonVersion: '$(PythonVersion37)' - Python 3.8: - PythonVersion: '$(PythonVersion38)' - Python 3.9: - PythonVersion: '$(PythonVersion39)' + # Python 2.7: + # PythonVersion: '$(PythonVersion27)' + # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + # Python 3.6: + # PythonVersion: '$(PythonVersion36)' + # Python 3.7: + # PythonVersion: '$(PythonVersion37)' + # Python 3.8: + # PythonVersion: '$(PythonVersion38)' + # Python 3.9: + # PythonVersion: '$(PythonVersion39)' Python 3.10: PythonVersion: '$(PythonVersion310)' @@ -322,58 +322,58 @@ jobs: strategy: matrix: - Python27m-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp27-cp27m' - Platform: 'manylinux1_x86_64' - Python27mu-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp27-cp27mu' - Platform: 'manylinux1_x86_64' - Python36m-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp36-cp36m' - Platform: 'manylinux1_x86_64' - Python37m-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp37-cp37m' - Platform: 'manylinux1_x86_64' - Python38-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp38-cp38' - Platform: 'manylinux1_x86_64' - Python39-manylinux1: - ContainerImage: 'manylinux_crypto_x64' - PythonVersion: 'cp39-cp39' - Platform: 'manylinux1_x86_64' + # Python27m-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp27-cp27m' + # Platform: 'manylinux1_x86_64' + # Python27mu-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp27-cp27mu' + # Platform: 'manylinux1_x86_64' + # Python36m-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp36-cp36m' + # Platform: 'manylinux1_x86_64' + # Python37m-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp37-cp37m' + # Platform: 'manylinux1_x86_64' + # Python38-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp38-cp38' + # Platform: 'manylinux1_x86_64' + # Python39-manylinux1: + # ContainerImage: 'manylinux_crypto_x64' + # PythonVersion: 'cp39-cp39' + # Platform: 'manylinux1_x86_64' Python310-manylinux1: ContainerImage: 'manylinux_crypto_x64_azsdk' PythonVersion: 'cp310-cp310' Platform: 'manylinux1_x86_64' - Python27m-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp27-cp27m' - Platform: 'manylinux2010_x86_64' - Python27mu-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp27-cp27mu' - Platform: 'manylinux2010_x86_64' - Python36m-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp36-cp36m' - Platform: 'manylinux2010_x86_64' - Python37m-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp37-cp37m' - Platform: 'manylinux2010_x86_64' - Python38-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp38-cp38' - Platform: 'manylinux2010_x86_64' - Python39-manylinux2010: - ContainerImage: 'manylinux2010_crypto_x64' - PythonVersion: 'cp39-cp39' - Platform: 'manylinux2010_x86_64' + # Python27m-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp27-cp27m' + # Platform: 'manylinux2010_x86_64' + # Python27mu-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp27-cp27mu' + # Platform: 'manylinux2010_x86_64' + # Python36m-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp36-cp36m' + # Platform: 'manylinux2010_x86_64' + # Python37m-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp37-cp37m' + # Platform: 'manylinux2010_x86_64' + # Python38-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp38-cp38' + # Platform: 'manylinux2010_x86_64' + # Python39-manylinux2010: + # ContainerImage: 'manylinux2010_crypto_x64' + # PythonVersion: 'cp39-cp39' + # Platform: 'manylinux2010_x86_64' Python310-manylinux2010: ContainerImage: 'manylinux2010_crypto_x64' PythonVersion: 'cp310-cp310' From 2e555ce6a9ba2d8824834f95be1d7dd19948fa16 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 17:42:06 -0700 Subject: [PATCH 08/22] updated installer script to actually pull down 3.10. updated client yml as well --- .azure-pipelines/client.yml | 4 ++-- .azure-pipelines/install_python_version.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 5f5b0dc18..40aafaf26 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10rc2' + PythonVersion310: '3.10.0-rc.2' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -80,7 +80,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' - PythonVersion310: '3.10.0' + PythonVersion310: '3.10.0-rc.2' steps: - task: DownloadPipelineArtifact@1 diff --git a/.azure-pipelines/install_python_version.py b/.azure-pipelines/install_python_version.py index ab1317d4b..31943576a 100644 --- a/.azure-pipelines/install_python_version.py +++ b/.azure-pipelines/install_python_version.py @@ -141,7 +141,7 @@ def get_installer_url(requested_version, requested_arch, version_manifest): ) args = parser.parse_args() - max_precached_version = Version("3.10.0") + max_precached_version = Version("3.9.7") try: version_from_spec = Version(args.version_spec) except InvalidVersion: From 75cd5a09ed55aa1786e89b1af0e17fabf503c841 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 18:00:02 -0700 Subject: [PATCH 09/22] attempt kinda upgrade --- .azure-pipelines/client.yml | 2 +- install_python_osx.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 40aafaf26..472d22293 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -80,7 +80,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' - PythonVersion310: '3.10.0-rc.2' + PythonVersion310: '3.10.0rc2' steps: - task: DownloadPipelineArtifact@1 diff --git a/install_python_osx.sh b/install_python_osx.sh index 5ba5ce7b3..4a8054622 100644 --- a/install_python_osx.sh +++ b/install_python_osx.sh @@ -5,6 +5,10 @@ PACKAGE_TYPE="macosx10.9" if [[ "$PYTHONVERSION" =~ ^3.5 ]]; then PACKAGE_TYPE="macosx10.6" fi +if [[ "$PYTHONVERSION" =~ ^3.10 ]]; then + PACKAGE_TYPE="macosx11" +fi + # Handle prerelease versions PACKAGE_DIR="$PYTHONVERSION" From 699b947a074484f128c3e155319cfa4df6697ae9 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 18:04:55 -0700 Subject: [PATCH 10/22] change the target package --- install_python_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_python_osx.sh b/install_python_osx.sh index 4a8054622..1f04a6362 100644 --- a/install_python_osx.sh +++ b/install_python_osx.sh @@ -6,7 +6,7 @@ if [[ "$PYTHONVERSION" =~ ^3.5 ]]; then PACKAGE_TYPE="macosx10.6" fi if [[ "$PYTHONVERSION" =~ ^3.10 ]]; then - PACKAGE_TYPE="macosx11" + PACKAGE_TYPE="macos11" fi From 80f06c7ac1553e39062fda282c57e617e139f8f7 Mon Sep 17 00:00:00 2001 From: scbedd <45376673+scbedd@users.noreply.github.com> Date: Thu, 30 Sep 2021 19:15:18 -0700 Subject: [PATCH 11/22] we can't find libffi --- utils/ManyLinux1_64bit_azsdk/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/utils/ManyLinux1_64bit_azsdk/Dockerfile b/utils/ManyLinux1_64bit_azsdk/Dockerfile index ceb58ddc4..678a91742 100644 --- a/utils/ManyLinux1_64bit_azsdk/Dockerfile +++ b/utils/ManyLinux1_64bit_azsdk/Dockerfile @@ -1,15 +1,18 @@ FROM azuresdkimages.azurecr.io/manylinux_crypto_x64:3.9 # download source -RUN yum install gcc openssl-devel bzip2-devel libffi-devel -y \ +RUN yum install gcc openssl-devel bzip2-devel libffi libffi-dev libffi-devel -y \ && curl -O https://www.python.org/ftp/python/3.10.0/Python-3.10.0rc2.tgz \ && tar -xzf ./Python-3.10.0rc2.tgz # copy file with necessary configurations for openssl COPY Setup /root/Python-3.10.0rc2/Modules/Setup +ENV CFLAGS=-I/usr/lib64/libffi-3.0.5/include + # ensure none of the lineendings in the copied file were wrong. install python3.10 -RUN sed -i -e 's/\r$//' /root/Python-3.10.0rc2/Modules/Setup \ +RUN ldconfig \ + && sed -i -e 's/\r$//' /root/Python-3.10.0rc2/Modules/Setup \ && cd Python-3.10.0rc2 \ && ./configure --enable-optimizations \ && make altinstall From 023ab84126656e791f8e90bf4d1a21d0cdaf1537 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Fri, 1 Oct 2021 15:50:30 -0700 Subject: [PATCH 12/22] update pytest asyncio dep --- dev_requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 9ba8cb726..8a0043aa4 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ wheel>=0.32.0 pytest==6.2.4; python_version >= '3.10' pytest==5.4.1; python_version >= '3.6' and python_version < '3.10' pytest==4.6.9; python_version == '2.7' -pytest-asyncio==0.10.0; python_version >= '3.6' +pytest-asyncio==0.12.0; python_version >= '3.6' docutils>=0.14 pygments>=2.2.0 pylint==2.3.1; python_version >= '3.4' From 56410c77fa116991a052eaa70ebce53967382bb2 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Fri, 1 Oct 2021 16:24:31 -0700 Subject: [PATCH 13/22] fix async test --- samples/asynctests/test_loop_param_async.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/asynctests/test_loop_param_async.py b/samples/asynctests/test_loop_param_async.py index acda0b765..d1616e9c5 100644 --- a/samples/asynctests/test_loop_param_async.py +++ b/samples/asynctests/test_loop_param_async.py @@ -55,5 +55,5 @@ async def auth_async_loop(): with pytest.raises(ValueError) as e: await auth_async.create_authenticator_async("fake_conn", loop=asyncio.get_event_loop()) assert "no longer supports loop" in e - loop = asyncio.get_event_loop() - loop.run_until_complete(auth_async_loop()) + + await auth_async_loop() From 2944ea8b862c291e296c533e91e6bcb4533e29f9 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Mon, 4 Oct 2021 10:51:31 -0700 Subject: [PATCH 14/22] drop manylinux1 3.10 --- .azure-pipelines/client.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 472d22293..5b1f42094 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -173,9 +173,9 @@ jobs: # x64 Python 3.9: # PythonArchitecture: 'x64' # PythonVersion: '$(PythonVersion39)' - # x64 Python 3.10: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion310)' + x64 Python 3.10: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion310)' # x86 Python 2.7: # PythonArchitecture: 'x86' # PythonVersion: '$(PythonVersion27)' @@ -346,10 +346,6 @@ jobs: # ContainerImage: 'manylinux_crypto_x64' # PythonVersion: 'cp39-cp39' # Platform: 'manylinux1_x86_64' - Python310-manylinux1: - ContainerImage: 'manylinux_crypto_x64_azsdk' - PythonVersion: 'cp310-cp310' - Platform: 'manylinux1_x86_64' # Python27m-manylinux2010: # ContainerImage: 'manylinux2010_crypto_x64' # PythonVersion: 'cp27-cp27m' From 3b1a8dc46ebca38dc998e7cd90b43f6979b57bf8 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Mon, 4 Oct 2021 10:56:23 -0700 Subject: [PATCH 15/22] update livetest, changelog and bump version --- .azure-pipelines/client.test.live.yml | 12 ++++++------ HISTORY.rst | 5 +++++ uamqp/__init__.py | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index c48664223..977615e5f 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10.0-rc.2' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -162,7 +162,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' - PythonVersion310: '3.10.0' + PythonVersion310: '3.10.0rc2' steps: - task: DownloadPipelineArtifact@1 @@ -337,13 +337,13 @@ jobs: PythonVersion: '$(PythonVersion27)' SDK: 'EventHub' EventHub x64 Python 3.8: - PythonVersion: '$(PythonVersion38)' + PythonVersion: '$(PythonVersion310)' SDK: 'EventHub' ServiceBus x64 Python 2.7: PythonVersion: '$(PythonVersion27)' SDK: 'ServiceBus' ServiceBus x64 Python 3.8: - PythonVersion: '$(PythonVersion38)' + PythonVersion: '$(PythonVersion310)' SDK: 'ServiceBus' variables: PythonArchitecture: 'x64' @@ -393,13 +393,13 @@ jobs: PythonVersion: '$(PythonVersion37)' SDK: 'EventHub' EventHub Python 3.9: - PythonVersion: '$(PythonVersion39)' + PythonVersion: '$(PythonVersion310)' SDK: 'EventHub' ServiceBus Python 3.7: PythonVersion: '$(PythonVersion37)' SDK: 'ServiceBus' ServiceBus Python 3.9: - PythonVersion: '$(PythonVersion39)' + PythonVersion: '$(PythonVersion310)' SDK: 'ServiceBus' variables: OSArch: 'Linux' diff --git a/HISTORY.rst b/HISTORY.rst index 8efe7f941..8fe9df4d0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,11 @@ Release History =============== +1.4.3 (2021-10-05) ++++++++++++++++++++ + +- Added support for Python 3.10. + 1.4.2 (2021-09-21) +++++++++++++++++++ diff --git a/uamqp/__init__.py b/uamqp/__init__.py index 339131bde..5c157f73c 100644 --- a/uamqp/__init__.py +++ b/uamqp/__init__.py @@ -35,7 +35,7 @@ pass # Async not supported. -__version__ = "1.4.2" +__version__ = "1.4.3" _logger = logging.getLogger(__name__) From 198f9510552f613555a548680786ffeeafe81a8f Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Mon, 4 Oct 2021 13:48:43 -0700 Subject: [PATCH 16/22] move folder --- utils/{ => deprecated}/ManyLinux1_64bit/Dockerfile | 0 utils/{ => deprecated}/ManyLinux1_64bit/build.ps1 | 0 utils/{ => deprecated}/ManyLinux1_64bit/build.sh | 0 utils/{ => deprecated}/ManyLinux1_64bit_azsdk/Dockerfile | 0 utils/{ => deprecated}/ManyLinux1_64bit_azsdk/Setup | 0 utils/{ => deprecated}/ManyLinux1_64bit_azsdk/build.ps1 | 0 utils/{ => deprecated}/ManyLinux1_64bit_azsdk/build.sh | 0 utils/deprecated/readme.md | 6 ++++++ 8 files changed, 6 insertions(+) rename utils/{ => deprecated}/ManyLinux1_64bit/Dockerfile (100%) rename utils/{ => deprecated}/ManyLinux1_64bit/build.ps1 (100%) rename utils/{ => deprecated}/ManyLinux1_64bit/build.sh (100%) mode change 100755 => 100644 rename utils/{ => deprecated}/ManyLinux1_64bit_azsdk/Dockerfile (100%) rename utils/{ => deprecated}/ManyLinux1_64bit_azsdk/Setup (100%) rename utils/{ => deprecated}/ManyLinux1_64bit_azsdk/build.ps1 (100%) rename utils/{ => deprecated}/ManyLinux1_64bit_azsdk/build.sh (100%) create mode 100644 utils/deprecated/readme.md diff --git a/utils/ManyLinux1_64bit/Dockerfile b/utils/deprecated/ManyLinux1_64bit/Dockerfile similarity index 100% rename from utils/ManyLinux1_64bit/Dockerfile rename to utils/deprecated/ManyLinux1_64bit/Dockerfile diff --git a/utils/ManyLinux1_64bit/build.ps1 b/utils/deprecated/ManyLinux1_64bit/build.ps1 similarity index 100% rename from utils/ManyLinux1_64bit/build.ps1 rename to utils/deprecated/ManyLinux1_64bit/build.ps1 diff --git a/utils/ManyLinux1_64bit/build.sh b/utils/deprecated/ManyLinux1_64bit/build.sh old mode 100755 new mode 100644 similarity index 100% rename from utils/ManyLinux1_64bit/build.sh rename to utils/deprecated/ManyLinux1_64bit/build.sh diff --git a/utils/ManyLinux1_64bit_azsdk/Dockerfile b/utils/deprecated/ManyLinux1_64bit_azsdk/Dockerfile similarity index 100% rename from utils/ManyLinux1_64bit_azsdk/Dockerfile rename to utils/deprecated/ManyLinux1_64bit_azsdk/Dockerfile diff --git a/utils/ManyLinux1_64bit_azsdk/Setup b/utils/deprecated/ManyLinux1_64bit_azsdk/Setup similarity index 100% rename from utils/ManyLinux1_64bit_azsdk/Setup rename to utils/deprecated/ManyLinux1_64bit_azsdk/Setup diff --git a/utils/ManyLinux1_64bit_azsdk/build.ps1 b/utils/deprecated/ManyLinux1_64bit_azsdk/build.ps1 similarity index 100% rename from utils/ManyLinux1_64bit_azsdk/build.ps1 rename to utils/deprecated/ManyLinux1_64bit_azsdk/build.ps1 diff --git a/utils/ManyLinux1_64bit_azsdk/build.sh b/utils/deprecated/ManyLinux1_64bit_azsdk/build.sh similarity index 100% rename from utils/ManyLinux1_64bit_azsdk/build.sh rename to utils/deprecated/ManyLinux1_64bit_azsdk/build.sh diff --git a/utils/deprecated/readme.md b/utils/deprecated/readme.md new file mode 100644 index 000000000..5ecad75b8 --- /dev/null +++ b/utils/deprecated/readme.md @@ -0,0 +1,6 @@ +This folder holds scripts are deprecated. + +- ManyLinux1 + - Support for manylinux1 will end on January 1st, 2022. The PyPA team has decided to [drop support for manylinux1 images](https://github.com/pypa/manylinux/issues/994) and manylinux1 will not receive any new features (e.g. no CPython 3.10). + - What it means to uAMQP is from CPython 3.10 uAMQP wheels for manylinux1 will no longer be provided. + From c64d38d3ef743088f2ff114efeba57386b0b4dd6 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 09:42:46 -0700 Subject: [PATCH 17/22] update to 3.10 --- .azure-pipelines/client.test.live.yml | 4 +- .azure-pipelines/client.yml | 122 ++++++++++----------- .azure-pipelines/install_python_version.py | 2 +- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 977615e5f..10f84ca91 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10.0-rc.2' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -162,7 +162,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' - PythonVersion310: '3.10.0rc2' + PythonVersion310: '3.10.0' steps: - task: DownloadPipelineArtifact@1 diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 480233695..34c8d259b 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10.0-rc.2' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: @@ -52,22 +52,22 @@ jobs: strategy: matrix: - # Python 2.7: - # PythonBin: 'python2' - # PythonVersion: '$(PythonVersion27)' - # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - # Python 3.6: - # PythonBin: 'python3' - # PythonVersion: '$(PythonVersion36)' - # Python 3.7: - # PythonBin: 'python3' - # PythonVersion: '$(PythonVersion37)' - # Python 3.8: - # PythonBin: 'python3' - # PythonVersion: '$(PythonVersion38)' - # Python 3.9: - # PythonBin: 'python3' - # PythonVersion: '$(PythonVersion39)' + Python 2.7: + PythonBin: 'python2' + PythonVersion: '$(PythonVersion27)' + GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + Python 3.6: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion36)' + Python 3.7: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion37)' + Python 3.8: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion38)' + Python 3.9: + PythonBin: 'python3' + PythonVersion: '$(PythonVersion39)' Python 3.10: PythonBin: 'python3' PythonVersion: '$(PythonVersion310)' @@ -80,7 +80,7 @@ jobs: PythonVersion37: '3.7.6' PythonVersion38: '3.8.2' PythonVersion39: '3.9.0' - PythonVersion310: '3.10.0rc2' + PythonVersion310: '3.10.0' steps: - task: DownloadPipelineArtifact@1 @@ -157,41 +157,41 @@ jobs: strategy: matrix: - # x64 Python 2.7: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion27)' - # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - # x64 Python 3.6: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion36)' - # x64 Python 3.7: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion37)' - # x64 Python 3.8: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion38)' - # x64 Python 3.9: - # PythonArchitecture: 'x64' - # PythonVersion: '$(PythonVersion39)' + x64 Python 2.7: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion27)' + GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + x64 Python 3.6: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion36)' + x64 Python 3.7: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion37)' + x64 Python 3.8: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion38)' + x64 Python 3.9: + PythonArchitecture: 'x64' + PythonVersion: '$(PythonVersion39)' x64 Python 3.10: PythonArchitecture: 'x64' PythonVersion: '$(PythonVersion310)' - # x86 Python 2.7: - # PythonArchitecture: 'x86' - # PythonVersion: '$(PythonVersion27)' - # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - # x86 Python 3.6: - # PythonArchitecture: 'x86' - # PythonVersion: '$(PythonVersion36)' - # x86 Python 3.7: - # PythonArchitecture: 'x86' - # PythonVersion: '$(PythonVersion37)' - # x86 Python 3.8: - # PythonArchitecture: 'x86' - # PythonVersion: '$(PythonVersion38)' - # x86 Python 3.9: - # PythonArchitecture: 'x86' - # PythonVersion: '$(PythonVersion39)' + x86 Python 2.7: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion27)' + GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + x86 Python 3.6: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion36)' + x86 Python 3.7: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion37)' + x86 Python 3.8: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion38)' + x86 Python 3.9: + PythonArchitecture: 'x86' + PythonVersion: '$(PythonVersion39)' x86 Python 3.10: PythonArchitecture: 'x86' PythonVersion: '$(PythonVersion310)' @@ -254,17 +254,17 @@ jobs: strategy: matrix: - # Python 2.7: - # PythonVersion: '$(PythonVersion27)' - # GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' - # Python 3.6: - # PythonVersion: '$(PythonVersion36)' - # Python 3.7: - # PythonVersion: '$(PythonVersion37)' - # Python 3.8: - # PythonVersion: '$(PythonVersion38)' - # Python 3.9: - # PythonVersion: '$(PythonVersion39)' + Python 2.7: + PythonVersion: '$(PythonVersion27)' + GetPip: 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' + Python 3.6: + PythonVersion: '$(PythonVersion36)' + Python 3.7: + PythonVersion: '$(PythonVersion37)' + Python 3.8: + PythonVersion: '$(PythonVersion38)' + Python 3.9: + PythonVersion: '$(PythonVersion39)' Python 3.10: PythonVersion: '$(PythonVersion310)' diff --git a/.azure-pipelines/install_python_version.py b/.azure-pipelines/install_python_version.py index 31943576a..ab1317d4b 100644 --- a/.azure-pipelines/install_python_version.py +++ b/.azure-pipelines/install_python_version.py @@ -141,7 +141,7 @@ def get_installer_url(requested_version, requested_arch, version_manifest): ) args = parser.parse_args() - max_precached_version = Version("3.9.7") + max_precached_version = Version("3.10.0") try: version_from_spec = Version(args.version_spec) except InvalidVersion: From 40c120dbf4d791975d7b79a170317ef6b036d4e5 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 09:43:58 -0700 Subject: [PATCH 18/22] uncomment linux --- .azure-pipelines/client.yml | 96 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 34c8d259b..939bec87f 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -322,54 +322,54 @@ jobs: strategy: matrix: - # Python27m-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp27-cp27m' - # Platform: 'manylinux1_x86_64' - # Python27mu-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp27-cp27mu' - # Platform: 'manylinux1_x86_64' - # Python36m-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp36-cp36m' - # Platform: 'manylinux1_x86_64' - # Python37m-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp37-cp37m' - # Platform: 'manylinux1_x86_64' - # Python38-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp38-cp38' - # Platform: 'manylinux1_x86_64' - # Python39-manylinux1: - # ContainerImage: 'manylinux_crypto_x64' - # PythonVersion: 'cp39-cp39' - # Platform: 'manylinux1_x86_64' - # Python27m-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64:3.9' - # PythonVersion: 'cp27-cp27m' - # Platform: 'manylinux2010_x86_64' - # Python27mu-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64:3.9' - # PythonVersion: 'cp27-cp27mu' - # Platform: 'manylinux2010_x86_64' - # Python36m-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64' - # PythonVersion: 'cp36-cp36m' - # Platform: 'manylinux2010_x86_64' - # Python37m-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64' - # PythonVersion: 'cp37-cp37m' - # Platform: 'manylinux2010_x86_64' - # Python38-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64' - # PythonVersion: 'cp38-cp38' - # Platform: 'manylinux2010_x86_64' - # Python39-manylinux2010: - # ContainerImage: 'manylinux2010_crypto_x64' - # PythonVersion: 'cp39-cp39' - # Platform: 'manylinux2010_x86_64' + Python27m-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp27-cp27m' + Platform: 'manylinux1_x86_64' + Python27mu-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp27-cp27mu' + Platform: 'manylinux1_x86_64' + Python36m-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp36-cp36m' + Platform: 'manylinux1_x86_64' + Python37m-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp37-cp37m' + Platform: 'manylinux1_x86_64' + Python38-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp38-cp38' + Platform: 'manylinux1_x86_64' + Python39-manylinux1: + ContainerImage: 'manylinux_crypto_x64' + PythonVersion: 'cp39-cp39' + Platform: 'manylinux1_x86_64' + Python27m-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64:3.9' + PythonVersion: 'cp27-cp27m' + Platform: 'manylinux2010_x86_64' + Python27mu-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64:3.9' + PythonVersion: 'cp27-cp27mu' + Platform: 'manylinux2010_x86_64' + Python36m-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64' + PythonVersion: 'cp36-cp36m' + Platform: 'manylinux2010_x86_64' + Python37m-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64' + PythonVersion: 'cp37-cp37m' + Platform: 'manylinux2010_x86_64' + Python38-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64' + PythonVersion: 'cp38-cp38' + Platform: 'manylinux2010_x86_64' + Python39-manylinux2010: + ContainerImage: 'manylinux2010_crypto_x64' + PythonVersion: 'cp39-cp39' + Platform: 'manylinux2010_x86_64' Python310-manylinux2010: ContainerImage: 'manylinux2010_crypto_x64' PythonVersion: 'cp310-cp310' From 4011d1c80af100d0b264149566bbc638b69f68c9 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 10:08:20 -0700 Subject: [PATCH 19/22] specify to 3.10.0 --- .azure-pipelines/client.test.live.yml | 2 +- .azure-pipelines/client.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 10f84ca91..9829eb6de 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10.0' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 939bec87f..6fb78ddeb 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10.0' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: From 17c8069fbb213bd66c933bb194fc78ed961de63f Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 11:44:47 -0700 Subject: [PATCH 20/22] try reset max precached version --- .azure-pipelines/client.test.live.yml | 2 +- .azure-pipelines/client.yml | 2 +- .azure-pipelines/install_python_version.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 9829eb6de..10f84ca91 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10.0' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 6fb78ddeb..939bec87f 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10.0' + PythonVersion310: '3.10' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: diff --git a/.azure-pipelines/install_python_version.py b/.azure-pipelines/install_python_version.py index ab1317d4b..31943576a 100644 --- a/.azure-pipelines/install_python_version.py +++ b/.azure-pipelines/install_python_version.py @@ -141,7 +141,7 @@ def get_installer_url(requested_version, requested_arch, version_manifest): ) args = parser.parse_args() - max_precached_version = Version("3.10.0") + max_precached_version = Version("3.9.7") try: version_from_spec = Version(args.version_spec) except InvalidVersion: From c7f8afb5a98128663a4832a89080f3e2e4ffcc88 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 11:51:57 -0700 Subject: [PATCH 21/22] specify version --- .azure-pipelines/client.test.live.yml | 2 +- .azure-pipelines/client.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 10f84ca91..9829eb6de 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10.0' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: diff --git a/.azure-pipelines/client.yml b/.azure-pipelines/client.yml index 939bec87f..6fb78ddeb 100644 --- a/.azure-pipelines/client.yml +++ b/.azure-pipelines/client.yml @@ -7,7 +7,7 @@ variables: PythonVersion37: '3.7' PythonVersion38: '3.8' PythonVersion39: '3.9' - PythonVersion310: '3.10' + PythonVersion310: '3.10.0' GetPip: 'https://bootstrap.pypa.io/get-pip.py' jobs: From 440b05251984e40426205fb87e248b69d14656d0 Mon Sep 17 00:00:00 2001 From: "Adam Ling (MSFT)" Date: Tue, 5 Oct 2021 12:04:01 -0700 Subject: [PATCH 22/22] update name --- .azure-pipelines/client.test.live.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure-pipelines/client.test.live.yml b/.azure-pipelines/client.test.live.yml index 9829eb6de..80aec7f22 100644 --- a/.azure-pipelines/client.test.live.yml +++ b/.azure-pipelines/client.test.live.yml @@ -336,13 +336,13 @@ jobs: EventHub x64 Python 2.7: PythonVersion: '$(PythonVersion27)' SDK: 'EventHub' - EventHub x64 Python 3.8: + EventHub x64 Python 3.10: PythonVersion: '$(PythonVersion310)' SDK: 'EventHub' ServiceBus x64 Python 2.7: PythonVersion: '$(PythonVersion27)' SDK: 'ServiceBus' - ServiceBus x64 Python 3.8: + ServiceBus x64 Python 3.10: PythonVersion: '$(PythonVersion310)' SDK: 'ServiceBus' variables: @@ -392,13 +392,13 @@ jobs: EventHub Python 3.7: PythonVersion: '$(PythonVersion37)' SDK: 'EventHub' - EventHub Python 3.9: + EventHub Python 3.10: PythonVersion: '$(PythonVersion310)' SDK: 'EventHub' ServiceBus Python 3.7: PythonVersion: '$(PythonVersion37)' SDK: 'ServiceBus' - ServiceBus Python 3.9: + ServiceBus Python 3.10: PythonVersion: '$(PythonVersion310)' SDK: 'ServiceBus' variables: