3.11.0rc2

.ci_support/linux_64_openssl1.1.1.yaml

@@ -45,7 +45,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/linux_64_openssl3.yaml

@@ -45,7 +45,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/linux_aarch64_openssl1.1.1.yaml

@@ -49,7 +49,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/linux_aarch64_openssl3.yaml

@@ -49,7 +49,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/linux_ppc64le_openssl1.1.1.yaml

@@ -43,7 +43,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/linux_ppc64le_openssl3.yaml

@@ -43,7 +43,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/osx_64_openssl1.1.1.yaml

@@ -7,15 +7,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 libffi:
 - '3.4'
 macos_machine:
@@ -43,7 +43,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/osx_64_openssl3.yaml

@@ -7,15 +7,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 libffi:
 - '3.4'
 macos_machine:
@@ -43,7 +43,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/osx_arm64_openssl1.1.1.yaml

@@ -5,15 +5,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 libffi:
 - '3.4'
 macos_machine:
@@ -41,7 +41,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/osx_arm64_openssl3.yaml

@@ -5,15 +5,15 @@ bzip2:
 c_compiler:
 - clang
 c_compiler_version:
-- '13'
+- '14'
 channel_sources:
 - conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '13'
+- '14'
 libffi:
 - '3.4'
 macos_machine:
@@ -41,7 +41,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 readline:
 - '8'
 sqlite:

.ci_support/win_64_openssl1.1.1.yaml

@@ -29,7 +29,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 sqlite:
 - '3'
 target_platform:

.ci_support/win_64_openssl3.yaml

@@ -29,7 +29,7 @@ pin_run_as_build:
   zlib:
     max_pin: x.x
 python:
-- '3.10'
+- '3.11'
 sqlite:
 - '3'
 target_platform:

recipe/build_base.bat

@@ -25,8 +25,6 @@ for /F "tokens=1,2 delims=." %%i in ("%PKG_VERSION%") do (
   if NOT "%PY_VER%"=="%%i.%%j" exit 1
 )
 
-set "OPENSSL_DIR=%LIBRARY_PREFIX%"
-set "SQLITE3_DIR=%LIBRARY_PREFIX%"
 for /f "usebackq delims=" %%i in (`conda list -p %PREFIX% sqlite --no-show-channel-urls --json ^| findstr "version"`) do set SQLITE3_VERSION_LINE=%%i
 for /f "tokens=2 delims==/ " %%i IN ('echo %SQLITE3_VERSION_LINE%') do (set SQLITE3_VERSION=%%~i)
 echo SQLITE3_VERSION detected as %SQLITE3_VERSION%
@@ -95,17 +93,11 @@ xcopy /s /y /i %SRC_DIR%\Tools\demo %PREFIX%\Tools\demo
 if errorlevel 1 exit 1
 xcopy /s /y /i %SRC_DIR%\Tools\i18n %PREFIX%\Tools\i18n
 if errorlevel 1 exit 1
-xcopy /s /y /i %SRC_DIR%\Tools\pynche %PREFIX%\Tools\pynche
-if errorlevel 1 exit 1
 xcopy /s /y /i %SRC_DIR%\Tools\scripts %PREFIX%\Tools\scripts
 if errorlevel 1 exit 1
 
 del %PREFIX%\Tools\demo\README
 if errorlevel 1 exit 1
-del %PREFIX%\Tools\pynche\README
-if errorlevel 1 exit 1
-del %PREFIX%\Tools\pynche\pynche
-if errorlevel 1 exit 1
 del %PREFIX%\Tools\scripts\README
 if errorlevel 1 exit 1
 del %PREFIX%\Tools\scripts\dutree.doc

recipe/build_base.sh

@@ -130,6 +130,8 @@ fi
 
 export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
 
+declare -a _common_configure_args
+
 if [[ ${target_platform} == osx-* ]]; then
   sed -i -e "s/@OSX_ARCH@/$ARCH/g" Lib/distutils/unixccompiler.py
 fi
@@ -174,6 +176,7 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then
   export CONFIG_SITE=${PWD}/config.site
   # This is needed for libffi:
   export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig
+  _common_configure_args+=(--with-build-python=${BUILD_PYTHON_PREFIX}/bin/python)
 fi
 
 # This causes setup.py to query the sysroot directories from the compiler, something which
@@ -235,7 +238,6 @@ if [[ ${CC} =~ .*-arm.* ]]; then
   TEST_EXCLUDES+=(test_compiler)
 fi
 
-declare -a _common_configure_args
 _common_configure_args+=(--prefix=${PREFIX})
 _common_configure_args+=(--build=${BUILD})
 _common_configure_args+=(--host=${HOST})
@@ -391,7 +393,7 @@ fi
 ln -s ${PREFIX}/bin/python${VER} ${PREFIX}/bin/python
 ln -s ${PREFIX}/bin/pydoc${VER} ${PREFIX}/bin/pydoc
 # Workaround for https://github.com/conda/conda/issues/10969
-ln -s ${PREFIX}/bin/python3.10 ${PREFIX}/bin/python3.1
+ln -s ${PREFIX}/bin/python3.11 ${PREFIX}/bin/python3.1
 
 # Remove test data to save space
 # Though keep `support` as some things use that.
@@ -513,4 +515,4 @@ fi
 
 # Workaround for old conda versions which fail to install noarch packages for Python 3.10+
 # https://github.com/conda/conda/issues/10969
-ln -s "${PREFIX}/lib/python3.10" "${PREFIX}/lib/python3.1"
+ln -s "${PREFIX}/lib/python3.11" "${PREFIX}/lib/python3.1"

recipe/conda_build_config.yaml

@@ -1,14 +1,8 @@
 python:
-  - 3.10
+  - 3.11
 python_impl:
   - cpython
 numpy:
   - 1.16
-c_compiler:                    # [win]
-  - vs2017                     # [win]
-cxx_compiler:                  # [win]
-  - vs2017                     # [win]
-vc:                            # [win]
-  - 14.1                       # [win]
 MACOSX_SDK_VERSION:            # [osx and x86_64]
   - 11.0                       # [osx and x86_64]

recipe/meta.yaml

@@ -1,5 +1,5 @@
-{% set version = "3.10.6" %}
-{% set dev = "" %}
+{% set version = "3.11.0" %}
+{% set dev = "rc2" %}
 {% set dev_ = "" %}
 {% set ver2 = '.'.join(version.split('.')[0:2]) %}
 {% set ver2nd = ''.join(version.split('.')[0:2]) %}
@@ -47,41 +47,40 @@ source:
 {% else %}
   - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}{{ dev }}.tar.xz
     # md5 from: https://www.python.org/downloads/release/python-{{ ver3nd }}/
-    md5: afc7e14f7118d10d1ba95ae8e2134bf0
+    md5: 27ccc3ff3fdcf7f1ab178066e41e9dd5
 {% endif %}
     patches:
       - patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch
       - patches/0002-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch
-      - patches/0003-Support-cross-compiling-byte-code.patch
       # https://github.com/python/cpython/pull/28501
-      - patches/0004-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
+      - patches/0003-bpo-45258-search-for-isysroot-in-addition-to-sysroot.patch
       # https://github.com/pypa/distutils/pull/54
-      - patches/0005-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
-      - patches/0006-Win32-Do-not-download-externals.patch
-      - patches/0007-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
+      - patches/0004-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch
+      - patches/0005-Win32-Do-not-download-externals.patch
+      - patches/0006-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch
       # https://github.com/python/cpython/pull/28397
-      - patches/0008-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
-      - patches/0009-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
-      - patches/0010-Unvendor-openssl.patch
-      - patches/0011-Unvendor-sqlite3.patch
+      - patches/0007-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
+      - patches/0008-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch
+      - patches/0009-Unvendor-openssl.patch
+      - patches/0010-Unvendor-sqlite3.patch
       # https://github.com/pypa/distutils/pull/53
-      - patches/0012-Use-ranlib-from-env-if-env-variable-is-set.patch
-      - patches/0013-Add-CondaEcosystemModifyDllSearchPath.patch
-      - patches/0014-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
-      - patches/0015-Doing-d1trimfile.patch
+      - patches/0011-Use-ranlib-from-env-if-env-variable-is-set.patch
+      - patches/0012-Add-CondaEcosystemModifyDllSearchPath.patch
+      - patches/0013-Add-d1trimfile-SRC_DIR-to-make-pdbs-more-relocatable.patch
+      - patches/0014-Doing-d1trimfile.patch
       # https://github.com/python/cpython/pull/23523
-      - patches/0016-cross-compile-darwin.patch
-      - patches/0017-Fix-TZPATH-on-windows.patch
+      - patches/0015-cross-compile-darwin.patch
+      - patches/0016-Fix-TZPATH-on-windows.patch
       # https://github.com/python/cpython/pull/24324
-      - patches/0018-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
+      - patches/0017-Make-dyld-search-work-with-SYSTEM_VERSION_COMPAT-1.patch
       # https://github.com/pypa/distutils/pull/53
-      - patches/0019-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
-      - patches/0020-Unvendor-bzip2.patch
-      - patches/0021-Unvendor-libffi.patch
-      - patches/0022-Unvendor-tcltk.patch
-      - patches/0023-unvendor-xz.patch
-      - patches/0024-unvendor-zlib.patch
-      - patches/0025-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
+      - patches/0018-Fix-LDSHARED-when-CC-is-overriden-on-Linux-too.patch
+      - patches/0019-Unvendor-bzip2.patch
+      - patches/0020-Unvendor-libffi.patch
+      - patches/0021-Unvendor-tcltk.patch
+      - patches/0022-unvendor-xz.patch
+      - patches/0023-unvendor-zlib.patch
+      - patches/0024-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch
 
 build:
   number: {{ build_number }}
@@ -140,8 +139,6 @@ outputs:
         # Putting these here means they get emitted to build_env_setup.{sh,bat} meaning we can launch IDEs
         # after sourcing or calling that script without examine the contents of conda_build.{sh,bat} for
         # important env. vars.
-        - OPENSSL_DIR=%PREFIX%\Library    # [win]
-        - SQLITE3_DIR=%PREFIX%\Library    # [win]
 {% if 'conda-forge' in channel_targets %}
         - CONDA_FORGE=yes
 {% else %}
@@ -190,8 +187,9 @@ outputs:
     test:
       downstreams:
         # Temporarily disable dowmstream tests on aarch64 as the solver causes timeouts on drone
-        - cython  # [not aarch64]
-        - setuptools  # [not aarch64]
+        # Fully disable while migrating as the automatic skip doesn't work
+        # - cython  # [not aarch64]
+        # - setuptools  # [not aarch64]
       requires:
         - ripgrep
         - cmake

recipe/patches/0001-Win32-Change-FD_SETSIZE-from-512-to-2048.patch

@@ -1,18 +1,18 @@
-From a9cd933d936a603aa2326fe57a73d086609603c3 Mon Sep 17 00:00:00 2001
+From 79ed4c580d008ac554648f570209972a73c157f2 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Wed, 16 Aug 2017 11:53:55 +0100
-Subject: [PATCH 01/25] Win32: Change FD_SETSIZE from 512 to 2048
+Subject: [PATCH 01/24] Win32: Change FD_SETSIZE from 512 to 2048
 
 https://github.com/ContinuumIO/anaconda-issues/issues/1241
 ---
  Modules/selectmodule.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
-index 3afcb0e2a0..1ee953a6ae 100644
+index 4eea928a26..e3c5d82722 100644
 --- a/Modules/selectmodule.c
 +++ b/Modules/selectmodule.c
-@@ -33,7 +33,7 @@
+@@ -38,7 +38,7 @@
     FD_SETSIZE higher before this; e.g., via compiler /D switch.
  */
  #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
@@ -22,5 +22,5 @@ index 3afcb0e2a0..1ee953a6ae 100644
 
  #if defined(HAVE_POLL_H)
 -- 
-2.32.1 (Apple Git-133)
+2.30.2