From 196d36f87dfaa1970d9b3aa09ee5c314c415ef8a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Mon, 14 Oct 2019 18:16:22 +0000 Subject: [PATCH 01/54] updated v3.8.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index db4e0fa17..0e0aa13d8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set base_version = "3.7.3" %} -{% set version = "3.7.3" %} +{% set version = "3.8.0" %} {% set linkage_nature = os.environ.get('PY_INTERP_LINKAGE_NATURE', '') %} {% if linkage_nature != '' %} {% set linkage_nature = "_" ~ linkage_nature %} @@ -11,7 +11,7 @@ package: source: - url: https://www.python.org/ftp/python/{{ version }}/Python-{{ version }}.tar.xz - sha256: da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318 + sha256: b356244e13fb5491da890b35b13b2118c3122977c2cd825e3eb6e7d462030d84 patches: - patches/0001-Add-Anaconda-Distribution-version-logic.patch - patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch @@ -64,7 +64,7 @@ source: sha256: de3c87b26a80e789986d8e6950c6304175d3829afe9c6c7211eb7257266ab0ac # [win] build: - number: 1 + number: 0 # Windows has issues updating python if conda is using files itself. # Copy rather than link. no_link: From e7f86c2492314d93080f9a905e9d7c3d11de9bc5 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Mon, 14 Oct 2019 18:16:58 +0000 Subject: [PATCH 02/54] MNT: Re-rendered with conda-build 3.18.10, conda-smithy 3.6.0, and conda-forge-pinning 2019.10.11 --- .appveyor.yml | 3 ++- .azure-pipelines/azure-pipelines-linux.yml | 3 ++- .azure-pipelines/azure-pipelines-osx.yml | 3 ++- .azure-pipelines/azure-pipelines-win.yml | 2 ++ ..._aarch64_target_platformlinux-aarch64.yaml | 2 -- ..._ppc64le_target_platformlinux-ppc64le.yaml | 2 -- .../linux_target_platformlinux-64.yaml | 2 -- .ci_support/osx_target_platformosx-64.yaml | 6 ++--- ...mpilervs2015target_platformwin-64vc14.yaml | 2 -- .gitattributes | 17 +++++++++++++ .github/CODEOWNERS | 8 +----- .github/CONTRIBUTING.md | 15 ----------- .github/ISSUE_TEMPLATE.md | 25 ------------------- .github/PULL_REQUEST_TEMPLATE.md | 18 ------------- {.azure-pipelines => .scripts}/build_steps.sh | 0 .../run_docker_build.sh | 4 ++- build-locally.py | 19 ++++++++------ 17 files changed, 43 insertions(+), 88 deletions(-) delete mode 100644 .github/CONTRIBUTING.md delete mode 100644 .github/ISSUE_TEMPLATE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md rename {.azure-pipelines => .scripts}/build_steps.sh (100%) rename {.azure-pipelines => .scripts}/run_docker_build.sh (95%) diff --git a/.appveyor.yml b/.appveyor.yml index de17d4abd..2e4eb79db 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,7 +40,7 @@ install: # Tell conda we want an updated version of conda-forge-ci-setup and conda-build - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - - cmd: run_conda_forge_build_setup + # Skip .NET project specific build phase. build: off @@ -48,4 +48,5 @@ build: off test_script: - conda.exe build recipe -m .ci_support\%CONFIG%.yaml deploy_script: + - set "GIT_BRANCH=%APPVEYOR_REPO_BRANCH%" - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 89d46fcc4..de57a4fee 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -33,7 +33,8 @@ jobs: - script: | export CI=azure - .azure-pipelines/run_docker_build.sh + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME + .scripts/run_docker_build.sh displayName: Run docker build env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 33c7a5f78..1ce45b206 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -68,8 +68,9 @@ jobs: - script: | source activate base + export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml - displayName: Upload recipe + displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2d3583be3..9889eb5ce 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -95,7 +95,9 @@ jobs: condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | + set "GIT_BRANCH=%BUILD_SOURCEBRANCHNAME%" upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml index e3f484413..270f9f20d 100644 --- a/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_target_platformlinux-aarch64.yaml @@ -1,7 +1,5 @@ BUILD: - aarch64-conda_cos7-linux-gnu -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.10.sdk bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml index 0a3a50963..da10becc4 100644 --- a/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_target_platformlinux-ppc64le.yaml @@ -1,5 +1,3 @@ -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.10.sdk bzip2: - '1' c_compiler: diff --git a/.ci_support/linux_target_platformlinux-64.yaml b/.ci_support/linux_target_platformlinux-64.yaml index c6656da92..49a79efd5 100644 --- a/.ci_support/linux_target_platformlinux-64.yaml +++ b/.ci_support/linux_target_platformlinux-64.yaml @@ -1,5 +1,3 @@ -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.10.sdk bzip2: - '1' c_compiler: diff --git a/.ci_support/osx_target_platformosx-64.yaml b/.ci_support/osx_target_platformosx-64.yaml index 7bcc47c7a..0c0fd0b0c 100644 --- a/.ci_support/osx_target_platformosx-64.yaml +++ b/.ci_support/osx_target_platformosx-64.yaml @@ -1,5 +1,3 @@ -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.10.sdk MACOSX_DEPLOYMENT_TARGET: - '10.9' bzip2: @@ -7,7 +5,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '4' +- '9' channel_sources: - conda-forge,defaults channel_targets: @@ -15,7 +13,7 @@ channel_targets: cxx_compiler: - clangxx cxx_compiler_version: -- '4' +- '9' libffi: - '3.2' macos_machine: diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml b/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml index f254891bd..511b311d7 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml +++ b/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml @@ -1,5 +1,3 @@ -CONDA_BUILD_SYSROOT: -- /opt/MacOSX10.10.sdk c_compiler: - vs2015 channel_sources: diff --git a/.gitattributes b/.gitattributes index 974953ecb..86ff93771 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,3 +5,20 @@ meta.yaml text eol=lf build.sh text eol=lf bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 545306227..1f8df4bf6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,7 +1 @@ -* @jakirkham -* @jjhelmus -* @mingwandroid -* @msarahan -* @ocefpaf -* @pelson -* @scopatz +* @jakirkham @jjhelmus @mingwandroid @msarahan @ocefpaf @pelson @scopatz \ No newline at end of file diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index d87090f26..000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,15 +0,0 @@ -Thanks for your interest in helping out conda-forge. - -Whether you are brand new or a seasoned maintainer, we always appreciate -feedback from the community about how we can improve conda-forge. If you -are submitting a PR or issue, please fill out the respective template. Should -any questions arise please feel free to ask the maintainer team of the -respective feedstock or reach out to `@conda-forge/core` for more complex -issues. - -In the case of any issues reported, please be sure to demonstrate the relevant -issue (even if it is an absence of a feature). Providing this information will -help busy maintainers understand what it is you hope to accomplish. Also this -will help provide them clues as to what might be going wrong. These examples -can also be reused as tests in the build to ensure further packages meet these -criteria. This is requested to help you get timely and relevant feedback. :) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fc9533497..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,25 +0,0 @@ - -Issue: - -
-Environment (conda list): -
- -``` -$ conda list - -``` -
- -
-Details about conda and system ( conda info ): -
- -``` -$ conda info - -``` -
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index ba618a2ad..000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,18 +0,0 @@ - -Checklist -* [ ] Used a fork of the feedstock to propose changes -* [ ] Bumped the build number (if the version is unchanged) -* [ ] Reset the build number to `0` (if the version changed) -* [ ] [Re-rendered]( https://conda-forge.org/docs/maintainer/updating_pkgs.html#rerendering-feedstocks ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) -* [ ] Ensured the license file is being packaged. - - - - diff --git a/.azure-pipelines/build_steps.sh b/.scripts/build_steps.sh similarity index 100% rename from .azure-pipelines/build_steps.sh rename to .scripts/build_steps.sh diff --git a/.azure-pipelines/run_docker_build.sh b/.scripts/run_docker_build.sh similarity index 95% rename from .azure-pipelines/run_docker_build.sh rename to .scripts/run_docker_build.sh index 3524f61e9..066a85755 100755 --- a/.azure-pipelines/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -39,7 +39,7 @@ if [ -z "$CONFIG" ]; then fi if [ -z "${DOCKER_IMAGE}" ]; then - SHYAML_INSTALLED="$(shyaml --version || echo NO)" + SHYAML_INSTALLED="$(shyaml -h || echo NO)" if [ "${SHYAML_INSTALLED}" == "NO" ]; then echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7" DOCKER_IMAGE="condaforge/linux-anvil-comp7" @@ -64,6 +64,8 @@ docker run ${DOCKER_RUN_ARGS} \ -e BINSTAR_TOKEN \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e GIT_BRANCH \ + -e UPLOAD_ON_BRANCH \ -e CI \ $DOCKER_IMAGE \ bash \ diff --git a/build-locally.py b/build-locally.py index a7d9c2d19..8f7ecca4f 100755 --- a/build-locally.py +++ b/build-locally.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # This file has been generated by conda-smithy in order to build the recipe # locally. @@ -15,11 +15,14 @@ def setup_environment(ns): def run_docker_build(ns): - script = glob.glob(".*/run_docker_build.sh")[0] - subprocess.check_call(script) + script = ".scripts/run_docker_build.sh" + subprocess.check_call([script]) + def verify_config(ns): - valid_configs = {os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml")} + valid_configs = { + os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + } print(f"valid configs are {valid_configs}") if ns.config in valid_configs: print("Using " + ns.config + " configuration") @@ -39,8 +42,10 @@ def verify_config(ns): else: raise ValueError("config " + ns.config + " is not valid") # Remove the following, as implemented - if not ns.config.startswith('linux'): - raise ValueError(f"only Linux configs currently supported, got {ns.config}") + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) def main(args=None): @@ -55,4 +60,4 @@ def main(args=None): if __name__ == "__main__": - main() \ No newline at end of file + main() From 7da7eca7d9af9acd7e8764652668bf544a25ac36 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:46:40 -0500 Subject: [PATCH 03/54] remove usused base_version jinja variable --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 0e0aa13d8..72f6258e0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,3 @@ -{% set base_version = "3.7.3" %} {% set version = "3.8.0" %} {% set linkage_nature = os.environ.get('PY_INTERP_LINKAGE_NATURE', '') %} {% if linkage_nature != '' %} From f904df7b95a9d5151c37df9bba3d4152e7fec740 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:51:37 -0500 Subject: [PATCH 04/54] update patch set for 3.8.0 Remove: * 0003-Win32-distutils-Also-look-for-executable.bat.patch (not needed) * gh12445.patch (ununsed) Rebase all other patches --- recipe/meta.yaml | 36 +++++---- ...-Anaconda-Distribution-version-logic.patch | 26 +++---- ...arch-x86_64-to-UnicCCompiler-ld_args.patch | 10 +-- ...-Change-FD_SETSIZE-from-512-to-2048.patch} | 8 +- ...stutils-Also-look-for-executable.bat.patch | 61 --------------- ...re-Library-bin-is-in-os.environ-PATH.patch | 28 ------- ...dd-support-to-cygwinccompiler-for-V.patch} | 8 +- ...not-pass-g-to-GCC-when-not-Py_DEBUG.patch} | 16 ++-- ...6-Support-cross-compiling-byte-code.patch} | 45 +++++------ ...indows-GCC-interop-needed-by-RPy2-a.patch} | 8 +- ...sroot-usr-lib-include-if-sysroot-is.patch} | 22 +++--- ...ir_option-Use-1st-word-of-CC-as-com.patch} | 10 +-- ...0010-Win32-Do-not-download-externals.patch | 32 ++++++++ ...CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch} | 16 ++-- ...0011-Win32-Do-not-download-externals.patch | 25 ------ ...so-that-it-looks-in-sys.prefix-lib-.patch} | 10 +-- ...sable-new-dtags-in-unixccompiler.py.patch} | 12 +-- ...-compilation-on-Debian-based-distros.patch | 26 +++++++ ...lookup-unless-CONDA_PY_ALLOW_REG_PA.patch} | 12 +-- ...-compilation-on-Debian-based-distros.patch | 26 ------- ...nssl.patch => 0016-Unvendor-openssl.patch} | 40 +++++----- ...ite3.patch => 0017-Unvendor-sqlite3.patch} | 32 ++++---- ...ange-from-https-github.com-python-cp.patch | 46 +++++++++++ ...d-CondaEcosystemModifyDllSearchPath.patch} | 76 +++++++++---------- ...ange-from-https-github.com-python-cp.patch | 30 -------- recipe/patches/gh12445.patch | 23 ------ 26 files changed, 290 insertions(+), 394 deletions(-) rename recipe/patches/{0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch => 0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch} (75%) delete mode 100644 recipe/patches/0003-Win32-distutils-Also-look-for-executable.bat.patch delete mode 100644 recipe/patches/0004-Win32-Ensure-Library-bin-is-in-os.environ-PATH.patch rename recipe/patches/{0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch => 0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch} (79%) rename recipe/patches/{0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch => 0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch} (72%) rename recipe/patches/{0007-Support-cross-compiling-byte-code.patch => 0006-Support-cross-compiling-byte-code.patch} (79%) rename recipe/patches/{0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch => 0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch} (87%) rename recipe/patches/{0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch => 0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch} (54%) rename recipe/patches/{0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch => 0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch} (80%) create mode 100644 recipe/patches/0010-Win32-Do-not-download-externals.patch rename recipe/patches/{0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch => 0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch} (89%) delete mode 100644 recipe/patches/0011-Win32-Do-not-download-externals.patch rename recipe/patches/{0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch => 0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch} (92%) rename recipe/patches/{0014-Disable-new-dtags-in-unixccompiler.py.patch => 0013-Disable-new-dtags-in-unixccompiler.py.patch} (91%) create mode 100644 recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch rename recipe/patches/{0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch => 0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch} (75%) delete mode 100644 recipe/patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch rename recipe/patches/{0017-Unvendor-openssl.patch => 0016-Unvendor-openssl.patch} (82%) rename recipe/patches/{0018-Unvendor-sqlite3.patch => 0017-Unvendor-sqlite3.patch} (87%) create mode 100644 recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch rename recipe/patches/{0020-Add-CondaEcosystemModifyDllSearchPath.patch => 0019-Add-CondaEcosystemModifyDllSearchPath.patch} (91%) delete mode 100644 recipe/patches/0019-venv-Revert-a-change-from-https-github.com-python-cp.patch delete mode 100644 recipe/patches/gh12445.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 72f6258e0..17f4a3da3 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,26 +14,24 @@ source: patches: - patches/0001-Add-Anaconda-Distribution-version-logic.patch - patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch - - patches/0003-Win32-distutils-Also-look-for-executable.bat.patch - - patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch - - patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch - - patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch - - patches/0007-Support-cross-compiling-byte-code.patch - - patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch - - patches/0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch - - patches/0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch - - patches/0011-Win32-Do-not-download-externals.patch - - patches/0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch - - patches/0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch - - patches/0014-Disable-new-dtags-in-unixccompiler.py.patch - - patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch - - patches/0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch - - patches/0017-Unvendor-openssl.patch - - patches/0018-Unvendor-sqlite3.patch + - patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch + - patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch + - patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch + - patches/0006-Support-cross-compiling-byte-code.patch + - patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch + - patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch + - patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch + - patches/0010-Win32-Do-not-download-externals.patch + - patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch + - patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch + - patches/0013-Disable-new-dtags-in-unixccompiler.py.patch + - patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch + - patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch + - patches/0016-Unvendor-openssl.patch + - patches/0017-Unvendor-sqlite3.patch # https://bugs.python.org/issue35644 - - patches/0019-venv-Revert-a-change-from-https-github.com-python-cp.patch - # undefined reference to `CondaEcosystemGetWarnings' - # - patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch + - patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch + - patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch # TODO :: Depend on our own packages for these: - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win] folder: externals/xz-5.2.2 # [win] diff --git a/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch b/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch index 54f47de7d..fd2616254 100644 --- a/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch +++ b/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch @@ -1,20 +1,20 @@ -From 764c0905e2d07a3eb4ad0425dbcf8c2273786727 Mon Sep 17 00:00:00 2001 +From 04d06a499f5245acbae02a7c3a939506cfb12b41 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 15 Aug 2017 22:34:16 +0100 -Subject: [PATCH 01/15] Add Anaconda Distribution version logic +Subject: [PATCH 01/19] Add Anaconda Distribution version logic --- Include/pylifecycle.h | 1 + Lib/platform.py | 1 + Modules/main.c | 2 +- - Python/getversion.c | 46 +++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 49 insertions(+), 1 deletion(-) + Python/getversion.c | 47 +++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h -index 659c6df644..988f7558da 100644 +index c5368b3..06cb88e 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h -@@ -130,6 +130,7 @@ int _Py_CheckPython3(void); +@@ -52,6 +52,7 @@ int _Py_CheckPython3(void); #endif /* In their own files */ @@ -23,10 +23,10 @@ index 659c6df644..988f7558da 100644 PyAPI_FUNC(const char *) Py_GetPlatform(void); PyAPI_FUNC(const char *) Py_GetCopyright(void); diff --git a/Lib/platform.py b/Lib/platform.py -index dc981ec144..d04c03febb 100755 +index 6fbb7b0..a12f639 100755 --- a/Lib/platform.py +++ b/Lib/platform.py -@@ -1087,6 +1087,7 @@ def processor(): +@@ -943,6 +943,7 @@ def processor(): _sys_version_parser = re.compile( r'([\w.+]+)\s*' # "version" @@ -35,20 +35,20 @@ index dc981ec144..d04c03febb 100755 r'(?:,\s*([\w ]*)' # ", builddate" r'(?:,\s*([\w :]*))?)?\)\s*' # ", buildtime)" diff --git a/Modules/main.c b/Modules/main.c -index f6b5104300..949abe7047 100644 +index 2a360b5..0d2cf3a 100644 --- a/Modules/main.c +++ b/Modules/main.c -@@ -1221,7 +1221,7 @@ pymain_header(_PyMain *pymain) +@@ -204,7 +204,7 @@ pymain_header(const PyConfig *config) return; } - fprintf(stderr, "Python %s on %s\n", Py_GetVersion(), Py_GetPlatform()); + fprintf(stderr, "Python %s :: %s on %s\n", Py_GetVersion(), Anaconda_GetVersion(), Py_GetPlatform()); - if (!Py_NoSiteFlag) { + if (config->site_import) { fprintf(stderr, "%s\n", COPYRIGHT); } diff --git a/Python/getversion.c b/Python/getversion.c -index c32b6f9d60..03b6888976 100644 +index c32b6f9..b5dfffb 100644 --- a/Python/getversion.c +++ b/Python/getversion.c @@ -2,9 +2,56 @@ @@ -109,5 +109,5 @@ index c32b6f9d60..03b6888976 100644 Py_GetVersion(void) { -- -2.17.0 +2.17.1 diff --git a/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch b/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch index 80cc22dba..3563d37e6 100644 --- a/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch +++ b/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch @@ -1,17 +1,17 @@ -From 65a58ca7d2e0939e9308514345c56d53c47ed761 Mon Sep 17 00:00:00 2001 +From c96cc069c6c79c930e2a4dc18bd803c146e6f2f1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 08:48:16 +0100 -Subject: [PATCH 02/15] Darwin: Add -arch x86_64 to UnicCCompiler ld_args +Subject: [PATCH 02/19] Darwin: Add -arch x86_64 to UnicCCompiler ld_args --- Lib/distutils/unixccompiler.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index ab4d4de156..1aa99a0ff5 100644 +index d10a78d..87b3aed 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -192,6 +192,7 @@ class UnixCCompiler(CCompiler): +@@ -200,6 +200,7 @@ class UnixCCompiler(CCompiler): if sys.platform == 'darwin': linker = _osx_support.compiler_fixup(linker, ld_args) @@ -20,5 +20,5 @@ index ab4d4de156..1aa99a0ff5 100644 self.spawn(linker + ld_args) except DistutilsExecError as msg: -- -2.17.0 +2.17.1 diff --git a/recipe/patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch similarity index 75% rename from recipe/patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch rename to recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 417cfa41d..0ccf1add1 100644 --- a/recipe/patches/0004-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,7 +1,7 @@ -From 272da96dea9cd5e7d664c1bfa3bc3ffc4a75b698 Mon Sep 17 00:00:00 2001 +From 8c9b1642b56e9c29335c4b5849825ff050bf516d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 04/18] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 03/19] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- @@ -9,7 +9,7 @@ https://github.com/ContinuumIO/anaconda-issues/issues/1241 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c -index 93d896a37c..b14e05b60b 100644 +index ed71d8b..eb338ce 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -33,7 +33,7 @@ @@ -22,5 +22,5 @@ index 93d896a37c..b14e05b60b 100644 #if defined(HAVE_POLL_H) -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0003-Win32-distutils-Also-look-for-executable.bat.patch b/recipe/patches/0003-Win32-distutils-Also-look-for-executable.bat.patch deleted file mode 100644 index f6e19700a..000000000 --- a/recipe/patches/0003-Win32-distutils-Also-look-for-executable.bat.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c805283d9162b97d3d833e624e54966ae88a3751 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 16 Aug 2017 11:07:08 +0100 -Subject: [PATCH 03/15] Win32: distutils: Also look for executable.bat - -This patch should probably not exist, or at least be -rewritten. See the comments. ---- - Lib/distutils/spawn.py | 34 +++++++++++++++++++++++++--------- - 1 file changed, 25 insertions(+), 9 deletions(-) - -diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py -index 5dd415a283..bef82fb1ac 100644 ---- a/Lib/distutils/spawn.py -+++ b/Lib/distutils/spawn.py -@@ -176,17 +176,33 @@ def find_executable(executable, path=None): - path = os.environ['PATH'] - - paths = path.split(os.pathsep) -- base, ext = os.path.splitext(executable) -- -- if (sys.platform == 'win32') and (ext != '.exe'): -- executable = executable + '.exe' -+ # base, ext = os.path.splitext(executable) -+ -+ if sys.platform == 'win32': -+ # This should probably be: -+ # try: -+ # exts = os.environ['PATHEXT'].lower().split(';')+[''] -+ # except: -+ # exts = ['.exe.', '.bat', ''] -+ # but IMHO: -+ # 1. The original `ext` should appear as the first entry. -+ # 2. We should be adding `exts` to `base`, not `executable` -+ # 3. Why even bother? We do not add '.sh' for Unix. -+ exts = ['.exe', '.bat', ''] -+ else: -+ exts = [''] - - if not os.path.isfile(executable): -- for p in paths: -- f = os.path.join(p, executable) -- if os.path.isfile(f): -- # the file exists, we have a shot at spawn working -- return f -+ for ext in exts: -+ newexe = executable + ext -+ if os.path.isfile(newexe): -+ return newexe -+ else: -+ for p in paths: -+ f = os.path.join(p, newexe) -+ if os.path.isfile(f): -+ # the file exists, we have a shot at spawn working -+ return f - return None - else: - return executable --- -2.17.0 - diff --git a/recipe/patches/0004-Win32-Ensure-Library-bin-is-in-os.environ-PATH.patch b/recipe/patches/0004-Win32-Ensure-Library-bin-is-in-os.environ-PATH.patch deleted file mode 100644 index 6141f7fbe..000000000 --- a/recipe/patches/0004-Win32-Ensure-Library-bin-is-in-os.environ-PATH.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 87557429da5e17ff1cb3693290a8e65d5b087f8a Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 16 Aug 2017 11:15:26 +0100 -Subject: [PATCH 04/18] Win32: Ensure Library\bin is in os.environ["PATH"] - ---- - Lib/site.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Lib/site.py b/Lib/site.py -index ffd132b389..9051938bf4 100644 ---- a/Lib/site.py -+++ b/Lib/site.py -@@ -572,6 +572,11 @@ def main(): - execsitecustomize() - if ENABLE_USER_SITE: - execusercustomize() -+ if sys.platform == 'win32': -+ # Anaconda Distribution hack in-case the environment has not been activated properly. -+ library_bin = r"%s\Library\bin" % (sys.prefix) -+ if library_bin not in os.environ["PATH"]: -+ os.environ["PATH"] = library_bin+";"+os.environ["PATH"] - - # Prevent extending of sys.path when python was started with -S and - # site is imported later. --- -2.19.1 - diff --git a/recipe/patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch similarity index 79% rename from recipe/patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch rename to recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch index cdb4b62e3..02718cd84 100644 --- a/recipe/patches/0005-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch +++ b/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch @@ -1,7 +1,7 @@ -From b594ebe39a05f196ec795e76fcfb3cc338fc4da4 Mon Sep 17 00:00:00 2001 +From 6f0c709840cdb957dd3434ef0d3c16ba4132c221 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:59:00 +0100 -Subject: [PATCH 05/18] Win32: distutils: Add support to cygwinccompiler for +Subject: [PATCH 04/19] Win32: distutils: Add support to cygwinccompiler for VS>=2015 Really this is for mingw-w64 though @@ -10,7 +10,7 @@ Really this is for mingw-w64 though 1 file changed, 3 insertions(+) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 6c5d77746b..48013e1000 100644 +index 6c5d777..48013e1 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -82,6 +82,9 @@ def get_msvcr(): @@ -24,5 +24,5 @@ index 6c5d77746b..48013e1000 100644 raise ValueError("Unknown MS Compiler version %s " % msc_ver) -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch similarity index 72% rename from recipe/patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch rename to recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index e8987098a..f9e682161 100644 --- a/recipe/patches/0006-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,7 +1,7 @@ -From 4abb94818226f20dbbdc28c959f8993412482158 Mon Sep 17 00:00:00 2001 +From 1bf716afd12bbaf23473884cd2cfc5c094fcce20 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 06/18] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 05/19] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- @@ -10,10 +10,10 @@ This bloats our exe and our modules a lot. 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure -index 5e5f974b0e..186748b8ef 100755 +index 2a933cd..fd56813 100755 --- a/configure +++ b/configure -@@ -4252,9 +4252,9 @@ if test "$ac_test_CFLAGS" = set; then +@@ -4225,9 +4225,9 @@ if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -25,7 +25,7 @@ index 5e5f974b0e..186748b8ef 100755 fi else if test "$GCC" = yes; then -@@ -6901,7 +6901,7 @@ then +@@ -6883,7 +6883,7 @@ then OPT="-g -O0 -Wall" fi else @@ -35,10 +35,10 @@ index 5e5f974b0e..186748b8ef 100755 ;; *) diff --git a/configure.ac b/configure.ac -index a7de901e08..35cba336ff 100644 +index a189d42..e8d4232 100644 --- a/configure.ac +++ b/configure.ac -@@ -1533,7 +1533,7 @@ then +@@ -1532,7 +1532,7 @@ then OPT="-g -O0 -Wall" fi else @@ -48,5 +48,5 @@ index a7de901e08..35cba336ff 100644 ;; *) -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0007-Support-cross-compiling-byte-code.patch b/recipe/patches/0006-Support-cross-compiling-byte-code.patch similarity index 79% rename from recipe/patches/0007-Support-cross-compiling-byte-code.patch rename to recipe/patches/0006-Support-cross-compiling-byte-code.patch index d5bc2d90f..f6cea7088 100644 --- a/recipe/patches/0007-Support-cross-compiling-byte-code.patch +++ b/recipe/patches/0006-Support-cross-compiling-byte-code.patch @@ -1,20 +1,20 @@ -From b78c493db837373a3ca2606276f0bc93eea62ebe Mon Sep 17 00:00:00 2001 +From 707ff4e4dccbc788cdd52d27cedeadcdb7e657ce Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:17:33 +0100 -Subject: [PATCH 07/18] Support cross-compiling byte-code +Subject: [PATCH 06/19] Support cross-compiling byte-code https://bugs.python.org/issue22724 --- - Makefile.pre.in | 15 ++++++++------- + Makefile.pre.in | 13 +++++++------ configure | 4 +++- configure.ac | 4 +++- - 3 files changed, 14 insertions(+), 9 deletions(-) + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2d2e11f172..44960dafc0 100644 +index 502317a..e0c2ccf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -244,6 +244,7 @@ BUILDPYTHON= python$(BUILDEXE) +@@ -245,6 +245,7 @@ BUILDPYTHON= python$(BUILDEXE) PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@ UPDATE_FILE=@PYTHON_FOR_REGEN@ $(srcdir)/Tools/scripts/update_file.py @@ -22,8 +22,8 @@ index 2d2e11f172..44960dafc0 100644 PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ _PYTHON_HOST_PLATFORM=@_PYTHON_HOST_PLATFORM@ BUILD_GNU_TYPE= @build@ -@@ -578,7 +579,7 @@ $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) - $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) +@@ -566,7 +567,7 @@ $(BUILDPYTHON): Programs/python.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) + $(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) platform: $(BUILDPYTHON) pybuilddir.txt - $(RUNSHARED) $(PYTHON_FOR_BUILD) -c 'import sys ; from sysconfig import get_platform ; print("%s-%d.%d" % (get_platform(), *sys.version_info[:2]))' >platform @@ -31,7 +31,7 @@ index 2d2e11f172..44960dafc0 100644 # Create build directory and generate the sysconfig build-time data there. # pybuilddir.txt contains the name of the build dir and is used for -@@ -589,7 +590,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt +@@ -577,7 +578,7 @@ platform: $(BUILDPYTHON) pybuilddir.txt # or removed in case of failure. pybuilddir.txt: $(BUILDPYTHON) @echo "none" > ./pybuilddir.txt @@ -40,7 +40,7 @@ index 2d2e11f172..44960dafc0 100644 if test $$? -ne 0 ; then \ echo "generate-posix-vars failed" ; \ rm -f ./pybuilddir.txt ; \ -@@ -620,7 +621,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o +@@ -608,7 +609,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \ $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ @@ -49,7 +49,7 @@ index 2d2e11f172..44960dafc0 100644 # Build static library -@@ -1120,7 +1121,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI +@@ -1176,7 +1177,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKI upgrade) ensurepip="--upgrade" ;; \ install|*) ensurepip="" ;; \ esac; \ @@ -58,7 +58,7 @@ index 2d2e11f172..44960dafc0 100644 $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -1130,7 +1131,7 @@ altinstall: commoninstall +@@ -1186,7 +1187,7 @@ altinstall: commoninstall upgrade) ensurepip="--altinstall --upgrade" ;; \ install|*) ensurepip="--altinstall" ;; \ esac; \ @@ -67,7 +67,7 @@ index 2d2e11f172..44960dafc0 100644 $$ensurepip --root=$(DESTDIR)/ ; \ fi -@@ -1524,7 +1525,7 @@ libainstall: @DEF_MAKE_RULE@ python-config +@@ -1599,7 +1600,7 @@ libainstall: @DEF_MAKE_RULE@ python-config # Install the dynamically loadable modules # This goes into $(exec_prefix) sharedinstall: sharedmods @@ -76,20 +76,11 @@ index 2d2e11f172..44960dafc0 100644 --prefix=$(prefix) \ --install-scripts=$(BINDIR) \ --install-platlib=$(DESTSHARED) \ -@@ -1608,7 +1609,7 @@ frameworkinstallextras: - # This installs a few of the useful scripts in Tools/scripts - scriptsinstall: - SRCDIR=$(srcdir) $(RUNSHARED) \ -- $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ -+ $(PY_BUILD_ENVIRON) $(PYTHON_FOR_BUILD) $(srcdir)/Tools/scripts/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --root=$(DESTDIR)/ diff --git a/configure b/configure -index 186748b8ef..f217762d97 100755 +index fd56813..ca48853 100755 --- a/configure +++ b/configure -@@ -751,6 +751,7 @@ CONFIG_ARGS +@@ -749,6 +749,7 @@ CONFIG_ARGS SOVERSION VERSION PYTHON_FOR_BUILD @@ -97,7 +88,7 @@ index 186748b8ef..f217762d97 100755 PYTHON_FOR_REGEN host_os host_vendor -@@ -2937,7 +2938,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } +@@ -2947,7 +2948,8 @@ $as_echo_n "checking for python interpreter for cross build... " >&6; } fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5 $as_echo "$interp" >&6; } @@ -108,7 +99,7 @@ index 186748b8ef..f217762d97 100755 elif test "$cross_compiling" = maybe; then as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5 diff --git a/configure.ac b/configure.ac -index 35cba336ff..3ab15bc7a5 100644 +index e8d4232..12bb2ae 100644 --- a/configure.ac +++ b/configure.ac @@ -75,13 +75,15 @@ if test "$cross_compiling" = yes; then @@ -129,5 +120,5 @@ index 35cba336ff..3ab15bc7a5 100644 dnl Ensure that if prefix is specified, it does not end in a slash. If -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch b/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch similarity index 87% rename from recipe/patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch rename to recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch index 6228bee31..25a68a8d5 100644 --- a/recipe/patches/0008-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch +++ b/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch @@ -1,7 +1,7 @@ -From 3cf14eba6eea86845b7e314c677085d725907fd9 Mon Sep 17 00:00:00 2001 +From 8abe927840f03c0bacee9453d1dcfe06a988f92a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:23:02 +0100 -Subject: [PATCH 08/18] Win32: Fixes for Windows GCC interop needed by RPy2 and +Subject: [PATCH 07/19] Win32: Fixes for Windows GCC interop needed by RPy2 and CVXOPT We must pass -DMS_WIN32 or -DMS_WIN64 @@ -10,7 +10,7 @@ We must pass -DMS_WIN32 or -DMS_WIN64 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py -index 48013e1000..339c2782f0 100644 +index 48013e1..339c278 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -302,9 +302,13 @@ class Mingw32CCompiler(CygwinCCompiler): @@ -31,5 +31,5 @@ index 48013e1000..339c2782f0 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch b/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch similarity index 54% rename from recipe/patches/0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch rename to recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch index 621403870..4de178adb 100644 --- a/recipe/patches/0009-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch +++ b/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch @@ -1,7 +1,7 @@ -From e5281244f25029012c4262975f9d160429903e5b Mon Sep 17 00:00:00 2001 +From 150303118df1e26651bcff26fab42995579ffa33 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 20 Aug 2017 00:22:22 +0100 -Subject: [PATCH 09/18] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot +Subject: [PATCH 08/19] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot is set --- @@ -9,24 +9,24 @@ Subject: [PATCH 09/18] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index b4357e39cf..611cc45a9a 100644 +index 20d7f35..7eb2095 100644 --- a/setup.py +++ b/setup.py -@@ -604,7 +604,13 @@ class PyBuildExt(build_ext): +@@ -675,7 +675,13 @@ class PyBuildExt(build_ext): # lib_dirs and inc_dirs are used to search for files; # if a file is found in one of those directories, it can # be assumed that no additional -I,-L directives are needed. -- if not cross_compiling: +- if not CROSS_COMPILING: + # If we are using a macosx sysroot then ensure we look in + # sysroot/usr/{lib,include} (irrespective of whether we consider + # this cross_compiling or not). + if macosx_sdk_root() != '/': -+ lib_dirs = self.compiler.library_dirs + ['/usr/lib'] -+ inc_dirs = self.compiler.include_dirs + ['/usr/include'] -+ elif not cross_compiling: - lib_dirs = self.compiler.library_dirs + system_lib_dirs - inc_dirs = self.compiler.include_dirs + system_include_dirs ++ self.lib_dirs = self.compiler.library_dirs + ['/usr/lib'] ++ self.inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ elif not CROSS_COMPILING: + self.lib_dirs = self.compiler.library_dirs + system_lib_dirs + self.inc_dirs = self.compiler.include_dirs + system_include_dirs else: -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch similarity index 80% rename from recipe/patches/0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch rename to recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch index aee8737e7..edfa77dc1 100644 --- a/recipe/patches/0010-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch +++ b/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch @@ -1,7 +1,7 @@ -From bd80eb066fcc3e6ea5eec58491cf8728403e5937 Mon Sep 17 00:00:00 2001 +From f1aa169b44cc8c083f6def2bf3e0dd8c5e77d29a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 5 Oct 2017 02:00:41 +0100 -Subject: [PATCH 10/18] runtime_library_dir_option: Use 1st word of CC as +Subject: [PATCH 09/19] runtime_library_dir_option: Use 1st word of CC as compiler Previous, 'CC' got passed to os.path.basename, so any paths in it after @@ -12,10 +12,10 @@ not get detected as gcc (or whatever it actually is). 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 1aa99a0ff5..1b8f31b0f7 100644 +index 87b3aed..78a4665 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -224,7 +224,7 @@ class UnixCCompiler(CCompiler): +@@ -232,7 +232,7 @@ class UnixCCompiler(CCompiler): # this time, there's no way to determine this information from # the configuration data stored in the Python installation, so # we use this hack. @@ -25,5 +25,5 @@ index 1aa99a0ff5..1b8f31b0f7 100644 # MacOSX's linker doesn't understand the -R flag at all return "-L" + dir -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0010-Win32-Do-not-download-externals.patch b/recipe/patches/0010-Win32-Do-not-download-externals.patch new file mode 100644 index 000000000..ef4ef3a3e --- /dev/null +++ b/recipe/patches/0010-Win32-Do-not-download-externals.patch @@ -0,0 +1,32 @@ +From 92cafbd9d9cdd6950aa2c0f4142afd0bf7d840e6 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Thu, 7 Sep 2017 11:35:47 +0100 +Subject: [PATCH 10/19] Win32: Do not download externals + +--- + PCbuild/build.bat | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/PCbuild/build.bat b/PCbuild/build.bat +index d44b52a..abfd4b6 100644 +--- a/PCbuild/build.bat ++++ b/PCbuild/build.bat +@@ -91,7 +91,7 @@ if "%IncludeCTypes%"=="" set IncludeCTypes=true + if "%IncludeSSL%"=="" set IncludeSSL=true + if "%IncludeTkinter%"=="" set IncludeTkinter=true + +-if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" ++rem if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" + + if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( + if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( +@@ -162,4 +162,4 @@ rem Display the current build version information + call "%dir%find_msbuild.bat" %MSBUILD% + if ERRORLEVEL 1 (echo Cannot locate MSBuild.exe on PATH or as MSBUILD variable & exit /b 2) + %MSBUILD% "%dir%pythoncore.vcxproj" /t:ShowVersionInfo /v:m /nologo %1 %2 %3 %4 %5 %6 %7 %8 %9 +-if ERRORLEVEL 1 exit /b 3 +\ No newline at end of file ++if ERRORLEVEL 1 exit /b 3 +-- +2.17.1 + diff --git a/recipe/patches/0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch b/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch similarity index 89% rename from recipe/patches/0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch rename to recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch index 07f82aceb..bfb1f600c 100644 --- a/recipe/patches/0012-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch +++ b/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch @@ -1,7 +1,7 @@ -From 33b9a5aef7916426dc019dc43e830b9bf6e9364e Mon Sep 17 00:00:00 2001 +From 550d8e56d81919e3a5d4761e76031421ca40790f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 3 Dec 2017 17:31:27 +0000 -Subject: [PATCH 12/18] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if +Subject: [PATCH 11/19] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if _PYTHON_SYSCONFIGDATA_NAME is not set and ignore {_CONDA,}_PYTHON_SYSCONFIGDATA_NAME if it does not exist @@ -14,10 +14,10 @@ manually). 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index e07a6c8b94..1b4c2ad765 100644 +index b51629e..849f98f 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py -@@ -416,11 +416,13 @@ def _init_posix(): +@@ -433,11 +433,13 @@ def _init_posix(): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see the sysconfig module name = os.environ.get('_PYTHON_SYSCONFIGDATA_NAME', @@ -37,10 +37,10 @@ index e07a6c8b94..1b4c2ad765 100644 build_time_vars = _temp.build_time_vars global _config_vars diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py -index 9ee4d3185a..b649f0863b 100644 +index b9e2faf..1812a10 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py -@@ -336,13 +336,21 @@ def get_makefile_filename(): +@@ -343,13 +343,21 @@ def get_makefile_filename(): return os.path.join(get_path('stdlib'), config_dir_name, 'Makefile') @@ -69,7 +69,7 @@ index 9ee4d3185a..b649f0863b 100644 def _generate_posix_vars(): -@@ -411,7 +419,7 @@ def _generate_posix_vars(): +@@ -418,7 +426,7 @@ def _generate_posix_vars(): def _init_posix(vars): """Initialize the module as appropriate for POSIX systems.""" # _sysconfigdata is generated at build time, see _generate_posix_vars() @@ -79,5 +79,5 @@ index 9ee4d3185a..b649f0863b 100644 build_time_vars = _temp.build_time_vars vars.update(build_time_vars) -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0011-Win32-Do-not-download-externals.patch b/recipe/patches/0011-Win32-Do-not-download-externals.patch deleted file mode 100644 index 91120e3ee..000000000 --- a/recipe/patches/0011-Win32-Do-not-download-externals.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 72968e4e5cdb07995f33e0c08e110803f2b459ea Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 11/18] Win32: Do not download externals - ---- - PCbuild/build.bat | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PCbuild/build.bat b/PCbuild/build.bat -index 759aa5221b..e9ebcab62f 100644 ---- a/PCbuild/build.bat -+++ b/PCbuild/build.bat -@@ -88,7 +88,7 @@ if "%IncludeExternals%"=="" set IncludeExternals=true - if "%IncludeSSL%"=="" set IncludeSSL=true - if "%IncludeTkinter%"=="" set IncludeTkinter=true - --if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" -+rem if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" - - if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( - if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( --- -2.17.2 (Apple Git-113) - diff --git a/recipe/patches/0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch similarity index 92% rename from recipe/patches/0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch rename to recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index bdca80f7a..f3a8dd327 100644 --- a/recipe/patches/0013-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,7 +1,7 @@ -From 6818b5f4575f515b8c300608ef0f08b23b81c159 Mon Sep 17 00:00:00 2001 +From 5ed0f23117d35beeb45cf7e835c0b702267e694f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 13/18] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 12/19] Fix find_library so that it looks in sys.prefix/lib first --- @@ -10,7 +10,7 @@ Subject: [PATCH 13/18] Fix find_library so that it looks in sys.prefix/lib 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Lib/ctypes/macholib/dyld.py b/Lib/ctypes/macholib/dyld.py -index c158e672f0..a4770ecf5c 100644 +index c158e67..a4770ec 100644 --- a/Lib/ctypes/macholib/dyld.py +++ b/Lib/ctypes/macholib/dyld.py @@ -88,6 +88,10 @@ def dyld_executable_path_search(name, executable_path=None): @@ -25,7 +25,7 @@ index c158e672f0..a4770ecf5c 100644 yield os.path.join(executable_path, name[len('@executable_path/'):]) diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py -index 97973bce00..1340ad7c25 100644 +index 97973bc..1340ad7 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py @@ -70,7 +70,8 @@ if os.name == "nt": @@ -72,5 +72,5 @@ index 97973bce00..1340ad7c25 100644 ################################################################ # test code -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0014-Disable-new-dtags-in-unixccompiler.py.patch b/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch similarity index 91% rename from recipe/patches/0014-Disable-new-dtags-in-unixccompiler.py.patch rename to recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch index edd47d0ed..f37aab307 100644 --- a/recipe/patches/0014-Disable-new-dtags-in-unixccompiler.py.patch +++ b/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch @@ -1,7 +1,7 @@ -From 9d5d412bace982c71b299ea528108618750d434b Mon Sep 17 00:00:00 2001 +From fb0d22a9e84bb1e66edc61feac0ccf1ea9d06e63 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 29 Apr 2018 16:10:42 +0100 -Subject: [PATCH 14/18] Disable new-dtags in unixccompiler.py +Subject: [PATCH 13/19] Disable new-dtags in unixccompiler.py They prevent isolation from system libraries and the HPC 'modules' system by giving precedence to LD_LIBRARY_PATH. We never want our libraries to @@ -21,7 +21,7 @@ itself, MSVC). 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/distutils/tests/test_unixccompiler.py b/Lib/distutils/tests/test_unixccompiler.py -index eef702cf01..2d8d61df03 100644 +index eef702c..2d8d61d 100644 --- a/Lib/distutils/tests/test_unixccompiler.py +++ b/Lib/distutils/tests/test_unixccompiler.py @@ -59,7 +59,7 @@ class UnixCCompilerTestCase(unittest.TestCase): @@ -43,10 +43,10 @@ index eef702cf01..2d8d61df03 100644 # GCC GNULD with fully qualified configuration prefix # see #7617 diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py -index 1b8f31b0f7..77255d6788 100644 +index 78a4665..efacb63 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py -@@ -240,12 +240,12 @@ class UnixCCompiler(CCompiler): +@@ -248,12 +248,12 @@ class UnixCCompiler(CCompiler): # use it anyway. Since distutils has always passed in # -Wl whenever gcc was used in the past it is probably # safest to keep doing so. @@ -63,5 +63,5 @@ index 1b8f31b0f7..77255d6788 100644 # No idea how --enable-new-dtags would be passed on to # ld if this system was using GNU ld. Don't know if a -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch b/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch new file mode 100644 index 000000000..116c683aa --- /dev/null +++ b/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch @@ -0,0 +1,26 @@ +From 85e7020f8600f35846a942e4b6c09f77557056a7 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sun, 26 Aug 2018 17:10:08 +0100 +Subject: [PATCH 14/19] Fix cross-compilation on Debian-based distros + +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 7eb2095..feb478b 100644 +--- a/setup.py ++++ b/setup.py +@@ -654,7 +654,8 @@ class PyBuildExt(build_ext): + # only change this for cross builds for 3.3, issues on Mageia + if CROSS_COMPILING: + self.add_cross_compiling_paths() +- self.add_multiarch_paths() ++ else: ++ self.add_multiarch_paths() + self.add_ldflags_cppflags() + + def init_inc_lib_dirs(self): +-- +2.17.1 + diff --git a/recipe/patches/0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch similarity index 75% rename from recipe/patches/0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch rename to recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index 8374d310e..3890ac4ae 100644 --- a/recipe/patches/0016-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,7 +1,7 @@ -From e20b217e7edf70f64a8c07701465c458e927d6f2 Mon Sep 17 00:00:00 2001 +From 267edddace3749e740fd941a4e7a9bd22f5f4428 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 16/18] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 15/19] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 --- @@ -9,10 +9,10 @@ Subject: [PATCH 16/18] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/PC/getpathp.c b/PC/getpathp.c -index 1b553d53af..93f1cf087e 100644 +index 04f24d9..c0f0e97 100644 --- a/PC/getpathp.c +++ b/PC/getpathp.c -@@ -774,9 +774,19 @@ calculate_module_search_path(const _PyCoreConfig *core_config, +@@ -822,9 +822,19 @@ calculate_module_search_path(PyCalculatePath *calculate, { int skiphome = calculate->home==NULL ? 0 : 1; #ifdef Py_ENABLE_SHARED @@ -33,7 +33,7 @@ index 1b553d53af..93f1cf087e 100644 + /* We only use the default relative PYTHONPATH if we haven't anything better to use! */ - int skipdefault = (core_config->module_search_path_env != NULL || + int skipdefault = (calculate->pythonpath_env != NULL || -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch b/recipe/patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch deleted file mode 100644 index 94afb4d48..000000000 --- a/recipe/patches/0015-Fix-cross-compilation-on-Debian-based-distros.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fa27a295d46048b537a5ebe537062de6bba3a00a Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Sun, 26 Aug 2018 17:10:08 +0100 -Subject: [PATCH 15/18] Fix cross-compilation on Debian-based distros - ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 611cc45a9a..ee1e1b24b9 100644 ---- a/setup.py -+++ b/setup.py -@@ -551,7 +551,8 @@ class PyBuildExt(build_ext): - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() -+ else: -+ self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. --- -2.17.2 (Apple Git-113) - diff --git a/recipe/patches/0017-Unvendor-openssl.patch b/recipe/patches/0016-Unvendor-openssl.patch similarity index 82% rename from recipe/patches/0017-Unvendor-openssl.patch rename to recipe/patches/0016-Unvendor-openssl.patch index e6202e413..7e53f1c08 100644 --- a/recipe/patches/0017-Unvendor-openssl.patch +++ b/recipe/patches/0016-Unvendor-openssl.patch @@ -1,7 +1,7 @@ -From 759a61331b078678187db71022680e56dcfaaede Mon Sep 17 00:00:00 2001 +From 8def110beec1165b0567a654990afd923a2a4cd5 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 17/18] Unvendor openssl +Subject: [PATCH 16/19] Unvendor openssl --- PCbuild/_ssl.vcxproj | 3 --- @@ -13,10 +13,10 @@ Subject: [PATCH 17/18] Unvendor openssl 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj -index aaf95a361c..b59f2d0ab1 100644 +index 7a514cf..37668e3 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj -@@ -67,9 +67,6 @@ +@@ -99,9 +99,6 @@ @@ -27,7 +27,7 @@ index aaf95a361c..b59f2d0ab1 100644 diff --git a/PCbuild/_ssl.vcxproj.filters b/PCbuild/_ssl.vcxproj.filters -index bd46b60984..1384aeff1f 100644 +index dfb8b6a..4328fd6 100644 --- a/PCbuild/_ssl.vcxproj.filters +++ b/PCbuild/_ssl.vcxproj.filters @@ -9,9 +9,6 @@ @@ -41,7 +41,7 @@ index bd46b60984..1384aeff1f 100644 diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props -index 257cc857d0..1aa9de875c 100644 +index b43c674..f2800b5 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -5,7 +5,7 @@ @@ -54,15 +54,15 @@ index 257cc857d0..1aa9de875c 100644 diff --git a/PCbuild/python.props b/PCbuild/python.props -index f83d4df0d5..b2a9f798f2 100644 +index 8884c0a..cae52f9 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props -@@ -49,9 +49,9 @@ - $(ExternalsDir)sqlite-3.21.0.0\ - $(ExternalsDir)bzip2-1.0.6\ - $(ExternalsDir)xz-5.2.2\ -- $(ExternalsDir)openssl-1.1.0j\ -- $(ExternalsDir)openssl-bin-1.1.0j\$(ArchName)\ +@@ -62,9 +62,9 @@ + $(ExternalsDir)libffi\ + $(ExternalsDir)libffi\$(ArchName)\ + $(libffiOutDir)include +- $(ExternalsDir)openssl-1.1.1d\ +- $(ExternalsDir)openssl-bin-1.1.1d\$(ArchName)\ - $(opensslOutDir)include + $(OPENSSL_DIR)\ + $(opensslDir)bin @@ -71,10 +71,10 @@ index f83d4df0d5..b2a9f798f2 100644 $(ExternalsDir)\zlib-1.2.11\ diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj -index 8b64e364f1..5b0fa34c36 100644 +index a689222..0899220 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj -@@ -72,6 +72,9 @@ +@@ -105,6 +105,9 @@ @@ -85,10 +85,10 @@ index 8b64e364f1..5b0fa34c36 100644 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj -index 19d64a332b..d6d9b14efc 100644 +index 871d250..0abd32b 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj -@@ -65,6 +65,9 @@ +@@ -97,6 +97,9 @@ @@ -98,6 +98,6 @@ index 19d64a332b..d6d9b14efc 100644 --- -2.20.1 - +-- +2.17.1 + diff --git a/recipe/patches/0018-Unvendor-sqlite3.patch b/recipe/patches/0017-Unvendor-sqlite3.patch similarity index 87% rename from recipe/patches/0018-Unvendor-sqlite3.patch rename to recipe/patches/0017-Unvendor-sqlite3.patch index 7e0770757..7be621f73 100644 --- a/recipe/patches/0018-Unvendor-sqlite3.patch +++ b/recipe/patches/0017-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ -From 41b0448db1a070b26b7832fa143d08554b5b6d0d Mon Sep 17 00:00:00 2001 +From 1b925cc9d8821b9e9091aca862cba17e8dd16e94 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 10 Dec 2018 12:22:37 -0600 -Subject: [PATCH 18/18] Unvendor sqlite3 +Subject: [PATCH 17/19] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 9 ++++----- @@ -11,10 +11,10 @@ Subject: [PATCH 18/18] Unvendor sqlite3 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj -index 1f1a1c8cad..7da816f4c8 100644 +index 61df796..414a369 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj -@@ -61,9 +61,12 @@ +@@ -93,9 +93,12 @@ @@ -28,7 +28,7 @@ index 1f1a1c8cad..7da816f4c8 100644 -@@ -95,10 +98,6 @@ +@@ -127,10 +130,6 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} false @@ -40,10 +40,10 @@ index 1f1a1c8cad..7da816f4c8 100644 diff --git a/PCbuild/pcbuild.sln b/PCbuild/pcbuild.sln -index c212d9f8f3..eebeb791fb 100644 +index 477a107..37f1867 100644 --- a/PCbuild/pcbuild.sln +++ b/PCbuild/pcbuild.sln -@@ -55,8 +55,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdis +@@ -57,8 +57,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdis EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" EndProject @@ -53,23 +53,23 @@ index c212d9f8f3..eebeb791fb 100644 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff --git a/PCbuild/python.props b/PCbuild/python.props -index b2a9f798f2..dc43b860cb 100644 +index cae52f9..833ad75 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props -@@ -46,7 +46,7 @@ +@@ -56,7 +56,7 @@ $(EXTERNALS_DIR) $([System.IO.Path]::GetFullPath(`$(PySourcePath)externals`)) $(ExternalsDir)\ -- $(ExternalsDir)sqlite-3.21.0.0\ +- $(ExternalsDir)sqlite-3.28.0.0\ + $(SQLITE3_DIR)\ $(ExternalsDir)bzip2-1.0.6\ $(ExternalsDir)xz-5.2.2\ - $(OPENSSL_DIR)\ + $(ExternalsDir)libffi\ diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj -index 4f5b1965d9..59cae10127 100644 +index 1a82a65..497071a 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj -@@ -56,12 +56,12 @@ +@@ -88,12 +88,12 @@ <_ProjectFileVersion>10.0.30319.1 @@ -88,6 +88,6 @@ index 4f5b1965d9..59cae10127 100644 --- -2.20.1 - +-- +2.17.1 + diff --git a/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch b/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch new file mode 100644 index 000000000..c1b63991e --- /dev/null +++ b/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch @@ -0,0 +1,46 @@ +From faa6e118b7949d4f656a8930f3fd01c89d467b35 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Wed, 2 Jan 2019 21:38:48 +0000 +Subject: [PATCH 18/19] venv: Revert a change from + https://github.com/python/cpython/commit/1c3de541e64f75046b20cdd27bada1557e550bcd + https://bugs.python.org/issue35644 + +If copier(context.executable, path) is not also called on Windows (as it was in Python 3.7.1) then the venv\Scripts dir will not contain a Python exe + +Also, on Anaconda Distribution, python.exe lives in sys.prefix. +--- + Lib/venv/__init__.py | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py +index caa7285..1a37080 100644 +--- a/Lib/venv/__init__.py ++++ b/Lib/venv/__init__.py +@@ -211,7 +211,12 @@ class EnvBuilder: + basename = 'venvwlauncher' + src = os.path.join(os.path.dirname(src), basename + ext) + else: +- src = srcfn ++ if basename.startswith('python'): ++ scripts = sys.prefix ++ else: ++ scripts = os.path.join(os.path.dirname(__file__), "scripts", "nt") ++ src = os.path.join(scripts, basename + ext) ++ + if not os.path.exists(src): + if not bad_src: + logger.warning('Unable to copy %r', src) +@@ -229,9 +234,9 @@ class EnvBuilder: + binpath = context.bin_path + path = context.env_exe + copier = self.symlink_or_copy ++ copier(context.executable, path) + dirname = context.python_dir + if os.name != 'nt': +- copier(context.executable, path) + if not os.path.islink(path): + os.chmod(path, 0o755) + for suffix in ('python', 'python3'): +-- +2.17.1 + diff --git a/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch similarity index 91% rename from recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch rename to recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch index b2db56ac1..fad1c05f5 100644 --- a/recipe/patches/0020-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ -From 4899df80f0de148f29c2e2a3f8d14c78da63eb0c Mon Sep 17 00:00:00 2001 +From 1750fcbdea4d13ab79a0c354fc6e502e94236f01 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 25 Jan 2019 22:54:57 +0000 -Subject: [PATCH 20/20] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 19/19] Add CondaEcosystemModifyDllSearchPath() This changes the DLL search order so that C:\Windows\System32 does not get searched in before entries in PATH. @@ -10,47 +10,38 @@ Reviewed by Kai Tietz 7.2.2019 Updated a bit to include other directories. --- - Modules/main.c | 382 ++++++++++++++++++++++++++++++++++++++++++- + Modules/main.c | 384 +++++++++++++++++++++++++++++++++++++++++++ Python/dynload_win.c | 4 + - 2 files changed, 385 insertions(+), 1 deletion(-) + 2 files changed, 388 insertions(+) diff --git a/Modules/main.c b/Modules/main.c -index 514f809939..602adfeb77 100644 +index 0d2cf3a..a8cd6dd 100644 --- a/Modules/main.c +++ b/Modules/main.c -@@ -16,6 +16,10 @@ - # ifdef HAVE_FCNTL_H - # include - # endif +@@ -20,6 +20,10 @@ + #endif + #ifdef MS_WINDOWS + # include /* STATUS_CONTROL_C_EXIT */ +# include +# include +# include +# include #endif + /* End of includes for exit_sigint() */ - #ifdef _MSC_VER -@@ -56,6 +60,8 @@ extern "C" { - } \ - } while (0) +@@ -31,6 +35,8 @@ + extern "C" { + #endif +char *CondaEcosystemGetWarnings(); + - #ifdef MS_WINDOWS - #define WCSTOK wcstok_s - #else -@@ -1236,7 +1242,7 @@ pymain_header(_PyMain *pymain) - return; - } + /* --- pymain_init() ---------------------------------------------- */ -- fprintf(stderr, "Python %s :: %s on %s\n", Py_GetVersion(), Anaconda_GetVersion(), Py_GetPlatform()); -+ fprintf(stderr, "Python %s :: %s on %s\n%s", Py_GetVersion(), Anaconda_GetVersion(), Py_GetPlatform(), CondaEcosystemGetWarnings()); - if (!Py_NoSiteFlag) { - fprintf(stderr, "%s\n", COPYRIGHT); - } -@@ -3026,9 +3032,383 @@ pymain_init(_PyMain *pymain) + static PyStatus +@@ -658,10 +664,388 @@ Py_RunMain(void) + return exitcode; } - +#ifdef MS_WINDOWS +/* Please do not remove this function. It is needed for testing + CondaEcosystemModifyDllSearchPath(). */ @@ -417,35 +408,40 @@ index 514f809939..602adfeb77 100644 + + return 0; +} ++#else ++char* CondaEcosystemGetWarnings() ++{ ++ return ""; ++} +#endif + -+ + static int - pymain_main(_PyMain *pymain) + pymain_main(_PyArgv *args) { +#ifdef MS_WINDOWS + /* LoadAndUnloadTestDLL(L"libiomp5md.dll"); */ -+ CondaEcosystemModifyDllSearchPath_Init(pymain->argc, pymain->wchar_argv); ++ CondaEcosystemModifyDllSearchPath_Init(args->argc, args->wchar_argv); + /* LoadAndUnloadTestDLL(L"libiomp5md.dll"); */ +#endif - int res = pymain_init(pymain); - if (res == 1) { - goto done; + PyStatus status = pymain_init(args); + if (_PyStatus_IS_EXIT(status)) { + pymain_free(); diff --git a/Python/dynload_win.c b/Python/dynload_win.c -index 0fdf77f552..73acda3475 100644 +index 6deba11..f102c1c 100644 --- a/Python/dynload_win.c +++ b/Python/dynload_win.c -@@ -217,6 +217,10 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, - #endif - /* We use LoadLibraryEx so Windows looks for dependent DLLs - in directory of pathname first. */ +@@ -201,6 +201,10 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, + to avoid DLL preloading attacks and enable use of the + AddDllDirectory function. We add SEARCH_DLL_LOAD_DIR to + ensure DLLs adjacent to the PYD are preferred. */ + /* This resyncs values in PATH to AddDllDirectory() */ + extern int CondaEcosystemModifyDllSearchPath(int, int); + CondaEcosystemModifyDllSearchPath(1, 1); + - /* XXX This call doesn't exist in Windows CE */ + Py_BEGIN_ALLOW_THREADS hDLL = LoadLibraryExW(wpathname, NULL, - LOAD_WITH_ALTERED_SEARCH_PATH); + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | -- -2.17.2 (Apple Git-113) +2.17.1 diff --git a/recipe/patches/0019-venv-Revert-a-change-from-https-github.com-python-cp.patch b/recipe/patches/0019-venv-Revert-a-change-from-https-github.com-python-cp.patch deleted file mode 100644 index 37e35b780..000000000 --- a/recipe/patches/0019-venv-Revert-a-change-from-https-github.com-python-cp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 5f78f1bfded1cf0877f609600d7961112daf777b Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 2 Jan 2019 21:38:48 +0000 -Subject: [PATCH 19/19] venv: Revert a change from - https://github.com/python/cpython/commit/1c3de541e64f75046b20cdd27bada1557e550bcd - https://bugs.python.org/issue35644 - -If copier(context.executable, path) is not also called on Windows (as it was in Python 3.7.1) then the venv\Scripts dir will not contain a Python exe ---- - Lib/venv/__init__.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/venv/__init__.py b/Lib/venv/__init__.py -index 5438b0d4e5..9fee12efcb 100644 ---- a/Lib/venv/__init__.py -+++ b/Lib/venv/__init__.py -@@ -188,9 +188,9 @@ class EnvBuilder: - binpath = context.bin_path - path = context.env_exe - copier = self.symlink_or_copy -+ copier(context.executable, path) - dirname = context.python_dir - if os.name != 'nt': -- copier(context.executable, path) - if not os.path.islink(path): - os.chmod(path, 0o755) - for suffix in ('python', 'python3'): --- -2.20.1 - diff --git a/recipe/patches/gh12445.patch b/recipe/patches/gh12445.patch deleted file mode 100644 index 3969d2930..000000000 --- a/recipe/patches/gh12445.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0cbfc99121d8a99ef1b27f842be2e306b53683f1 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Tue, 19 Mar 2019 12:46:14 -0500 -Subject: [PATCH] Fix registry key for windows sdk detection - -Was broken by https://github.com/python/cpython/pull/4298 ---- - PCbuild/python.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/PCbuild/python.props b/PCbuild/python.props -index f83d4df0d59f..683fbb6e6f84 100644 ---- a/PCbuild/python.props -+++ b/PCbuild/python.props -@@ -76,7 +76,7 @@ - matter which WinSDK version we use. - --> - <_RegistryVersion>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) -- <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\WOW6432Node\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) -+ <_RegistryVersion Condition="$(_RegistryVersion) == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) - - <_RegistryVersion Condition="$(_RegistryVersion) != '' and !$(_RegistryVersion.EndsWith('.0'))">$(_RegistryVersion).0 - From 3d390b2b84390c370ff49a38a4a3d9f9ffbe1356 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:55:20 -0500 Subject: [PATCH 05/54] remove commented build requirements --- recipe/meta.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 17f4a3da3..7ca1a161f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,10 +79,7 @@ requirements: - {{ cdt('libx11-devel') }} # [linux] - make # [not win] - pkg-config # [not win] - # - 7za # [win] - # - curl # [win] host: - # - nasm 2.11.06 # [win] - bzip2 # [not win] - sqlite - xz # [not win] From 706e5b9d60b7849f91f52e56eec16b80d6d67a61 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:56:10 -0500 Subject: [PATCH 06/54] remove stale tests --- recipe/meta.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7ca1a161f..c358740ab 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -107,12 +107,6 @@ test: - 2to3 -h - pydoc -h - python3-config --help # [not win] - - conda inspect linkages -p $PREFIX $PKG_NAME # [not win] - - conda inspect objects -p $PREFIX $PKG_NAME # [osx] - # Test for " -partition=none", can be removed after toolchain is dropped - - python -c "import sys; files = [f for f in sys.argv[2:] if ' -partition=none' in open(f, 'r').read()]; assert len(files) == 0, files" ${PREFIX}/lib/*/*.py # [not win] - # - python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" - # - _CONDA_PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_x86_64_conda_cos6_linux_gnu python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" # [linux64] about: home: http://www.python.org/ From 4383eced65bf7cce1ef02c2a020543fe69f08c71 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:56:58 -0500 Subject: [PATCH 07/54] add venv tests on windows --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c358740ab..ac485181c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -107,6 +107,7 @@ test: - 2to3 -h - pydoc -h - python3-config --help # [not win] + - python -m venv %%TEMP%%\venv # [win] about: home: http://www.python.org/ From 0ea7a132e418ee35331c6c83b6f93524be7e6f5d Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:57:38 -0500 Subject: [PATCH 08/54] add tests for sysconfig contents --- recipe/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ac485181c..73705b497 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -108,6 +108,10 @@ test: - pydoc -h - python3-config --help # [not win] - python -m venv %%TEMP%%\venv # [win] + - python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" + - _CONDA_PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_x86_64_conda_cos6_linux_gnu python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" # [linux64] + # check for unreplaced @ symbols in sysconfig files + - for f in ${PREFIX}/lib/python3.8/_sysconfig*.py; do echo "Checking $f:"; if [[ `rg @ $f` ]]; then exit 1; fi; done # [linux64 or osx] about: home: http://www.python.org/ From 3acb0edf2fa8623f05a44b5dea6b2c05858b7897 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:58:16 -0500 Subject: [PATCH 09/54] require ncurses on osx --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 73705b497..04aeabaca 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -87,7 +87,7 @@ requirements: - openssl - readline # [not win] - tk # [not win] - - ncurses # [linux] + - ncurses # [not win] - libffi # [not win] run: - bzip2 # [not win] @@ -97,7 +97,7 @@ requirements: - openssl - readline # [not win] - tk # [not win] - - ncurses # [linux] + - ncurses # [not win] - libffi # [not win] test: From 6a52cd349439a20d148340c7271625ad196e95d4 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:58:58 -0500 Subject: [PATCH 10/54] bzip2 is statically linked --- recipe/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 04aeabaca..5873c05f2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -70,6 +70,9 @@ build: script_env: - python_branding skip: true # [win and vc != 14] + # We delete the shared libraries. + ignore_run_exports: # [unix] + - bzip2 # [unix] requirements: build: @@ -90,7 +93,6 @@ requirements: - ncurses # [not win] - libffi # [not win] run: - - bzip2 # [not win] - sqlite - xz # [not win] - zlib # [not win] From d42035132e52f3072c6025a046f4c2f88243bb9c Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 11:59:27 -0500 Subject: [PATCH 11/54] allow links to python3.x --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5873c05f2..916953339 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -66,7 +66,6 @@ build: # Copy rather than link. no_link: - DLLs/_ctypes.pyd # [win] - - bin/python3.7 # [not win] script_env: - python_branding skip: true # [win and vc != 14] From 2b7eb74d272b40836568dc3e29c5a00ba2212970 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:00:33 -0500 Subject: [PATCH 12/54] update bld.bat for 3.8.0 Change 37 to 38. pyvenv.py has been removed, use python -m venv Copy venvlauncher.exe and venvwlauncher.exe --- recipe/bld.bat | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 63674b1eb..19b9a20d9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -33,12 +33,12 @@ if errorlevel 1 exit 1 cd .. :: Populate the root package directory -for %%x in (python37.dll python3.dll python.exe pythonw.exe) do ( +for %%x in (python38.dll python3.dll python.exe pythonw.exe venvlauncher.exe venvwlauncher.exe) do ( copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\%%x %PREFIX% if errorlevel 1 exit 1 ) -for %%x in (python.pdb python37.pdb pythonw.pdb) do ( +for %%x in (python.pdb python38.pdb pythonw.pdb) do ( copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\%%x %PREFIX% if errorlevel 1 exit 1 ) @@ -92,8 +92,6 @@ move /y %PREFIX%\Tools\scripts\2to3 %PREFIX%\Tools\scripts\2to3.py if errorlevel 1 exit 1 move /y %PREFIX%\Tools\scripts\pydoc3 %PREFIX%\Tools\scripts\pydoc3.py if errorlevel 1 exit 1 -move /y %PREFIX%\Tools\scripts\pyvenv %PREFIX%\Tools\scripts\pyvenv.py -if errorlevel 1 exit 1 :: Populate the tcl directory xcopy /s /y /i %SRC_DIR%\externals\tcltk-8.6.9.0\%BUILD_PATH%\lib %PREFIX%\tcl @@ -120,7 +118,7 @@ if errorlevel 1 exit 1 :: Populate the libs directory mkdir %PREFIX%\libs -copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python37.lib %PREFIX%\libs\ +copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python38.lib %PREFIX%\libs\ if errorlevel 1 exit 1 copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\python3.lib %PREFIX%\libs\ if errorlevel 1 exit 1 @@ -158,4 +156,3 @@ if errorlevel 1 exit 1 :: Pickle lib2to3 Grammar %PREFIX%\python.exe -m lib2to3 --help - From 871f54d2ce91ce4ef42adad6c1b3a0f463f4c69e Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:02:16 -0500 Subject: [PATCH 13/54] include libffi on windows --- recipe/bld.bat | 2 ++ recipe/meta.yaml | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 19b9a20d9..a204e058a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -55,6 +55,8 @@ copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\tcl86t.dll %PREFIX%\DLLs\ if errorlevel 1 exit 1 copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\tk86t.dll %PREFIX%\DLLs\ if errorlevel 1 exit 1 +copy /Y %SRC_DIR%\PCbuild\%BUILD_PATH%\libffi-7.dll %PREFIX%\DLLs\ +if errorlevel 1 exit 1 copy /Y %SRC_DIR%\PC\icons\py.ico %PREFIX%\DLLs\ if errorlevel 1 exit 1 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 916953339..3bdcc3ace 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -59,6 +59,13 @@ source: - url: https://github.com/python/cpython-bin-deps/archive/nasm-2.11.06.zip # [win] folder: externals/nasm-2.11.06 # [win] sha256: de3c87b26a80e789986d8e6950c6304175d3829afe9c6c7211eb7257266ab0ac # [win] + - url: https://github.com/python/cpython-source-deps/archive/libffi-3.3.0-rc0-r1.zip # [win] + folder: externals/libffi-3.3.0-rc0-rc1 # [win] + sha256: 23b4347b347cb92fbfa312c95c8f9d1c8ee4416bd5cfc0f318fa01de220aa869 # [win] + - url: https://github.com/python/cpython-bin-deps/archive/libffi.zip # [win] + folder: externals/libffi # [win] + sha256: 57180e18749ad5e8727ae1f488621768a58808ac387968068c563bee8b2b23ec # [win] + build: number: 0 From 1bef782d5f2e7d2343413e3bdfb5ddcdfa8bb517 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:02:56 -0500 Subject: [PATCH 14/54] loosen version checks of tk and openssl in tests --- recipe/run_test.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/run_test.py b/recipe/run_test.py index 04951c3d9..dd7de7ab8 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -68,6 +68,7 @@ import unicodedata import zlib from os import urandom +import os t = 100 * b'Foo ' assert lzma.decompress(lzma.compress(t)) == t @@ -92,10 +93,13 @@ import _tkinter print('TK_VERSION: %s' % _tkinter.TK_VERSION) print('TCL_VERSION: %s' % _tkinter.TCL_VERSION) - TCLTK_VER = '8.6' + if sys.platform == 'win32': + TCLTK_VER = '8.6' + else: + TCLTK_VER = os.getenv("tk") assert _tkinter.TK_VERSION == _tkinter.TCL_VERSION == TCLTK_VER import ssl print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) if sys.platform != 'win32': - assert '1.1.1' in ssl.OPENSSL_VERSION + assert os.getenv("openssl") in ssl.OPENSSL_VERSION From a994728147ed5f9edaa62916cabe5c1716c05925 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:05:10 -0500 Subject: [PATCH 15/54] add QUICK_BUILD options in build.sh --- recipe/build.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index b49ea1cf2..cb7e5053e 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -12,6 +12,8 @@ set -ex VER=${PKG_VERSION%.*} VERNODOTS=${VER//./} CONDA_FORGE=yes +# Disables some PGO/LTO +QUICK_BUILD=no _buildd_static=build-static _buildd_shared=build-shared @@ -27,7 +29,7 @@ if [[ ${PY_INTERP_LINKAGE_NATURE} == shared ]]; then _ENABLE_SHARED=--enable-shared fi -# For debugging builds, set this to 0 to disable profile-guided optimization +# For debugging builds, set this to no to disable profile-guided optimization if [[ ${DEBUG_C} == yes ]]; then _OPTIMIZED=no else @@ -216,8 +218,10 @@ if [[ ${_OPTIMIZED} == yes ]]; then _extra_opts+=(--with-lto) _MAKE_TARGET=profile-opt # To speed up build times during testing (1): - # _PROFILE_TASK="./python -m test.regrtest --pgo test_builtin" - if [[ ${CC} =~ .*gcc.* && ! ${c_compiler} =~ .*toolchain.* ]]; then + if [[ ${QUICK_BUILD} == yes ]]; then + _PROFILE_TASK="./python -m test.regrtest --pgo test_builtin" + fi + if [[ ${CC} =~ .*gcc.* ]]; then LTO_CFLAGS+=(-fuse-linker-plugin) LTO_CFLAGS+=(-ffat-lto-objects) # -flto must come after -flto-partition due to the replacement code @@ -244,11 +248,15 @@ pushd ${_buildd_static} ${_DISABLE_SHARED} popd -make -j${CPU_COUNT} -C ${_buildd_static} \ - EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ - ${_MAKE_TARGET} -# To speed up build times during testing (2): -# ${_MAKE_TARGET} PROFILE_TASK="${_PROFILE_TASK}" +if [[ ${QUICK_BUILD} == yes ]]; then + make -j${CPU_COUNT} -C ${_buildd_static} \ + EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ + ${_MAKE_TARGET} PROFILE_TASK="${_PROFILE_TASK}" +else + make -j${CPU_COUNT} -C ${_buildd_static} \ + EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ + ${_MAKE_TARGET} +fi make -j${CPU_COUNT} -C ${_buildd_shared} \ EXTRA_CFLAGS="${EXTRA_CFLAGS}" From fb1b94505099b32fa90e3f2d4fcc58cb5aa2cf39 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:06:11 -0500 Subject: [PATCH 16/54] Remove 'm' from ABI tag The default abi flag is now blank since builds with and without pymalloc are ABI compatible. --- recipe/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index cb7e5053e..6553b4134 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -53,7 +53,7 @@ else DBG= fi -ABIFLAGS=${DBG}m +ABIFLAGS=${DBG} # This is the mechanism by which we fall back to default gcc, but having it defined here # would probably break the build by using incorrect settings and/or importing files that @@ -338,11 +338,11 @@ pushd ${PREFIX} strip -S lib/libpython${VER}m.a fi fi - CONFIG_LIBPYTHON=$(find lib/python${VER}/config-${VER}${DBG}m* -name "libpython${VER}m.a") - if [[ -f lib/libpython${VER}m.a ]] && [[ -f ${CONFIG_LIBPYTHON} ]]; then + CONFIG_LIBPYTHON=$(find lib/python${VER}/config-${VER}${DBG}* -name "libpython${VER}.a") + if [[ -f lib/libpython${VER}.a ]] && [[ -f ${CONFIG_LIBPYTHON} ]]; then chmod +w ${CONFIG_LIBPYTHON} rm ${CONFIG_LIBPYTHON} - ln -s ../../libpython${VER}m.a ${CONFIG_LIBPYTHON} + ln -s ../../libpython${VER}.a ${CONFIG_LIBPYTHON} fi popd From 1d70cca6cf3d370ea3d2c26cdd6970a69df73384 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:17:37 -0500 Subject: [PATCH 17/54] use _sysconfigdata logic from AnacondaRecipes Replace templates in _sysconfigdata files to avoid needing to manually update these files for each Python release or TK version change. --- recipe/build.sh | 93 +++++++------------ ...configdata_aarch64_conda_cos7_linux_gnu.py | 6 +- ...sysconfigdata_i686_conda_cos6_linux_gnu.py | 4 +- ...igdata_powerpc64le_conda_cos7_linux_gnu.py | 10 +- ...sysconfigdata_x86_64_apple_darwin13_4_0.py | 4 +- ...sconfigdata_x86_64_conda_cos6_linux_gnu.py | 4 +- .../default/_sysconfigdata_linux.py | 26 +++--- .../default/_sysconfigdata_osx.py | 50 +++++----- 8 files changed, 88 insertions(+), 109 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 6553b4134..601b2fbc3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -9,8 +9,10 @@ set -ex # .. but upstream regrtest.py now has --pgo (since >= 3.6) and skips tests that are: # "not helpful for PGO". +VERFULL=${PKG_VERSION} VER=${PKG_VERSION%.*} VERNODOTS=${VER//./} +TCLTK_VER=${tk} CONDA_FORGE=yes # Disables some PGO/LTO QUICK_BUILD=no @@ -347,63 +349,40 @@ pushd ${PREFIX} popd -if [[ -n ${HOST} ]]; then - # Copy sysconfig that gets recorded to a non-default name - # using the new compilers with python will require setting _PYTHON_SYSCONFIGDATA_NAME - # to the name of this file (minus the .py extension) - pushd $PREFIX/lib/python${VER} - # On Python 3.5 _sysconfigdata.py was getting copied in here and compiled for some reason. - # This breaks our attempt to find the right one as recorded_name. - find lib-dynload -name "_sysconfigdata*.py*" -exec rm {} \; - recorded_name=$(find . -name "_sysconfigdata*.py") - our_compilers_name=_sysconfigdata_$(echo ${HOST} | sed -e 's/[.-]/_/g').py - mv ${recorded_name} ${our_compilers_name} - - # Copy all "${RECIPE_DIR}"/sysconfigdata/*.py. This is to support cross-compilation. They will be - # from the previous build unfortunately so care must be taken at version bumps and flag changes. - SYSCONFIGS=$(find "${RECIPE_DIR}"/sysconfigdata/*.py -name '*sysconfigdata*') - for SYSCONFIG in ${SYSCONFIGS}; do - cat ${SYSCONFIG} | sed -e "s|@ABIFLAGS@|${ABIFLAGS}|g" \ - -e "s|@PYVERNODOTS@|${VERNODOTS}|g" \ - -e "s|@PYVER@|${VER}|g" > $(basename ${SYSCONFIG}) - done - - if [[ ${HOST} =~ .*darwin.* ]]; then - cp ${RECIPE_DIR}/sysconfigdata/default/_sysconfigdata_osx.py ${recorded_name} - else - if [[ ${HOST} =~ x86_64.* ]]; then - PY_ARCH=x86_64 - elif [[ ${HOST} =~ i686.* ]]; then - PY_ARCH=i386 - elif [[ ${HOST} =~ powerpc64le.* ]]; then - PY_ARCH=powerpc64le - elif [[ ${HOST} =~ aarch64.* ]]; then - PY_ARCH=aarch64 - else - echo "ERROR: Cannot determine PY_ARCH for host ${HOST}" - exit 1 - fi - cat ${RECIPE_DIR}/sysconfigdata/default/_sysconfigdata_linux.py | sed "s|@ARCH@|${PY_ARCH}|g" > ${recorded_name} - mkdir -p ${PREFIX}/compiler_compat - cp ${LD} ${PREFIX}/compiler_compat/ld - echo "Files in this folder are to enhance backwards compatibility of anaconda software with older compilers." > ${PREFIX}/compiler_compat/README - echo "See: https://github.com/conda/conda/issues/6030 for more information." >> ${PREFIX}/compiler_compat/README - fi - - # We no longer do this since we use sed to replace some tokens now and copying these fully baked ones back would overwrite that. - # I should work on something to put the tokens back instead, but also we probably want sysconfig data to be different for debug - # versus release. - # - # Copy the latest sysconfigdata for this platform back to the recipe so we can do full cross-compilation. - # The [^ ]* part after PKG_VERSION is to catch beta versions encoded into the build string but not the version number (e.g. b3). - # .. there is no variable set that contains this information, though it would be useful. We do have: - # .. PKG_BUILD_STRING="placeholder" though (pinging @msarahan about this). - # [[ -f "${RECIPE_DIR}"/sysconfigdata/${our_compilers_name} ]] && rm -f "${RECIPE_DIR}"/sysconfigdata/${our_compilers_name} - # cat ${our_compilers_name} | sed -e "s|${PREFIX}|/opt/anaconda1anaconda2anaconda3|g" \ - # -e "s|${SRC_DIR}|\${SRC_DIR}|g" \ - # -e "s|${PKG_NAME}-${PKG_VERSION}[^ ]*|\${PKG_NAME}-\${PKG_VERSION}|g" > "${RECIPE_DIR}"/sysconfigdata/${our_compilers_name} - popd -fi +# Copy sysconfig that gets recorded to a non-default name +# using the new compilers with python will require setting _PYTHON_SYSCONFIGDATA_NAME +# to the name of this file (minus the .py extension) +pushd "${PREFIX}"/lib/python${VER} + # On Python 3.5 _sysconfigdata.py was getting copied in here and compiled for some reason. + # This breaks our attempt to find the right one as recorded_name. + find lib-dynload -name "_sysconfigdata*.py*" -exec rm {} \; + recorded_name=$(find . -name "_sysconfigdata*.py") + our_compilers_name=_sysconfigdata_$(echo ${HOST} | sed -e 's/[.-]/_/g').py + # So we can see if anything has significantly diverged by looking in a built package. + cp ${recorded_name} ${recorded_name}.orig + mv ${recorded_name} ${our_compilers_name} + PY_ARCH=${HOST%-conda*} + # Copy all "${RECIPE_DIR}"/sysconfigdata/*.py. This is to support cross-compilation. They will be + # from the previous build unfortunately so care must be taken at version bumps and flag changes. + SRC_SYSCONFIGS=$(find "${RECIPE_DIR}"/sysconfigdata -name '*sysconfigdata*.py') + for SRC_SYSCONFIG in ${SRC_SYSCONFIGS}; do + DST_SYSCONFIG=$(basename ${SRC_SYSCONFIG}) + cat ${SRC_SYSCONFIG} | sed -e "s|@SGI_ABI@||g" \ + -e "s|@ABIFLAGS@|${ABIFLAGS}|g" \ + -e "s|@ARCH@|${PY_ARCH}|g" \ + -e "s|@PYVERNODOTS@|${VERNODOTS}|g" \ + -e "s|@PYVER@|${VER}|g" \ + -e "s|@PYVERFULL@|${VERFULL}|g" \ + -e "s|@TCLTK_VER@|${TCLTK_VER}|g" > ${DST_SYSCONFIG} + done + if [[ ${HOST} =~ .*darwin.* ]]; then + mv _sysconfigdata_osx.py ${recorded_name} + rm _sysconfigdata_linux.py + else + mv _sysconfigdata_linux.py ${recorded_name} + rm _sysconfigdata_osx.py + fi +popd if [[ ${_OPTIMIZED} == yes && ${target_platform} =~ linux-* && ${c_compiler} =~ .*toolchain.* ]]; then # On the old toolchain compilers, -flto-partion=none is being replaced diff --git a/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py b/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py index dc6c13844..bdbcba8e4 100644 --- a/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py +++ b/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py @@ -55,7 +55,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER' '--enable-optimizations' '--with-lto' " "'--disable-shared' " "'build_alias=aarch64-conda_cos7-linux-gnu' " "'host_alias=aarch64-conda_cos7-linux-gnu' " @@ -569,7 +569,7 @@ 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', 'LIBPL': - '/opt/anaconda1anaconda2anaconda3/lib/python3.7/config-@PYVER@@ABIFLAGS@-aarch64-linux-gnu', + '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS@-aarch64-linux-gnu', 'LIBRARY': 'libpython@PYVER@@ABIFLAGS@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', @@ -771,7 +771,7 @@ 'TANH_PRESERVES_ZERO_SIGN': 0, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', 'TESTPYTHON': './python', diff --git a/recipe/sysconfigdata/_sysconfigdata_i686_conda_cos6_linux_gnu.py b/recipe/sysconfigdata/_sysconfigdata_i686_conda_cos6_linux_gnu.py index c3e182da2..3c5edb42a 100644 --- a/recipe/sysconfigdata/_sysconfigdata_i686_conda_cos6_linux_gnu.py +++ b/recipe/sysconfigdata/_sysconfigdata_i686_conda_cos6_linux_gnu.py @@ -58,7 +58,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' '--enable-optimizations' '--with-lto' " "'--disable-shared' 'build_alias=i686-conda_cos6-linux-gnu' " "'host_alias=i686-conda_cos6-linux-gnu' " "'CC=i686-conda_cos6-linux-gnu-gcc' 'CFLAGS=-march=prescott " @@ -735,7 +735,7 @@ 'TANH_PRESERVES_ZERO_SIGN': 1, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', 'TESTPYTHON': './python', diff --git a/recipe/sysconfigdata/_sysconfigdata_powerpc64le_conda_cos7_linux_gnu.py b/recipe/sysconfigdata/_sysconfigdata_powerpc64le_conda_cos7_linux_gnu.py index 87e9b720a..088f249ed 100644 --- a/recipe/sysconfigdata/_sysconfigdata_powerpc64le_conda_cos7_linux_gnu.py +++ b/recipe/sysconfigdata/_sysconfigdata_powerpc64le_conda_cos7_linux_gnu.py @@ -43,7 +43,7 @@ 'CONFIGURE_CFLAGS': '-mcpu=power8 -mtune=power8 -mpower8-fusion ' '-mpower8-vector -ftree-vectorize -fPIC ' '-fstack-protector-strong -fno-plt -O2 ' - '-fdebug-prefix-map=/opt/conda/conda-bld/python_1512347718438/work=/usr/local/src/conda/python-3.7.3 ' + '-fdebug-prefix-map=/opt/conda/conda-bld/python_1512347718438/work=/usr/local/src/conda/python-@PYVERFULL@ ' '-fdebug-prefix-map=/opt/anaconda1anaconda2anaconda3=/usr/local/src/conda-prefix ' '-pipe ' ' ', @@ -63,7 +63,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' '--enable-optimizations' '--with-lto' " "'--disable-shared' " "'build_alias=powerpc64le-conda_cos7-linux-gnu' " "'host_alias=powerpc64le-conda_cos7-linux-gnu' " @@ -71,7 +71,7 @@ "'CFLAGS=-mcpu=power8 -mtune=power8 -mpower8-fusion " '-mpower8-vector -ftree-vectorize -fPIC ' '-fstack-protector-strong -fno-plt -O2 ' - '-fdebug-prefix-map=/opt/conda/conda-bld/python_1512347718438/work=/usr/local/src/conda/python-3.7.3 ' + '-fdebug-prefix-map=/opt/conda/conda-bld/python_1512347718438/work=/usr/local/src/conda/python-@PYVERFULL@ ' '-fdebug-prefix-map=/opt/anaconda1anaconda2anaconda3=/usr/local/src/conda-prefix ' '-pipe ' " ' 'LDFLAGS=-Wl,-O2 " @@ -559,7 +559,7 @@ 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python3.7/config-@PYVER@@ABIFLAGS@-powerpc64le-linux-gnu', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS@-powerpc64le-linux-gnu', 'LIBRARY': 'libpython@PYVER@@ABIFLAGS@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', @@ -750,7 +750,7 @@ 'TANH_PRESERVES_ZERO_SIGN': 1, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', 'TESTPYTHON': './python', diff --git a/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py b/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py index 6af24d5c4..abcec4f51 100644 --- a/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py +++ b/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py @@ -58,7 +58,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' '--enable-optimizations' '--with-lto' " "'--disable-shared' 'build_alias=x86_64-apple-darwin13.4.0' " "'host_alias=x86_64-apple-darwin13.4.0' " "'CC=x86_64-apple-darwin13.4.0-clang' 'CFLAGS=-march=core2 " @@ -765,7 +765,7 @@ 'TANH_PRESERVES_ZERO_SIGN': 1, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', 'TESTPYTHON': './python.exe', diff --git a/recipe/sysconfigdata/_sysconfigdata_x86_64_conda_cos6_linux_gnu.py b/recipe/sysconfigdata/_sysconfigdata_x86_64_conda_cos6_linux_gnu.py index 7b191c809..cce655e50 100644 --- a/recipe/sysconfigdata/_sysconfigdata_x86_64_conda_cos6_linux_gnu.py +++ b/recipe/sysconfigdata/_sysconfigdata_x86_64_conda_cos6_linux_gnu.py @@ -58,7 +58,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' '--enable-optimizations' '--with-lto' " "'--disable-shared' 'build_alias=x86_64-conda_cos6-linux-gnu' " "'host_alias=x86_64-conda_cos6-linux-gnu' " "'CC=x86_64-conda_cos6-linux-gnu-gcc' 'CFLAGS=-march=nocona " @@ -735,7 +735,7 @@ 'TANH_PRESERVES_ZERO_SIGN': 1, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', 'TESTPYTHON': './python', diff --git a/recipe/sysconfigdata/default/_sysconfigdata_linux.py b/recipe/sysconfigdata/default/_sysconfigdata_linux.py index 8135b669f..5562f6c6a 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_linux.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_linux.py @@ -9,8 +9,8 @@ 'BASECPPFLAGS': '', 'BASEMODLIBS': '', 'BINDIR': '/opt/anaconda1anaconda2anaconda3/bin', - 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', - 'BLDLIBRARY': '-L. -lpython3.7m', + 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', + 'BLDLIBRARY': '-L. -lpython@PYVER@m', 'BLDSHARED': 'gcc -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' @@ -38,7 +38,7 @@ "'--prefix=/opt/anaconda1anaconda2anaconda3' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl8.6 -ltk8.6' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' " "'CPPFLAGS=-I/opt/anaconda1anaconda2anaconda3/include' " "'LDFLAGS=-L/opt/anaconda1anaconda2anaconda3/lib " "-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed -Wl,--sysroot=/' " @@ -46,8 +46,8 @@ 'CONFINCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python3.7m', 'COREPYTHONPATH': ':', - 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3/coverage.info', - 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3/lcov-report', + 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.4/coverage.info', + 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.4/lcov-report', 'COVERAGE_REPORT_OPTIONS': '--no-branch-coverage --title "CPython lcov ' 'report"', 'CPPFLAGS': '-I. -I./Include ' @@ -84,7 +84,7 @@ 'EXTRAMACHDEPPATH': '', 'EXTRATESTOPTS': '', 'EXTRA_CFLAGS': '', - 'EXT_SUFFIX': '.cpython-37m-@ARCH@-linux-gnu.so', + 'EXT_SUFFIX': '.cpython-@PYVERNODOTS@m-@ARCH@-linux-gnu.so', 'FILEMODE': 644, 'FLOCK_NEEDS_LIBBSD': 0, 'GETPGRP_HAVE_ARG': 0, @@ -615,7 +615,7 @@ 'READELF': 'readelf', 'RESSRCDIR': 'Mac/Resources/framework', 'RETSIGTYPE': 'void', - 'RUNSHARED': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', + 'RUNSHARED': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', 'SCRIPTDIR': '/opt/anaconda1anaconda2anaconda3/lib', 'SETPGRP_HAVE_ARG': 0, 'SGI_ABI': '', @@ -641,7 +641,7 @@ 'SIZEOF_VOID_P': 8, 'SIZEOF_WCHAR_T': 4, 'SIZEOF__BOOL': 1, - 'SOABI': 'cpython-37m-@ARCH@-linux-gnu', + 'SOABI': 'cpython-@PYVERNODOTS@m-@ARCH@-linux-gnu', 'SRCDIRS': 'Parser Grammar Objects Python Modules Mac Programs', 'SRC_GDB_HOOKS': './Tools/gdb/libpython.py', 'STDC_HEADERS': 1, @@ -654,13 +654,13 @@ 'TANH_PRESERVES_ZERO_SIGN': 1, 'TCLTK_INCLUDES': '-I/opt/anaconda1anaconda2anaconda3/include', 'TCLTK_LIBS': '-L/opt/anaconda1anaconda2anaconda3/lib ' - '-ltcl8.6 -ltk8.6', + '-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@', 'TESTOPTS': '', 'TESTPATH': '', - 'TESTPYTHON': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3 ' + 'TESTPYTHON': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@ ' './python', 'TESTPYTHONOPTS': '', - 'TESTRUNNER': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3 ' + 'TESTRUNNER': 'LD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@ ' './python ./Tools/scripts/run_tests.py', 'TESTTIMEOUT': 1200, 'THREADOBJ': 'Python/thread.o', @@ -684,8 +684,8 @@ 'WITH_VALGRIND': 0, 'X87_DOUBLE_ROUNDING': 0, 'XMLLIBSUBDIRS': 'xml xml/dom xml/etree xml/parsers xml/sax', - 'abs_builddir': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', - 'abs_srcdir': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', + 'abs_builddir': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', + 'abs_srcdir': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', 'datarootdir': '/opt/anaconda1anaconda2anaconda3/share', 'exec_prefix': '/opt/anaconda1anaconda2anaconda3', 'prefix': '/opt/anaconda1anaconda2anaconda3', diff --git a/recipe/sysconfigdata/default/_sysconfigdata_osx.py b/recipe/sysconfigdata/default/_sysconfigdata_osx.py index c167f1107..ec68939cd 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_osx.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_osx.py @@ -9,8 +9,8 @@ 'BASECPPFLAGS': '', 'BASEMODLIBS': '', 'BINDIR': '/opt/anaconda1anaconda2anaconda3/bin', - 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', - 'BLDLIBRARY': '-L. -lpython3.7m', + 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', + 'BLDLIBRARY': '-L. -lpython@PYVER@m', 'BLDSHARED': 'gcc -bundle -undefined dynamic_lookup ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64 ' @@ -49,21 +49,21 @@ "-arch x86_64' " "'PKG_CONFIG_PATH=/opt/anaconda1anaconda2anaconda3/lib/pkgconfig'", 'CONFINCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', 'COREPYTHONPATH': ':', - 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3/coverage.info', - 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3/lcov-report', + 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/coverage.info', + 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/lcov-report', 'COVERAGE_REPORT_OPTIONS': '--no-branch-coverage --title "CPython lcov ' 'report"', 'CPPFLAGS': '-I. -I./Include', 'CXX': 'g++', 'DESTDIRS': '/opt/anaconda1anaconda2anaconda3 ' '/opt/anaconda1anaconda2anaconda3/lib ' - '/opt/anaconda1anaconda2anaconda3/lib/python3.7 ' - '/opt/anaconda1anaconda2anaconda3/lib/python3.7/lib-dynload', - 'DESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@ ' + '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/lib-dynload', + 'DESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'DESTPATH': '', - 'DESTSHARED': '/opt/anaconda1anaconda2anaconda3/lib/python3.7/lib-dynload', + 'DESTSHARED': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/lib-dynload', 'DFLAGS': '', 'DIRMODE': 755, 'DIST': 'README ChangeLog configure configure.ac acconfig.h pyconfig.h.in ' @@ -479,16 +479,16 @@ 'HOST_GNU_TYPE': 'x86_64-apple-darwin13.4.0', 'INCLDIRSTOMAKE': '/opt/anaconda1anaconda2anaconda3/include ' '/opt/anaconda1anaconda2anaconda3/include ' - '/opt/anaconda1anaconda2anaconda3/include/python3.7m ' - '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m ' + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', 'INCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', 'INSTALL': '/usr/bin/install -c', 'INSTALL_DATA': '/usr/bin/install -c -m 644', 'INSTALL_PROGRAM': '/usr/bin/install -c', 'INSTALL_SCRIPT': '/usr/bin/install -c', 'INSTALL_SHARED': '/usr/bin/install -c -m 555', - 'INSTSONAME': 'libpython3.7m.dylib', + 'INSTSONAME': 'libpython@PYVER@m.dylib', 'IO_H': 'Modules/_io/_iomodule.h', 'IO_OBJS': '\\', 'LDCXXSHARED': 'g++ -bundle -undefined dynamic_lookup', @@ -497,24 +497,24 @@ '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64', 'LDLAST': '', - 'LDLIBRARY': 'libpython3.7m.dylib', + 'LDLIBRARY': 'libpython@PYVER@m.dylib', 'LDLIBRARYDIR': '', 'LDSHARED': 'gcc -bundle -undefined dynamic_lookup ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64 ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64', - 'LDVERSION': '3.7m', + 'LDVERSION': '@PYVER@m', 'LIBC': '', - 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'LIBDIR': '/opt/anaconda1anaconda2anaconda3/lib', 'LIBFFI_INCLUDEDIR': '', 'LIBM': '', 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python3.7/config-3.7m-darwin', - 'LIBRARY': 'libpython3.7m.a', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@m-darwin', + 'LIBRARY': 'libpython@PYVER@m.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', 'LIBS': '-ldl -framework CoreFoundation', @@ -532,7 +532,7 @@ 'MACHDEP': 'darwin', 'MACHDEPPATH': ':', 'MACHDEP_OBJS': '', - 'MACHDESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + 'MACHDESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'MACOSX_DEPLOYMENT_TARGET': '10.9', 'MAINCC': 'gcc', 'MAJOR_IN_MKDEV': 0, @@ -626,7 +626,7 @@ 'READELF': ':', 'RESSRCDIR': 'Mac/Resources/framework', 'RETSIGTYPE': 'void', - 'RUNSHARED': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', + 'RUNSHARED': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', 'SCRIPTDIR': '/opt/anaconda1anaconda2anaconda3/lib', 'SETPGRP_HAVE_ARG': 0, 'SGI_ABI': '', @@ -667,10 +667,10 @@ 'TCLTK_LIBS': '', 'TESTOPTS': '', 'TESTPATH': '', - 'TESTPYTHON': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3 ' + 'TESTPYTHON': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@ ' './python.exe', 'TESTPYTHONOPTS': '', - 'TESTRUNNER': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3 ' + 'TESTRUNNER': 'DYLD_LIBRARY_PATH=/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@ ' './python.exe ./Tools/scripts/run_tests.py', 'TESTTIMEOUT': 1200, 'THREADOBJ': 'Python/thread.o', @@ -681,7 +681,7 @@ 'UNIVERSALSDK': '', 'USE_COMPUTED_GOTOS': 0, 'USE_INLINE': 1, - 'VERSION': '3.7', + 'VERSION': '@PYVER@', 'WANT_SIGFPE_HANDLER': 0, 'WINDOW_HAS_FLAGS': 0, 'WITH_DOC_STRINGS': 1, @@ -694,8 +694,8 @@ 'WITH_VALGRIND': 0, 'X87_DOUBLE_ROUNDING': 0, 'XMLLIBSUBDIRS': 'xml xml/dom xml/etree xml/parsers xml/sax', - 'abs_builddir': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', - 'abs_srcdir': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.3', + 'abs_builddir': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', + 'abs_srcdir': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@', 'datarootdir': '/opt/anaconda1anaconda2anaconda3/share', 'exec_prefix': '/opt/anaconda1anaconda2anaconda3', 'prefix': '/opt/anaconda1anaconda2anaconda3', From 98fd6f1a7a76ac5737aa12fc55e82b60d41eba0e Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:22:16 -0500 Subject: [PATCH 18/54] remove toolchain logic in build.sh --- recipe/build.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 601b2fbc3..06b403090 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -384,17 +384,6 @@ pushd "${PREFIX}"/lib/python${VER} fi popd -if [[ ${_OPTIMIZED} == yes && ${target_platform} =~ linux-* && ${c_compiler} =~ .*toolchain.* ]]; then - # On the old toolchain compilers, -flto-partion=none is being replaced - # with -partition=none. This needs to be replaced back. Only happens with gcc - pushd $PREFIX/ - find lib -type f -regex ".*pyc?" | xargs sed -i "s/ -partition=none/ -flto-partition=none/g" - find lib -type f -regex ".*pyc?" | xargs sed -i "s/'-partition=none/'-flto-partition=none/g" - find lib -type f -name Makefile | xargs sed -i "s/ -partition=none/ -flto-partition=none/g" - find lib -type f -name Makefile | xargs sed -i "s/'-partition=none/'-flto-partition=none/g" - popd -fi - # There are some strange distutils files around. Delete them rm -rf ${PREFIX}/lib/python${VER}/distutils/command/*.exe From 4f52d11b10bf65519747106af8c4d8c7a4812c2d Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 12:47:12 -0500 Subject: [PATCH 19/54] add back in compiler_compat --- recipe/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 06b403090..239d4ba8d 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -384,6 +384,13 @@ pushd "${PREFIX}"/lib/python${VER} fi popd +if [[ ${HOST} =~ .*linux.* ]]; then + mkdir -p ${PREFIX}/compiler_compat + cp ${LD} ${PREFIX}/compiler_compat/ld + echo "Files in this folder are to enhance backwards compatibility of anaconda software with older compilers." > ${PREFIX}/compiler_compat/README + echo "See: https://github.com/conda/conda/issues/6030 for more information." >> ${PREFIX}/compiler_compat/README +fi + # There are some strange distutils files around. Delete them rm -rf ${PREFIX}/lib/python${VER}/distutils/command/*.exe From 1cdf0df5e7c51db779d13b5570687e6cb542e32f Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 14:17:10 -0500 Subject: [PATCH 20/54] remove additional metions of 'm' ABI' --- recipe/build.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 239d4ba8d..50a88f864 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -265,7 +265,7 @@ make -j${CPU_COUNT} -C ${_buildd_shared} \ # build a static library with PIC objects make -j${CPU_COUNT} -C ${_buildd_shared} \ EXTRA_CFLAGS="${EXTRA_CFLAGS}" \ - LIBRARY=libpython${VER}m-pic.a libpython${VER}m-pic.a + LIBRARY=libpython${VER}-pic.a libpython${VER}-pic.a if [[ ${_OPTIMIZED} == yes ]]; then make -C ${_buildd_static} install @@ -286,11 +286,11 @@ if [[ ${_OPTIMIZED} == yes ]]; then # Linking module extensions to this on Linux is redundant (but harmless). # Linking module extensions to this on Darwin is harmful (multiply defined symbols). if [[ ${target_platform} =~ linux-* ]]; then - cp -pf ${_buildd_shared}/libpython${VER}m${SHLIB_EXT}.1.0 ${PREFIX}/lib/ - ln -sf ${PREFIX}/lib/libpython${VER}m${SHLIB_EXT}.1.0 ${PREFIX}/lib/libpython${VER}m${SHLIB_EXT}.1 - ln -sf ${PREFIX}/lib/libpython${VER}m${SHLIB_EXT}.1 ${PREFIX}/lib/libpython${VER}m${SHLIB_EXT} + cp -pf ${_buildd_shared}/libpython${VER}${SHLIB_EXT}.1.0 ${PREFIX}/lib/ + ln -sf ${PREFIX}/lib/libpython${VER}${SHLIB_EXT}.1.0 ${PREFIX}/lib/libpython${VER}${SHLIB_EXT}.1 + ln -sf ${PREFIX}/lib/libpython${VER}${SHLIB_EXT}.1 ${PREFIX}/lib/libpython${VER}${SHLIB_EXT} elif [[ ${target_platform} == osx-64 ]]; then - cp -pf ${_buildd_shared}/libpython${VER}m${SHLIB_EXT} ${PREFIX}/lib/ + cp -pf ${_buildd_shared}/libpython${VER}${SHLIB_EXT} ${PREFIX}/lib/ fi else make -C ${_buildd_shared} install @@ -332,12 +332,12 @@ popd # Size reductions: pushd ${PREFIX} - if [[ -f lib/libpython${VER}m.a ]]; then - chmod +w lib/libpython${VER}m.a + if [[ -f lib/libpython${VER}.a ]]; then + chmod +w lib/libpython${VER}.a if [[ -n ${HOST} ]]; then - ${HOST}-strip -S lib/libpython${VER}m.a + ${HOST}-strip -S lib/libpython${VER}.a else - strip -S lib/libpython${VER}m.a + strip -S lib/libpython${VER}.a fi fi CONFIG_LIBPYTHON=$(find lib/python${VER}/config-${VER}${DBG}* -name "libpython${VER}.a") From 028d0162375361019a05d4ac2c3d5bc41c5ca9cf Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Tue, 15 Oct 2019 14:35:21 -0500 Subject: [PATCH 21/54] add llvm-tools as build dep on osx --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3bdcc3ace..b1f99f2a8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -86,6 +86,7 @@ requirements: - {{ compiler('cxx') }} - {{ cdt('xorg-x11-proto-devel') }} # [linux] - {{ cdt('libx11-devel') }} # [linux] + - llvm-tools # [osx] - make # [not win] - pkg-config # [not win] host: From 45d32030fa3f8bd1e1148b9a9b0e6e029eee76aa Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 16 Oct 2019 09:13:28 -0500 Subject: [PATCH 22/54] re-add explicit tests for openssl 1.1.1 --- recipe/run_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/run_test.py b/recipe/run_test.py index dd7de7ab8..c5bdfa117 100644 --- a/recipe/run_test.py +++ b/recipe/run_test.py @@ -102,4 +102,4 @@ import ssl print('OPENSSL_VERSION:', ssl.OPENSSL_VERSION) if sys.platform != 'win32': - assert os.getenv("openssl") in ssl.OPENSSL_VERSION + assert '1.1.1' in ssl.OPENSSL_VERSION From 996fcdcf8441e94fb7c90a928d31ec3348d78e4e Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 30 Oct 2019 13:00:44 -0500 Subject: [PATCH 23/54] add DLL search path patch for windows add 0020-add-conda-paths-to-DLL-search-path-on-windows.patch which makes the necessary modification to the DLL search path on Windows so that the conda directories are searched. Update other patches. Patch 0019 needs to be combined with 0020, for the time being it is skipped. --- recipe/meta.yaml | 4 +- ...-Anaconda-Distribution-version-logic.patch | 4 +- ...arch-x86_64-to-UnicCCompiler-ld_args.patch | 4 +- ...2-Change-FD_SETSIZE-from-512-to-2048.patch | 4 +- ...Add-support-to-cygwinccompiler-for-V.patch | 4 +- ...-not-pass-g-to-GCC-when-not-Py_DEBUG.patch | 4 +- ...06-Support-cross-compiling-byte-code.patch | 4 +- ...Windows-GCC-interop-needed-by-RPy2-a.patch | 4 +- ...ysroot-usr-lib-include-if-sysroot-is.patch | 4 +- ...dir_option-Use-1st-word-of-CC-as-com.patch | 4 +- ...0010-Win32-Do-not-download-externals.patch | 4 +- ..._CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch | 4 +- ...-so-that-it-looks-in-sys.prefix-lib-.patch | 4 +- ...isable-new-dtags-in-unixccompiler.py.patch | 4 +- ...-compilation-on-Debian-based-distros.patch | 4 +- ...-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch | 4 +- recipe/patches/0016-Unvendor-openssl.patch | 4 +- recipe/patches/0017-Unvendor-sqlite3.patch | 4 +- ...ange-from-https-github.com-python-cp.patch | 4 +- ...dd-CondaEcosystemModifyDllSearchPath.patch | 4 +- ...-paths-to-DLL-search-path-on-windows.patch | 81 +++++++++++++++++++ 21 files changed, 122 insertions(+), 39 deletions(-) create mode 100644 recipe/patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b1f99f2a8..dcaaa65ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -31,7 +31,9 @@ source: - patches/0017-Unvendor-sqlite3.patch # https://bugs.python.org/issue35644 - patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch - - patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch + # TODO combine 0019 and 0020 + #- patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch + - patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch # TODO :: Depend on our own packages for these: - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win] folder: externals/xz-5.2.2 # [win] diff --git a/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch b/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch index fd2616254..4ec4b5eee 100644 --- a/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch +++ b/recipe/patches/0001-Add-Anaconda-Distribution-version-logic.patch @@ -1,7 +1,7 @@ From 04d06a499f5245acbae02a7c3a939506cfb12b41 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 15 Aug 2017 22:34:16 +0100 -Subject: [PATCH 01/19] Add Anaconda Distribution version logic +Subject: [PATCH 01/20] Add Anaconda Distribution version logic --- Include/pylifecycle.h | 1 + @@ -109,5 +109,5 @@ index c32b6f9..b5dfffb 100644 Py_GetVersion(void) { -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch b/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch index 3563d37e6..f1e6a8e46 100644 --- a/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch +++ b/recipe/patches/0002-Darwin-Add-arch-x86_64-to-UnicCCompiler-ld_args.patch @@ -1,7 +1,7 @@ From c96cc069c6c79c930e2a4dc18bd803c146e6f2f1 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 08:48:16 +0100 -Subject: [PATCH 02/19] Darwin: Add -arch x86_64 to UnicCCompiler ld_args +Subject: [PATCH 02/20] Darwin: Add -arch x86_64 to UnicCCompiler ld_args --- Lib/distutils/unixccompiler.py | 1 + @@ -20,5 +20,5 @@ index d10a78d..87b3aed 100644 self.spawn(linker + ld_args) except DistutilsExecError as msg: -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch b/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch index 0ccf1add1..259df259a 100644 --- a/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch +++ b/recipe/patches/0003-Win32-Change-FD_SETSIZE-from-512-to-2048.patch @@ -1,7 +1,7 @@ From 8c9b1642b56e9c29335c4b5849825ff050bf516d Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:53:55 +0100 -Subject: [PATCH 03/19] Win32: Change FD_SETSIZE from 512 to 2048 +Subject: [PATCH 03/20] Win32: Change FD_SETSIZE from 512 to 2048 https://github.com/ContinuumIO/anaconda-issues/issues/1241 --- @@ -22,5 +22,5 @@ index ed71d8b..eb338ce 100644 #if defined(HAVE_POLL_H) -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch b/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch index 02718cd84..f89acfdf5 100644 --- a/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch +++ b/recipe/patches/0004-Win32-distutils-Add-support-to-cygwinccompiler-for-V.patch @@ -1,7 +1,7 @@ From 6f0c709840cdb957dd3434ef0d3c16ba4132c221 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:59:00 +0100 -Subject: [PATCH 04/19] Win32: distutils: Add support to cygwinccompiler for +Subject: [PATCH 04/20] Win32: distutils: Add support to cygwinccompiler for VS>=2015 Really this is for mingw-w64 though @@ -24,5 +24,5 @@ index 6c5d777..48013e1 100644 raise ValueError("Unknown MS Compiler version %s " % msc_ver) -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch b/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch index f9e682161..296b8bad5 100644 --- a/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch +++ b/recipe/patches/0005-Do-not-pass-g-to-GCC-when-not-Py_DEBUG.patch @@ -1,7 +1,7 @@ From 1bf716afd12bbaf23473884cd2cfc5c094fcce20 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 11:45:28 +0100 -Subject: [PATCH 05/19] Do not pass -g to GCC when not Py_DEBUG +Subject: [PATCH 05/20] Do not pass -g to GCC when not Py_DEBUG This bloats our exe and our modules a lot. --- @@ -48,5 +48,5 @@ index a189d42..e8d4232 100644 ;; *) -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0006-Support-cross-compiling-byte-code.patch b/recipe/patches/0006-Support-cross-compiling-byte-code.patch index f6cea7088..854a64422 100644 --- a/recipe/patches/0006-Support-cross-compiling-byte-code.patch +++ b/recipe/patches/0006-Support-cross-compiling-byte-code.patch @@ -1,7 +1,7 @@ From 707ff4e4dccbc788cdd52d27cedeadcdb7e657ce Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:17:33 +0100 -Subject: [PATCH 06/19] Support cross-compiling byte-code +Subject: [PATCH 06/20] Support cross-compiling byte-code https://bugs.python.org/issue22724 --- @@ -120,5 +120,5 @@ index e8d4232..12bb2ae 100644 dnl Ensure that if prefix is specified, it does not end in a slash. If -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch b/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch index 25a68a8d5..3b1735a1c 100644 --- a/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch +++ b/recipe/patches/0007-Win32-Fixes-for-Windows-GCC-interop-needed-by-RPy2-a.patch @@ -1,7 +1,7 @@ From 8abe927840f03c0bacee9453d1dcfe06a988f92a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 16 Aug 2017 12:23:02 +0100 -Subject: [PATCH 07/19] Win32: Fixes for Windows GCC interop needed by RPy2 and +Subject: [PATCH 07/20] Win32: Fixes for Windows GCC interop needed by RPy2 and CVXOPT We must pass -DMS_WIN32 or -DMS_WIN64 @@ -31,5 +31,5 @@ index 48013e1..339c278 100644 linker_so='%s %s %s' % (self.linker_dll, shared_option, -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch b/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch index 4de178adb..69e887f44 100644 --- a/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch +++ b/recipe/patches/0008-Darwin-Look-in-sysroot-usr-lib-include-if-sysroot-is.patch @@ -1,7 +1,7 @@ From 150303118df1e26651bcff26fab42995579ffa33 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 20 Aug 2017 00:22:22 +0100 -Subject: [PATCH 08/19] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot +Subject: [PATCH 08/20] Darwin: Look in ${sysroot}/usr/{lib,include} if sysroot is set --- @@ -28,5 +28,5 @@ index 20d7f35..7eb2095 100644 self.inc_dirs = self.compiler.include_dirs + system_include_dirs else: -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch b/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch index edfa77dc1..9a09708ac 100644 --- a/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch +++ b/recipe/patches/0009-runtime_library_dir_option-Use-1st-word-of-CC-as-com.patch @@ -1,7 +1,7 @@ From f1aa169b44cc8c083f6def2bf3e0dd8c5e77d29a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 5 Oct 2017 02:00:41 +0100 -Subject: [PATCH 09/19] runtime_library_dir_option: Use 1st word of CC as +Subject: [PATCH 09/20] runtime_library_dir_option: Use 1st word of CC as compiler Previous, 'CC' got passed to os.path.basename, so any paths in it after @@ -25,5 +25,5 @@ index 87b3aed..78a4665 100644 # MacOSX's linker doesn't understand the -R flag at all return "-L" + dir -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0010-Win32-Do-not-download-externals.patch b/recipe/patches/0010-Win32-Do-not-download-externals.patch index ef4ef3a3e..cb0695121 100644 --- a/recipe/patches/0010-Win32-Do-not-download-externals.patch +++ b/recipe/patches/0010-Win32-Do-not-download-externals.patch @@ -1,7 +1,7 @@ From 92cafbd9d9cdd6950aa2c0f4142afd0bf7d840e6 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 7 Sep 2017 11:35:47 +0100 -Subject: [PATCH 10/19] Win32: Do not download externals +Subject: [PATCH 10/20] Win32: Do not download externals --- PCbuild/build.bat | 4 ++-- @@ -28,5 +28,5 @@ index d44b52a..abfd4b6 100644 \ No newline at end of file +if ERRORLEVEL 1 exit /b 3 -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch b/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch index bfb1f600c..01fd13b3c 100644 --- a/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch +++ b/recipe/patches/0011-Add-support-for-_CONDA_PYTHON_SYSCONFIGDATA_NAME-if-.patch @@ -1,7 +1,7 @@ From 550d8e56d81919e3a5d4761e76031421ca40790f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 3 Dec 2017 17:31:27 +0000 -Subject: [PATCH 11/19] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if +Subject: [PATCH 11/20] Add support for _CONDA_PYTHON_SYSCONFIGDATA_NAME if _PYTHON_SYSCONFIGDATA_NAME is not set and ignore {_CONDA,}_PYTHON_SYSCONFIGDATA_NAME if it does not exist @@ -79,5 +79,5 @@ index b9e2faf..1812a10 100644 build_time_vars = _temp.build_time_vars vars.update(build_time_vars) -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch b/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch index f3a8dd327..4c7a773ba 100644 --- a/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch +++ b/recipe/patches/0012-Fix-find_library-so-that-it-looks-in-sys.prefix-lib-.patch @@ -1,7 +1,7 @@ From 5ed0f23117d35beeb45cf7e835c0b702267e694f Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Tue, 5 Dec 2017 22:47:59 +0000 -Subject: [PATCH 12/19] Fix find_library so that it looks in sys.prefix/lib +Subject: [PATCH 12/20] Fix find_library so that it looks in sys.prefix/lib first --- @@ -72,5 +72,5 @@ index 97973bc..1340ad7 100644 ################################################################ # test code -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch b/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch index f37aab307..9847952d7 100644 --- a/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch +++ b/recipe/patches/0013-Disable-new-dtags-in-unixccompiler.py.patch @@ -1,7 +1,7 @@ From fb0d22a9e84bb1e66edc61feac0ccf1ea9d06e63 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 29 Apr 2018 16:10:42 +0100 -Subject: [PATCH 13/19] Disable new-dtags in unixccompiler.py +Subject: [PATCH 13/20] Disable new-dtags in unixccompiler.py They prevent isolation from system libraries and the HPC 'modules' system by giving precedence to LD_LIBRARY_PATH. We never want our libraries to @@ -63,5 +63,5 @@ index 78a4665..efacb63 100644 # No idea how --enable-new-dtags would be passed on to # ld if this system was using GNU ld. Don't know if a -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch b/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch index 116c683aa..460769548 100644 --- a/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch +++ b/recipe/patches/0014-Fix-cross-compilation-on-Debian-based-distros.patch @@ -1,7 +1,7 @@ From 85e7020f8600f35846a942e4b6c09f77557056a7 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sun, 26 Aug 2018 17:10:08 +0100 -Subject: [PATCH 14/19] Fix cross-compilation on Debian-based distros +Subject: [PATCH 14/20] Fix cross-compilation on Debian-based distros --- setup.py | 3 ++- @@ -22,5 +22,5 @@ index 7eb2095..feb478b 100644 def init_inc_lib_dirs(self): -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch b/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch index 3890ac4ae..7dcb7d719 100644 --- a/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch +++ b/recipe/patches/0015-Disable-registry-lookup-unless-CONDA_PY_ALLOW_REG_PA.patch @@ -1,7 +1,7 @@ From 267edddace3749e740fd941a4e7a9bd22f5f4428 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Oct 2018 18:48:30 +0100 -Subject: [PATCH 15/19] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS +Subject: [PATCH 15/20] Disable registry lookup unless CONDA_PY_ALLOW_REG_PATHS is not 0 --- @@ -35,5 +35,5 @@ index 04f24d9..c0f0e97 100644 anything better to use! */ int skipdefault = (calculate->pythonpath_env != NULL || -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0016-Unvendor-openssl.patch b/recipe/patches/0016-Unvendor-openssl.patch index 7e53f1c08..da8005a5e 100644 --- a/recipe/patches/0016-Unvendor-openssl.patch +++ b/recipe/patches/0016-Unvendor-openssl.patch @@ -1,7 +1,7 @@ From 8def110beec1165b0567a654990afd923a2a4cd5 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Sat, 24 Nov 2018 20:38:02 -0600 -Subject: [PATCH 16/19] Unvendor openssl +Subject: [PATCH 16/20] Unvendor openssl --- PCbuild/_ssl.vcxproj | 3 --- @@ -99,5 +99,5 @@ index 871d250..0abd32b 100644 -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0017-Unvendor-sqlite3.patch b/recipe/patches/0017-Unvendor-sqlite3.patch index 7be621f73..ad7b7c34b 100644 --- a/recipe/patches/0017-Unvendor-sqlite3.patch +++ b/recipe/patches/0017-Unvendor-sqlite3.patch @@ -1,7 +1,7 @@ From 1b925cc9d8821b9e9091aca862cba17e8dd16e94 Mon Sep 17 00:00:00 2001 From: Nehal J Wani Date: Mon, 10 Dec 2018 12:22:37 -0600 -Subject: [PATCH 17/19] Unvendor sqlite3 +Subject: [PATCH 17/20] Unvendor sqlite3 --- PCbuild/_sqlite3.vcxproj | 9 ++++----- @@ -89,5 +89,5 @@ index 1a82a65..497071a 100644 -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch b/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch index c1b63991e..e3784a920 100644 --- a/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch +++ b/recipe/patches/0018-venv-Revert-a-change-from-https-github.com-python-cp.patch @@ -1,7 +1,7 @@ From faa6e118b7949d4f656a8930f3fd01c89d467b35 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 2 Jan 2019 21:38:48 +0000 -Subject: [PATCH 18/19] venv: Revert a change from +Subject: [PATCH 18/20] venv: Revert a change from https://github.com/python/cpython/commit/1c3de541e64f75046b20cdd27bada1557e550bcd https://bugs.python.org/issue35644 @@ -42,5 +42,5 @@ index caa7285..1a37080 100644 os.chmod(path, 0o755) for suffix in ('python', 'python3'): -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch b/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch index fad1c05f5..7985e02b3 100644 --- a/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch +++ b/recipe/patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch @@ -1,7 +1,7 @@ From 1750fcbdea4d13ab79a0c354fc6e502e94236f01 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Fri, 25 Jan 2019 22:54:57 +0000 -Subject: [PATCH 19/19] Add CondaEcosystemModifyDllSearchPath() +Subject: [PATCH 19/20] Add CondaEcosystemModifyDllSearchPath() This changes the DLL search order so that C:\Windows\System32 does not get searched in before entries in PATH. @@ -443,5 +443,5 @@ index 6deba11..f102c1c 100644 hDLL = LoadLibraryExW(wpathname, NULL, LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | -- -2.17.1 +2.20.1 diff --git a/recipe/patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch b/recipe/patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch new file mode 100644 index 000000000..889ba11cc --- /dev/null +++ b/recipe/patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch @@ -0,0 +1,81 @@ +From d5dc69aeff93eeb16865080e74304a49dc5e0e8a Mon Sep 17 00:00:00 2001 +From: Jonathan Helmus +Date: Tue, 22 Oct 2019 16:32:12 -0500 +Subject: [PATCH 20/20] add conda paths to DLL search path on windows + +bpo-36085 restricts the library search paths on Windows. Conda uses a +pre-defined set of paths relative to the environment root to store +libraries. Add these paths to the search path using AddDllDirectory. +--- + Python/dynload_win.c | 41 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 41 insertions(+) + +diff --git a/Python/dynload_win.c b/Python/dynload_win.c +index f102c1c..ad9c174 100644 +--- a/Python/dynload_win.c ++++ b/Python/dynload_win.c +@@ -166,6 +166,22 @@ static char *GetPythonImport (HINSTANCE hModule) + return NULL; + } + ++typedef void (WINAPI *ADD)(PCWSTR NewDirectory); ++typedef struct ++{ ++ wchar_t *p_relative; ++ wchar_t *p_name; ++} CONDA_PATH; ++#define NUM_CONDA_PATHS 5 ++static CONDA_PATH condaPaths[NUM_CONDA_PATHS] = ++{ ++ {L"Library\\mingw-w64\\bin", NULL}, ++ {L"Library\\usr\\bin", NULL}, ++ {L"Library\\bin", NULL}, ++ {L"Scripts", NULL}, ++ {L"bin", NULL} ++}; ++ + dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, + const char *shortname, + PyObject *pathname, FILE *fp) +@@ -173,6 +189,9 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, + dl_funcptr p; + char funcname[258], *import_python; + const wchar_t *wpathname; ++ ADD pAddDllDirectory; ++ wchar_t sv_executable_dirname[1024]; ++ CONDA_PATH *p_conda_path; + + #ifndef _DEBUG + _Py_CheckPython3(); +@@ -209,6 +228,28 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix, + hDLL = LoadLibraryExW(wpathname, NULL, + LOAD_LIBRARY_SEARCH_DEFAULT_DIRS | + LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR); ++ /* conda stores DLLs in a small number of directories which are added ++ * to the DLL search. ++ */ ++ pAddDllDirectory = (ADD)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "AddDllDirectory"); ++ if (pAddDllDirectory != NULL) { ++ /* Determine sv_executable_dirname */ ++ GetModuleFileNameW(NULL, &sv_executable_dirname[0], sizeof(sv_executable_dirname)/sizeof(sv_executable_dirname[0])-1); ++ sv_executable_dirname[sizeof(sv_executable_dirname)/sizeof(sv_executable_dirname[0])-1] = L'\0'; ++ if (wcsrchr(sv_executable_dirname, L'\\')) ++ *wcsrchr(sv_executable_dirname, L'\\') = L'\0'; ++ /* add each conda path to the search path */ ++ for (p_conda_path = &condaPaths[0]; p_conda_path < &condaPaths[NUM_CONDA_PATHS]; ++p_conda_path) ++ { ++ size_t n_chars_executable_dirname = wcslen(sv_executable_dirname); ++ size_t n_chars_p_relative = wcslen(p_conda_path->p_relative); ++ p_conda_path->p_name = malloc(sizeof(wchar_t) * (n_chars_executable_dirname + n_chars_p_relative + 2)); ++ wcsncpy(p_conda_path->p_name, sv_executable_dirname, n_chars_executable_dirname+1); ++ wcsncat(p_conda_path->p_name, L"\\", 2); ++ wcsncat(p_conda_path->p_name, p_conda_path->p_relative, n_chars_p_relative+1); ++ pAddDllDirectory(p_conda_path->p_name); ++ } ++ } + Py_END_ALLOW_THREADS + #if HAVE_SXS + _Py_DeactivateActCtx(cookie); +-- +2.20.1 + From 308f72f8fbfd2e4f69813e03398d70d076b04b3b Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Wed, 23 Oct 2019 17:25:28 -0500 Subject: [PATCH 24/54] explicitly set config setting for macOS --- recipe/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 50a88f864..87aa90bf8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -235,6 +235,12 @@ if [[ ${_OPTIMIZED} == yes ]]; then # http://clang.llvm.org/docs/ThinLTO.html # http://blog.llvm.org/2016/06/thinlto-scalable-and-incremental-lto.html LTO_CFLAGS+=(-flto) + # -flto breaks the check to determine whether float word ordering is bigendian + # see: + # https://bugs.python.org/issue28015 + # https://bugs.python.org/issue38527 + # manually specify this setting + export ax_cv_c_float_words_bigendian=no fi export CFLAGS="${CFLAGS} ${LTO_CFLAGS[@]}" else From dc327fc63ca82bdb26bfd1b24c5e62edb393b28e Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Wed, 30 Oct 2019 23:28:27 -0400 Subject: [PATCH 25/54] Rerendered recipe and move win to vs2017 --- .appveyor.yml | 52 --------------- .azure-pipelines/azure-pipelines-linux.yml | 8 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .azure-pipelines/azure-pipelines-win.yml | 6 +- .ci_support/osx_target_platformosx-64.yaml | 4 ++ ...14.yaml => win_target_platformwin-64.yaml} | 10 ++- .circleci/checkout_merge_commit.sh | 27 -------- .circleci/config.yml | 25 +++----- .circleci/fast_finish_ci_pr_build.sh | 4 -- .circleci/run_osx_build.sh | 41 ------------ .drone.yml | 26 ++++++++ .travis.yml | 21 +++++++ README.md | 16 ++--- conda-forge.yml | 4 +- recipe/.circleci/config.yml | 24 +++++++ recipe/.gitattributes | 24 +++++++ recipe/.gitignore | 3 + recipe/LICENSE.txt | 13 ++++ recipe/build-locally.py | 63 +++++++++++++++++++ recipe/conda_build_config.yaml | 8 +++ recipe/meta.yaml | 2 +- 21 files changed, 217 insertions(+), 166 deletions(-) delete mode 100644 .appveyor.yml rename .ci_support/{win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml => win_target_platformwin-64.yaml} (83%) delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh delete mode 100755 .circleci/run_osx_build.sh create mode 100644 .drone.yml create mode 100644 .travis.yml create mode 100644 recipe/.circleci/config.yml create mode 100644 recipe/.gitattributes create mode 100644 recipe/.gitignore create mode 100644 recipe/LICENSE.txt create mode 100755 recipe/build-locally.py create mode 100644 recipe/conda_build_config.yaml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 2e4eb79db..000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,52 +0,0 @@ -# This file was automatically generated by conda-smithy. To update a component of this -# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run -# "conda smithy rerender". -# -*- mode: yaml -*- - -environment: - - BINSTAR_TOKEN: - # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. - secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 - - matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14 - CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - -# We always use a 64-bit machine, but can build x86 distributions -# with the TARGET_ARCH variable. -platform: - - x64 - -install: - - cmd: set "CI=appveyor" - # If there is a newer build queued for the same PR, cancel this one. - - cmd: | - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')" - "%CONDA_INSTALL_LOCN%\python.exe" ff_ci_pr_build.py -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" - del ff_ci_pr_build.py - - # Cygwin's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.) - - cmd: rmdir C:\cygwin /s /q - - # Add path, activate `conda` and update conda. - - cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat - - cmd: conda.exe update --yes --quiet conda - - - cmd: set PYTHONUNBUFFERED=1 - - # Configure the VM. - # Tell conda we want an updated version of conda-forge-ci-setup and conda-build - - cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build - - cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - - -# Skip .NET project specific build phase. -build: off - -test_script: - - conda.exe build recipe -m .ci_support\%CONFIG%.yaml -deploy_script: - - set "GIT_BRANCH=%APPVEYOR_REPO_BRANCH%" - - cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index de57a4fee..7bf188169 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,14 +10,6 @@ jobs: strategy: maxParallel: 8 matrix: - linux_aarch64_target_platformlinux-aarch64: - CONFIG: linux_aarch64_target_platformlinux-aarch64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-aarch64 - linux_ppc64le_target_platformlinux-ppc64le: - CONFIG: linux_ppc64le_target_platformlinux-ppc64le - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-ppc64le linux_target_platformlinux-64: CONFIG: linux_target_platformlinux-64 UPLOAD_PACKAGES: True diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 1ce45b206..2256e9420 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,7 +12,7 @@ jobs: matrix: osx_target_platformosx-64: CONFIG: osx_target_platformosx-64 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 9889eb5ce..f34e70090 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -10,10 +10,10 @@ jobs: strategy: maxParallel: 4 matrix: - win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14: - CONFIG: win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14 + win_target_platformwin-64: + CONFIG: win_target_platformwin-64 CONDA_BLD_PATH: D:\\bld\\ - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? - script: | diff --git a/.ci_support/osx_target_platformosx-64.yaml b/.ci_support/osx_target_platformosx-64.yaml index 0c0fd0b0c..dd7b714ab 100644 --- a/.ci_support/osx_target_platformosx-64.yaml +++ b/.ci_support/osx_target_platformosx-64.yaml @@ -20,6 +20,8 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.9' +ncurses: +- '6.1' openssl: - 1.1.1a pin_run_as_build: @@ -27,6 +29,8 @@ pin_run_as_build: max_pin: x libffi: max_pin: x.x + ncurses: + max_pin: x.x openssl: max_pin: x.x.x readline: diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml b/.ci_support/win_target_platformwin-64.yaml similarity index 83% rename from .ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml rename to .ci_support/win_target_platformwin-64.yaml index 511b311d7..019e848e5 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14.yaml +++ b/.ci_support/win_target_platformwin-64.yaml @@ -1,11 +1,11 @@ c_compiler: -- vs2015 +- vs2017 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- vs2015 +- vs2017 openssl: - 1.1.1a pin_run_as_build: @@ -13,14 +13,18 @@ pin_run_as_build: max_pin: x.x.x sqlite: max_pin: x + tk: + max_pin: x.x vc: max_pin: x sqlite: - '3' target_platform: - win-64 +tk: +- '8.6' vc: -- '14' +- '14.1' zip_keys: - - vc - c_compiler diff --git a/.circleci/checkout_merge_commit.sh b/.circleci/checkout_merge_commit.sh deleted file mode 100755 index 9528e4b36..000000000 --- a/.circleci/checkout_merge_commit.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - - -# Update PR refs for testing. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" - FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Retrieve the refs. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git fetch -u origin ${FETCH_REFS} -fi - -# Checkout the PR merge ref. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" -fi - -# Check for merge conflicts. -if [[ -n "${CIRCLE_PR_NUMBER}" ]] -then - git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 271c16858..6ad461b80 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,27 +5,20 @@ version: 2 jobs: - build_osx_target_platformosx-64: + build: working_directory: ~/test - macos: - xcode: "9.0" - environment: - - CONFIG: "osx_target_platformosx-64" + machine: true steps: - - checkout - run: - name: Fast finish outdated PRs and merge PRs - command: | - ./.circleci/fast_finish_ci_pr_build.sh - ./.circleci/checkout_merge_commit.sh - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: | - export CI=circle - ./.circleci/run_osx_build.sh + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 workflows: version: 2 build_and_test: jobs: - - build_osx_target_platformosx-64 + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/.circleci/fast_finish_ci_pr_build.sh b/.circleci/fast_finish_ci_pr_build.sh deleted file mode 100755 index 4c0b56085..000000000 --- a/.circleci/fast_finish_ci_pr_build.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" diff --git a/.circleci/run_osx_build.sh b/.circleci/run_osx_build.sh deleted file mode 100755 index 374b33734..000000000 --- a/.circleci/run_osx_build.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -set -x - -curl https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py | \ - python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}" - -echo "Removing homebrew from CI to avoid conflicts." && echo -en 'travis_fold:start:remove_homebrew\\r' -curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew -chmod +x ~/uninstall_homebrew -~/uninstall_homebrew -fq -rm ~/uninstall_homebrew -echo -en 'travis_fold:end:remove_homebrew\\r' - -echo "Installing a fresh version of Miniconda." && echo -en 'travis_fold:start:install_miniconda\\r' -MINICONDA_URL="https://repo.continuum.io/miniconda" -MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh" -curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}" -bash $MINICONDA_FILE -b -echo -en 'travis_fold:end:install_miniconda\\r' - -echo "Configuring conda." && echo -en 'travis_fold:start:configure_conda\\r' -source ~/miniconda3/bin/activate root - -conda install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build -mangle_compiler ./ ./recipe .ci_support/${CONFIG}.yaml -setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml - - -source run_conda_forge_build_setup - - -echo -en 'travis_fold:end:configure_conda\\r' - -set -e - -make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml - -conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml - -upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml \ No newline at end of file diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 000000000..65d53994a --- /dev/null +++ b/.drone.yml @@ -0,0 +1,26 @@ +--- +kind: pipeline +name: linux_aarch64_target_platformlinux-aarch64 + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_target_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" + - export CI=drone + - export GIT_BRANCH="$DRONE_BRANCH" + - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint + - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh + - echo "Done building" + diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..28dd8a669 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,21 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. + +language: generic + +env: + global: + # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. + - secure: "XlN4awda3oHgy9VyeOYp5uHidR0l9bdZ8Y/RdVKs19WkUHPY0qZIALURC1cWaKdDbDrkSfUq7xiutl/248yR59fLUBdzLOBx+41pmoJ/PhhmZ/x+IvG2iX7RFcPQhuySi3UfZuymtvPCJ1ezXsyl/cFDHCOexaIXPQgiye6vm/QPFUSxyZ9ymvK4RcwdghteHR4wQpm6Lbr2eblarj+bGrymrq15vkUMvHpI8jJRHfYE9ItbHZ/uMlXfbltAPT1uHM96vQliaAPa544fVxZTLBNu8v/kVD0dfMo7A1BBiwvQj/6d+NAOqhVzXkRMkGdaQYnqq3hVOmLnJ8LjEGF0o+q2+7ENnQbdVZdyrnbwSzxLDS32LgisMGa4s/qSWwcBHeZJxTW7YRLOnMKKkDYBd5J9y7sFjIAAfRgTc2wfwvcqQfvLT17MXIwFOcN8VPulGOg9HKrfDDGsCMvPliqiE1hy96Y3aoc8BcVHINMdoE2QuCBKGDsYmSK2IHglJT1crdyVA8kpu9k6oif1dpLjGpa+wxI1hjGTHE0ookiLnN2rTj36vRibu2GC3jUQGPccDQHY/wzd4CfSitmSnudvGKk8PSf/WklirsTLXtgp53J7w+lXu62Aq7PoFBVhZl6/bEjbs7iihlBVHbuEMeW/EwMsWVABQBCAOhF2b40jyEs=" + +matrix: + include: + - env: CONFIG=linux_ppc64le_target_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + os: linux-ppc64le + +script: + - export CI=travis + - export GIT_BRANCH="$TRAVIS_BRANCH" + + + - if [[ ${PLATFORM} =~ .*linux.* ]]; then ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index 34eb2fbcf..0c19299ad 100644 --- a/README.md +++ b/README.md @@ -22,17 +22,17 @@ Current build status - + - + @@ -77,10 +77,10 @@ Current build status - + diff --git a/conda-forge.yml b/conda-forge.yml index 0cecf4957..81b29740d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,8 +1,8 @@ appveyor: secure: {BINSTAR_TOKEN: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1} compiler_stack: comp7 -max_py_ver: '37' +max_py_ver: '38' max_r_ver: '35' -provider: {linux_aarch64: azure, linux_ppc64le: azure, osx: circle, win: appveyor} +provider: {linux_aarch64: native, linux_ppc64le: native, osx: azure, win: azure} travis: secure: {BINSTAR_TOKEN: XlN4awda3oHgy9VyeOYp5uHidR0l9bdZ8Y/RdVKs19WkUHPY0qZIALURC1cWaKdDbDrkSfUq7xiutl/248yR59fLUBdzLOBx+41pmoJ/PhhmZ/x+IvG2iX7RFcPQhuySi3UfZuymtvPCJ1ezXsyl/cFDHCOexaIXPQgiye6vm/QPFUSxyZ9ymvK4RcwdghteHR4wQpm6Lbr2eblarj+bGrymrq15vkUMvHpI8jJRHfYE9ItbHZ/uMlXfbltAPT1uHM96vQliaAPa544fVxZTLBNu8v/kVD0dfMo7A1BBiwvQj/6d+NAOqhVzXkRMkGdaQYnqq3hVOmLnJ8LjEGF0o+q2+7ENnQbdVZdyrnbwSzxLDS32LgisMGa4s/qSWwcBHeZJxTW7YRLOnMKKkDYBd5J9y7sFjIAAfRgTc2wfwvcqQfvLT17MXIwFOcN8VPulGOg9HKrfDDGsCMvPliqiE1hy96Y3aoc8BcVHINMdoE2QuCBKGDsYmSK2IHglJT1crdyVA8kpu9k6oif1dpLjGpa+wxI1hjGTHE0ookiLnN2rTj36vRibu2GC3jUQGPccDQHY/wzd4CfSitmSnudvGKk8PSf/WklirsTLXtgp53J7w+lXu62Aq7PoFBVhZl6/bEjbs7iihlBVHbuEMeW/EwMsWVABQBCAOhF2b40jyEs=} diff --git a/recipe/.circleci/config.yml b/recipe/.circleci/config.yml new file mode 100644 index 000000000..6ad461b80 --- /dev/null +++ b/recipe/.circleci/config.yml @@ -0,0 +1,24 @@ +# This file was generated automatically from conda-smithy. To update this configuration, +# update the conda-forge.yml and/or the recipe/meta.yaml. +# -*- mode: yaml -*- + +version: 2 + +jobs: + build: + working_directory: ~/test + machine: true + steps: + - run: + # The Circle-CI build should not be active, but if this is not true for some reason, do a fast finish. + command: exit 0 + +workflows: + version: 2 + build_and_test: + jobs: + - build: + filters: + branches: + ignore: + - /.*/ diff --git a/recipe/.gitattributes b/recipe/.gitattributes new file mode 100644 index 000000000..86ff93771 --- /dev/null +++ b/recipe/.gitattributes @@ -0,0 +1,24 @@ +* text=auto + +*.patch binary +*.diff binary +meta.yaml text eol=lf +build.sh text eol=lf +bld.bat text eol=crlf + +# github helper pieces to make some files not show up in diffs automatically +.azure-pipelines/* linguist-generated=true +.circleci/* linguist-generated=true +.drone/* linguist-generated=true +.drone.yml linguist-generated=true +.github/* linguist-generated=true +.travis/* linguist-generated=true +.appveyor.yml linguist-generated=true +.gitattributes linguist-generated=true +.gitignore linguist-generated=true +.travis.yml linguist-generated=true +LICENSE.txt linguist-generated=true +README.md linguist-generated=true +azure-pipelines.yml linguist-generated=true +build-locally.py linguist-generated=true +shippable.yml linguist-generated=true diff --git a/recipe/.gitignore b/recipe/.gitignore new file mode 100644 index 000000000..c89ecb7d6 --- /dev/null +++ b/recipe/.gitignore @@ -0,0 +1,3 @@ +*.pyc + +build_artifacts diff --git a/recipe/LICENSE.txt b/recipe/LICENSE.txt new file mode 100644 index 000000000..cba42cffc --- /dev/null +++ b/recipe/LICENSE.txt @@ -0,0 +1,13 @@ +BSD 3-clause license +Copyright (c) 2015-2019, conda-forge +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/recipe/build-locally.py b/recipe/build-locally.py new file mode 100755 index 000000000..8f7ecca4f --- /dev/null +++ b/recipe/build-locally.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python3 +# +# This file has been generated by conda-smithy in order to build the recipe +# locally. +# +import os +import glob +import subprocess +from argparse import ArgumentParser + + +def setup_environment(ns): + os.environ["CONFIG"] = ns.config + os.environ["UPLOAD_PACKAGES"] = "False" + + +def run_docker_build(ns): + script = ".scripts/run_docker_build.sh" + subprocess.check_call([script]) + + +def verify_config(ns): + valid_configs = { + os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml") + } + print(f"valid configs are {valid_configs}") + if ns.config in valid_configs: + print("Using " + ns.config + " configuration") + return + elif len(valid_configs) == 1: + ns.config = valid_configs.pop() + print("Found " + ns.config + " configuration") + elif ns.config is None: + print("config not selected, please choose from the following:\n") + selections = list(enumerate(sorted(valid_configs), 1)) + for i, c in selections: + print(f"{i}. {c}") + s = input("\n> ") + idx = int(s) - 1 + ns.config = selections[idx][1] + print(f"selected {ns.config}") + else: + raise ValueError("config " + ns.config + " is not valid") + # Remove the following, as implemented + if not ns.config.startswith("linux"): + raise ValueError( + f"only Linux configs currently supported, got {ns.config}" + ) + + +def main(args=None): + p = ArgumentParser("build-locally") + p.add_argument("config", default=None, nargs="?") + + ns = p.parse_args(args=args) + verify_config(ns) + setup_environment(ns) + + run_docker_build(ns) + + +if __name__ == "__main__": + main() diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 000000000..c4393043f --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,8 @@ +python: # [win] + - 3.8 # [win] +c_compiler: # [win] + - vs2017 # [win] +cxx_compiler: # [win] + - vs2017 # [win] +vc: # [win] + - 14.1 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index dcaaa65ef..22c3c143a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,7 +77,7 @@ build: - DLLs/_ctypes.pyd # [win] script_env: - python_branding - skip: true # [win and vc != 14] + skip: true # [win and vc != '14.1'] # We delete the shared libraries. ignore_run_exports: # [unix] - bzip2 # [unix] From 0b5d722e3fd04b16620850021a83061f42c4d73e Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 00:00:32 -0400 Subject: [PATCH 26/54] Try to get windows going --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 22c3c143a..c3164a622 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -101,6 +101,8 @@ requirements: - tk # [not win] - ncurses # [not win] - libffi # [not win] + - vs2017_runtime # [win] + - vc # [win] run: - sqlite - xz # [not win] From 756210992cde8ce5c387da2f4bdbf21256851714 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 08:11:06 -0400 Subject: [PATCH 27/54] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3164a622..48d667553 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -101,7 +101,6 @@ requirements: - tk # [not win] - ncurses # [not win] - libffi # [not win] - - vs2017_runtime # [win] - vc # [win] run: - sqlite From 13b994cce19df70dacc1997b88a9028cff5633bd Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 10:59:45 -0400 Subject: [PATCH 28/54] Made test error more apparant --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 48d667553..2c41139ce 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -123,7 +123,7 @@ test: - python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" - _CONDA_PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_x86_64_conda_cos6_linux_gnu python -c "import sysconfig; print(sysconfig.get_config_var('CC'))" # [linux64] # check for unreplaced @ symbols in sysconfig files - - for f in ${PREFIX}/lib/python3.8/_sysconfig*.py; do echo "Checking $f:"; if [[ `rg @ $f` ]]; then exit 1; fi; done # [linux64 or osx] + - for f in ${PREFIX}/lib/python3.8/_sysconfig*.py; do echo "Checking $f:"; if [[ `rg @ $f` ]]; then echo "FAILED ON $f"; cat $f; exit 1; fi; done # [linux64 or osx] about: home: http://www.python.org/ From 8413f9bf8954345ffc1e982ea0163140a40e7315 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 13:00:48 -0400 Subject: [PATCH 29/54] Add missing @ to aarch64 sysconfigdata --- .../_sysconfigdata_aarch64_conda_cos7_linux_gnu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py b/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py index bdbcba8e4..e765a6362 100644 --- a/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py +++ b/recipe/sysconfigdata/_sysconfigdata_aarch64_conda_cos7_linux_gnu.py @@ -55,7 +55,7 @@ "'--with-system-ffi' '--enable-loadable-sqlite-extensions' " "'--with-tcltk-includes=-I/opt/anaconda1anaconda2anaconda3/include' " "'--with-tcltk-libs=-L/opt/anaconda1anaconda2anaconda3/lib " - "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER' '--enable-optimizations' '--with-lto' " + "-ltcl@TCLTK_VER@ -ltk@TCLTK_VER@' '--enable-optimizations' '--with-lto' " "'--disable-shared' " "'build_alias=aarch64-conda_cos7-linux-gnu' " "'host_alias=aarch64-conda_cos7-linux-gnu' " From 32d407a19a06630b2b8f606a8020996f8f037b1a Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 14:08:47 -0400 Subject: [PATCH 30/54] See if windows builds without PGO --- recipe/bld.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index a204e058a..9ada545ed 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -27,6 +27,8 @@ if "%DEBUG_C%"=="yes" ( ) else ( set PGO=--pgo ) +:: Disable PGO for now +set PGO= call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 From 4cf64ff507b6d301360d52d5215a8d156c7da95a Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 15:25:26 -0400 Subject: [PATCH 31/54] Hacky patch to copy some openssl dlls around --- recipe/bld.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 9ada545ed..1fe2bcb4d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -29,6 +29,15 @@ if "%DEBUG_C%"=="yes" ( ) :: Disable PGO for now set PGO= +dir %LIBRARY_PREFIX% + +for /f %%I IN (libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb) do ( + set y="%%-nI-x64.%%-I" + if exist %LIBRARY_BIN%\y ( + copy /Y %LIBRARY_BIN%\y %LIBRARY_BIN%\%%x + ) +) + call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 From a28dd06c8ed225b50b34f53e878a34ef122c6dff Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 15:59:09 -0400 Subject: [PATCH 32/54] Hacky patch to copy some openssl dlls around --- recipe/bld.bat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 1fe2bcb4d..6a5d43c9f 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -29,12 +29,12 @@ if "%DEBUG_C%"=="yes" ( ) :: Disable PGO for now set PGO= -dir %LIBRARY_PREFIX% +dir %LIBRARY_BIN% for /f %%I IN (libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb) do ( set y="%%-nI-x64.%%-I" - if exist %LIBRARY_BIN%\y ( - copy /Y %LIBRARY_BIN%\y %LIBRARY_BIN%\%%x + if exist %LIBRARY_BIN%\%y% ( + copy /Y %LIBRARY_BIN%\%y% %LIBRARY_BIN%\%%x ) ) From 54b670a7b5fd4ca44276c98585ba7840af563de8 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:14:29 -0400 Subject: [PATCH 33/54] Hacky patch to copy some openssl dlls around. V3 --- recipe/bld.bat | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6a5d43c9f..156aea10c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -31,13 +31,11 @@ if "%DEBUG_C%"=="yes" ( set PGO= dir %LIBRARY_BIN% -for /f %%I IN (libcrypto-1_1.dll libcrypto-1_1.pdb libssl-1_1.dll libssl-1_1.pdb) do ( - set y="%%-nI-x64.%%-I" - if exist %LIBRARY_BIN%\%y% ( - copy /Y %LIBRARY_BIN%\%y% %LIBRARY_BIN%\%%x - ) -) - +:: Hack around python build really wanting to copy these dlls around +if exist "%LIBRARY_BIN%\libcrypto-1_1.dll" () ELSE (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.dll" "%LIBRARY_BIN%\libcrypto-1_1.dll") +if exist "%LIBRARY_BIN%\libcrypto-1_1.pdb" () ELSE (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.pdb" "%LIBRARY_BIN%\libcrypto-1_1.pdb") +if exist "%LIBRARY_BIN%\libssl-1_1.dll" () ELSE (COPY "%LIBRARY_BIN%\libssl-1_1-x64.dll" "%LIBRARY_BIN%\libssl-1_1.dll") +if exist "%LIBRARY_BIN%\libssl-1_1.pdb" () ELSE (COPY "%LIBRARY_BIN%\libssl-1_1-x64.pdb" "%LIBRARY_BIN%\libssl-1_1.pdb") call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 From c166dc00119e841ca163f0dd9dda30bc52a2d89e Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:16:13 -0400 Subject: [PATCH 34/54] Hacky patch to copy some openssl dlls around. V3 --- recipe/bld.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 156aea10c..bc2392cc0 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -32,10 +32,10 @@ set PGO= dir %LIBRARY_BIN% :: Hack around python build really wanting to copy these dlls around -if exist "%LIBRARY_BIN%\libcrypto-1_1.dll" () ELSE (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.dll" "%LIBRARY_BIN%\libcrypto-1_1.dll") -if exist "%LIBRARY_BIN%\libcrypto-1_1.pdb" () ELSE (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.pdb" "%LIBRARY_BIN%\libcrypto-1_1.pdb") -if exist "%LIBRARY_BIN%\libssl-1_1.dll" () ELSE (COPY "%LIBRARY_BIN%\libssl-1_1-x64.dll" "%LIBRARY_BIN%\libssl-1_1.dll") -if exist "%LIBRARY_BIN%\libssl-1_1.pdb" () ELSE (COPY "%LIBRARY_BIN%\libssl-1_1-x64.pdb" "%LIBRARY_BIN%\libssl-1_1.pdb") +if not exist "%LIBRARY_BIN%\libcrypto-1_1.dll" (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.dll" "%LIBRARY_BIN%\libcrypto-1_1.dll") +if not exist "%LIBRARY_BIN%\libcrypto-1_1.pdb" (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.pdb" "%LIBRARY_BIN%\libcrypto-1_1.pdb") +if not exist "%LIBRARY_BIN%\libssl-1_1.dll" (COPY "%LIBRARY_BIN%\libssl-1_1-x64.dll" "%LIBRARY_BIN%\libssl-1_1.dll") +if not exist "%LIBRARY_BIN%\libssl-1_1.pdb" (COPY "%LIBRARY_BIN%\libssl-1_1-x64.pdb" "%LIBRARY_BIN%\libssl-1_1.pdb") call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 From cb11c5133e7f0c250813e605f95595fc10126a72 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:25:46 -0400 Subject: [PATCH 35/54] Clean up _sysconfigdatae_linux.py --- .../default/_sysconfigdata_linux.py | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/recipe/sysconfigdata/default/_sysconfigdata_linux.py b/recipe/sysconfigdata/default/_sysconfigdata_linux.py index 5562f6c6a..01e7f4e70 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_linux.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_linux.py @@ -44,10 +44,10 @@ "-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed -Wl,--sysroot=/' " "'PKG_CONFIG_PATH=/opt/anaconda1anaconda2anaconda3/lib/pkgconfig'", 'CONFINCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', 'COREPYTHONPATH': ':', - 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.4/coverage.info', - 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-3.7.4/lcov-report', + 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/coverage.info', + 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/lcov-report', 'COVERAGE_REPORT_OPTIONS': '--no-branch-coverage --title "CPython lcov ' 'report"', 'CPPFLAGS': '-I. -I./Include ' @@ -55,11 +55,11 @@ 'CXX': 'g++ -pthread -B /opt/anaconda1anaconda2anaconda3/compiler_compat -Wl,--sysroot=/', 'DESTDIRS': '/opt/anaconda1anaconda2anaconda3 ' '/opt/anaconda1anaconda2anaconda3/lib ' - '/opt/anaconda1anaconda2anaconda3/lib/python3.7 ' - '/opt/anaconda1anaconda2anaconda3/lib/python3.7/lib-dynload', - 'DESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@ ' + '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/lib-dynload', + 'DESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'DESTPATH': '', - 'DESTSHARED': '/opt/anaconda1anaconda2anaconda3/lib/python3.7/lib-dynload', + 'DESTSHARED': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/lib-dynload', 'DFLAGS': '', 'DIRMODE': 755, 'DIST': 'README ChangeLog configure configure.ac acconfig.h pyconfig.h.in ' @@ -475,16 +475,16 @@ 'HOST_GNU_TYPE': '@ARCH@-pc-linux-gnu', 'INCLDIRSTOMAKE': '/opt/anaconda1anaconda2anaconda3/include ' '/opt/anaconda1anaconda2anaconda3/include ' - '/opt/anaconda1anaconda2anaconda3/include/python3.7m ' - '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@ ' + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', 'INCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python3.7m', + 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', 'INSTALL': '/usr/bin/install -c', 'INSTALL_DATA': '/usr/bin/install -c -m 644', 'INSTALL_PROGRAM': '/usr/bin/install -c', 'INSTALL_SCRIPT': '/usr/bin/install -c', 'INSTALL_SHARED': '/usr/bin/install -c -m 555', - 'INSTSONAME': 'libpython3.7m.so.1.0', + 'INSTSONAME': 'libpython@PYVER@.so.1.0', 'IO_H': 'Modules/_io/_iomodule.h', 'IO_OBJS': '\\', 'LDCXXSHARED': 'g++ -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' @@ -495,23 +495,23 @@ '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' '-Wl,--sysroot=/', 'LDLAST': '', - 'LDLIBRARY': 'libpython3.7m.so', + 'LDLIBRARY': 'libpython@PYVER@.so', 'LDLIBRARYDIR': '', 'LDSHARED': 'gcc -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' '-Wl,--sysroot=/', - 'LDVERSION': '3.7m', + 'LDVERSION': '@PYVER@', 'LIBC': '', - 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'LIBDIR': '/opt/anaconda1anaconda2anaconda3/lib', 'LIBFFI_INCLUDEDIR': '', 'LIBM': '-lm', 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python3.7/config-3.7m-@ARCH@-linux-gnu', - 'LIBRARY': 'libpython3.7m.a', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@-@ARCH@-linux-gnu', + 'LIBRARY': 'libpython@PYVER@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', 'LIBS': '-lpthread -ldl -lutil -lrt', @@ -528,7 +528,7 @@ 'MACHDEP': 'linux', 'MACHDEPPATH': ':', 'MACHDEP_OBJS': '', - 'MACHDESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python3.7', + 'MACHDESTLIB': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'MACOSX_DEPLOYMENT_TARGET': '', 'MAINCC': 'gcc -pthread -B /opt/anaconda1anaconda2anaconda3/compiler_compat -Wl,--sysroot=/', 'MAJOR_IN_MKDEV': 0, @@ -671,7 +671,7 @@ 'UNIVERSALSDK': '', 'USE_COMPUTED_GOTOS': 0, 'USE_INLINE': 1, - 'VERSION': '3.7', + 'VERSION': '@PYVER@', 'WANT_SIGFPE_HANDLER': 0, 'WINDOW_HAS_FLAGS': 1, 'WITH_DOC_STRINGS': 1, From d45837e0e7c914207e902e068ee79af186e45322 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:37:43 -0400 Subject: [PATCH 36/54] remove errant m --- recipe/sysconfigdata/default/_sysconfigdata_linux.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/sysconfigdata/default/_sysconfigdata_linux.py b/recipe/sysconfigdata/default/_sysconfigdata_linux.py index 01e7f4e70..30ec189cc 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_linux.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_linux.py @@ -641,7 +641,7 @@ 'SIZEOF_VOID_P': 8, 'SIZEOF_WCHAR_T': 4, 'SIZEOF__BOOL': 1, - 'SOABI': 'cpython-@PYVERNODOTS@m-@ARCH@-linux-gnu', + 'SOABI': 'cpython-@PYVERNODOTS@-@ARCH@-linux-gnu', 'SRCDIRS': 'Parser Grammar Objects Python Modules Mac Programs', 'SRC_GDB_HOOKS': './Tools/gdb/libpython.py', 'STDC_HEADERS': 1, From d1f4dd7dc28c96c1e6c06d55f7cf35fcf97d733c Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 16:49:48 -0400 Subject: [PATCH 37/54] Switch to a patch instead of a hack --- recipe/bld.bat | 6 ----- recipe/meta.yaml | 1 + ...-DLLSuffix-used-to-find-the-openssl-.patch | 25 +++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch diff --git a/recipe/bld.bat b/recipe/bld.bat index bc2392cc0..08684fbd9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -31,12 +31,6 @@ if "%DEBUG_C%"=="yes" ( set PGO= dir %LIBRARY_BIN% -:: Hack around python build really wanting to copy these dlls around -if not exist "%LIBRARY_BIN%\libcrypto-1_1.dll" (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.dll" "%LIBRARY_BIN%\libcrypto-1_1.dll") -if not exist "%LIBRARY_BIN%\libcrypto-1_1.pdb" (COPY "%LIBRARY_BIN%\libcrypto-1_1-x64.pdb" "%LIBRARY_BIN%\libcrypto-1_1.pdb") -if not exist "%LIBRARY_BIN%\libssl-1_1.dll" (COPY "%LIBRARY_BIN%\libssl-1_1-x64.dll" "%LIBRARY_BIN%\libssl-1_1.dll") -if not exist "%LIBRARY_BIN%\libssl-1_1.pdb" (COPY "%LIBRARY_BIN%\libssl-1_1-x64.pdb" "%LIBRARY_BIN%\libssl-1_1.pdb") - call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 cd .. diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2c41139ce..d3a354a10 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,6 +34,7 @@ source: # TODO combine 0019 and 0020 #- patches/0019-Add-CondaEcosystemModifyDllSearchPath.patch - patches/0020-add-conda-paths-to-DLL-search-path-on-windows.patch + - patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch # TODO :: Depend on our own packages for these: - url: https://github.com/python/cpython-source-deps/archive/xz-5.2.2.zip # [win] folder: externals/xz-5.2.2 # [win] diff --git a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch new file mode 100644 index 000000000..454c01588 --- /dev/null +++ b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch @@ -0,0 +1,25 @@ +From 2911cbf8a54504163d13518bb58fe717332789e0 Mon Sep 17 00:00:00 2001 +From: Marius van Niekerk +Date: Thu, 31 Oct 2019 16:46:21 -0400 +Subject: [PATCH 21/21] Win: Add back the DLLSuffix used to find the openssl + dlls and debug files + +--- + PCbuild/openssl.props | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/PCbuild/openssl.props b/PCbuild/openssl.props +index af1350cae7..81319b6869 100644 +--- a/PCbuild/openssl.props ++++ b/PCbuild/openssl.props +@@ -11,6 +11,7 @@ + + + <_DLLSuffix>-1_1 ++ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-64 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + +-- +2.23.0 + From 1cd1ede7dc237a4992483a72f997a1e411009363 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 15:53:50 -0500 Subject: [PATCH 38/54] use @ABIFLAGS@ in _sysconfigdata_linux.py --- .../default/_sysconfigdata_linux.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/recipe/sysconfigdata/default/_sysconfigdata_linux.py b/recipe/sysconfigdata/default/_sysconfigdata_linux.py index 30ec189cc..93a795a0d 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_linux.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_linux.py @@ -1,5 +1,5 @@ # system configuration generated and used by the sysconfig module -build_time_vars = {'ABIFLAGS': 'm', +build_time_vars = {'ABIFLAGS': '@ABIFLAGS@', 'AC_APPLE_UNIVERSAL_BUILD': 0, 'AIX_GENUINE_CPLUSPLUS': 0, 'ANDROID_API_LEVEL': 0, @@ -10,7 +10,7 @@ 'BASEMODLIBS': '', 'BINDIR': '/opt/anaconda1anaconda2anaconda3/bin', 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', - 'BLDLIBRARY': '-L. -lpython@PYVER@m', + 'BLDLIBRARY': '-L. -lpython@PYVER@@ABIFLAGS@', 'BLDSHARED': 'gcc -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' @@ -44,7 +44,7 @@ "-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed -Wl,--sysroot=/' " "'PKG_CONFIG_PATH=/opt/anaconda1anaconda2anaconda3/lib/pkgconfig'", 'CONFINCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', + 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAG@', 'COREPYTHONPATH': ':', 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/coverage.info', 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/lcov-report', @@ -84,7 +84,7 @@ 'EXTRAMACHDEPPATH': '', 'EXTRATESTOPTS': '', 'EXTRA_CFLAGS': '', - 'EXT_SUFFIX': '.cpython-@PYVERNODOTS@m-@ARCH@-linux-gnu.so', + 'EXT_SUFFIX': '.cpython-@PYVERNODOTS@@ABIFLAGS@-@ARCH@-linux-gnu.so', 'FILEMODE': 644, 'FLOCK_NEEDS_LIBBSD': 0, 'GETPGRP_HAVE_ARG': 0, @@ -475,8 +475,8 @@ 'HOST_GNU_TYPE': '@ARCH@-pc-linux-gnu', 'INCLDIRSTOMAKE': '/opt/anaconda1anaconda2anaconda3/include ' '/opt/anaconda1anaconda2anaconda3/include ' - '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@ ' - '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@ ' + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@', 'INCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@', 'INSTALL': '/usr/bin/install -c', @@ -484,7 +484,7 @@ 'INSTALL_PROGRAM': '/usr/bin/install -c', 'INSTALL_SCRIPT': '/usr/bin/install -c', 'INSTALL_SHARED': '/usr/bin/install -c -m 555', - 'INSTSONAME': 'libpython@PYVER@.so.1.0', + 'INSTSONAME': 'libpython@PYVER@@ABIFLAGS@.so.1.0', 'IO_H': 'Modules/_io/_iomodule.h', 'IO_OBJS': '\\', 'LDCXXSHARED': 'g++ -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' @@ -495,13 +495,13 @@ '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' '-Wl,--sysroot=/', 'LDLAST': '', - 'LDLIBRARY': 'libpython@PYVER@.so', + 'LDLIBRARY': 'libpython@PYVER@@ABIFLAGS@.so', 'LDLIBRARYDIR': '', 'LDSHARED': 'gcc -pthread -shared -B /opt/anaconda1anaconda2anaconda3/compiler_compat ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-Wl,-rpath=/opt/anaconda1anaconda2anaconda3/lib -Wl,--no-as-needed ' '-Wl,--sysroot=/', - 'LDVERSION': '@PYVER@', + 'LDVERSION': '@PYVER@@ABIFLAGS@', 'LIBC': '', 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'LIBDIR': '/opt/anaconda1anaconda2anaconda3/lib', @@ -510,8 +510,8 @@ 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@-@ARCH@-linux-gnu', - 'LIBRARY': 'libpython@PYVER@.a', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS@-@ARCH@-linux-gnu', + 'LIBRARY': 'libpython@PYVER@@ABIFLAGS@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', 'LIBS': '-lpthread -ldl -lutil -lrt', @@ -641,7 +641,7 @@ 'SIZEOF_VOID_P': 8, 'SIZEOF_WCHAR_T': 4, 'SIZEOF__BOOL': 1, - 'SOABI': 'cpython-@PYVERNODOTS@-@ARCH@-linux-gnu', + 'SOABI': 'cpython-@PYVERNODOTS@@ABIFLAGS@-@ARCH@-linux-gnu', 'SRCDIRS': 'Parser Grammar Objects Python Modules Mac Programs', 'SRC_GDB_HOOKS': './Tools/gdb/libpython.py', 'STDC_HEADERS': 1, From fda95e86e2ff3572c8ded716ce10570743597491 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 16:13:03 -0500 Subject: [PATCH 39/54] CRLF line endings in 0021 patch --- ...-DLLSuffix-used-to-find-the-openssl-.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch index 454c01588..4df490712 100644 --- a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch +++ b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch @@ -13,13 +13,13 @@ index af1350cae7..81319b6869 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -11,6 +11,7 @@ - - - <_DLLSuffix>-1_1 -+ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-64 - <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm - <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 - --- -2.23.0 - + + + <_DLLSuffix>-1_1 ++ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-64 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + +-- +2.23.0 + From 28ee2fdf52223b42af488e51c3d529274fa72bc8 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 17:24:11 -0400 Subject: [PATCH 40/54] fix patch --- ...-DLLSuffix-used-to-find-the-openssl-.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch index 4df490712..d104bb2d9 100644 --- a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch +++ b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch @@ -13,13 +13,13 @@ index af1350cae7..81319b6869 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -11,6 +11,7 @@ - - - <_DLLSuffix>-1_1 -+ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-64 - <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm - <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 - --- -2.23.0 - + + + <_DLLSuffix>-1_1 ++ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + +-- +2.23.0 + From 137dc491b87b862596d9679821e3b24f57a92ea3 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 16:30:55 -0500 Subject: [PATCH 41/54] fixup _sysconfigdata_osx files for ABI and version --- ...sysconfigdata_x86_64_apple_darwin13_4_0.py | 2 +- .../default/_sysconfigdata_osx.py | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py b/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py index abcec4f51..ff899468b 100644 --- a/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py +++ b/recipe/sysconfigdata/_sysconfigdata_x86_64_apple_darwin13_4_0.py @@ -1,5 +1,5 @@ # system configuration generated and used by the sysconfig module -build_time_vars = {'ABIFLAGS': 'm', +build_time_vars = {'ABIFLAGS': '@ABIFLAGS@', 'AC_APPLE_UNIVERSAL_BUILD': 0, 'AIX_GENUINE_CPLUSPLUS': 0, 'ANDROID_API_LEVEL': 0, diff --git a/recipe/sysconfigdata/default/_sysconfigdata_osx.py b/recipe/sysconfigdata/default/_sysconfigdata_osx.py index ec68939cd..5a431d605 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_osx.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_osx.py @@ -1,5 +1,5 @@ # system configuration generated and used by the sysconfig module -build_time_vars = {'ABIFLAGS': 'm', +build_time_vars = {'ABIFLAGS': '@ABIFLAGS@', 'AC_APPLE_UNIVERSAL_BUILD': 0, 'AIX_GENUINE_CPLUSPLUS': 0, 'ANDROID_API_LEVEL': 0, @@ -10,7 +10,7 @@ 'BASEMODLIBS': '', 'BINDIR': '/opt/anaconda1anaconda2anaconda3/bin', 'BINLIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', - 'BLDLIBRARY': '-L. -lpython@PYVER@m', + 'BLDLIBRARY': '-L. -lpython@PYVER@@ABIFLAGS@', 'BLDSHARED': 'gcc -bundle -undefined dynamic_lookup ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64 ' @@ -49,7 +49,7 @@ "-arch x86_64' " "'PKG_CONFIG_PATH=/opt/anaconda1anaconda2anaconda3/lib/pkgconfig'", 'CONFINCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', + 'CONFINCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@', 'COREPYTHONPATH': ':', 'COVERAGE_INFO': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/coverage.info', 'COVERAGE_REPORT': '/opt/anaconda1anaconda2anaconda3/../work/Python-@PYVERFULL@/lcov-report', @@ -88,7 +88,7 @@ 'EXTRAMACHDEPPATH': '', 'EXTRATESTOPTS': '', 'EXTRA_CFLAGS': '', - 'EXT_SUFFIX': '.cpython-37m-darwin.so', + 'EXT_SUFFIX': '.cpython-@PYVERNODOTS@@ABIFLAGS@-darwin.so', 'FILEMODE': 644, 'FLOCK_NEEDS_LIBBSD': 0, 'GETPGRP_HAVE_ARG': 0, @@ -479,16 +479,16 @@ 'HOST_GNU_TYPE': 'x86_64-apple-darwin13.4.0', 'INCLDIRSTOMAKE': '/opt/anaconda1anaconda2anaconda3/include ' '/opt/anaconda1anaconda2anaconda3/include ' - '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m ' - '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@ ' + '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@', 'INCLUDEDIR': '/opt/anaconda1anaconda2anaconda3/include', - 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@m', + 'INCLUDEPY': '/opt/anaconda1anaconda2anaconda3/include/python@PYVER@@ABIFLAGS@', 'INSTALL': '/usr/bin/install -c', 'INSTALL_DATA': '/usr/bin/install -c -m 644', 'INSTALL_PROGRAM': '/usr/bin/install -c', 'INSTALL_SCRIPT': '/usr/bin/install -c', 'INSTALL_SHARED': '/usr/bin/install -c -m 555', - 'INSTSONAME': 'libpython@PYVER@m.dylib', + 'INSTSONAME': 'libpython@PYVER@@ABIFLAGS@.dylib', 'IO_H': 'Modules/_io/_iomodule.h', 'IO_OBJS': '\\', 'LDCXXSHARED': 'g++ -bundle -undefined dynamic_lookup', @@ -497,14 +497,14 @@ '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64', 'LDLAST': '', - 'LDLIBRARY': 'libpython@PYVER@m.dylib', + 'LDLIBRARY': 'libpython@PYVER@@ABIFLAGS@.dylib', 'LDLIBRARYDIR': '', 'LDSHARED': 'gcc -bundle -undefined dynamic_lookup ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64 ' '-L/opt/anaconda1anaconda2anaconda3/lib ' '-arch x86_64', - 'LDVERSION': '@PYVER@m', + 'LDVERSION': '@PYVER@@ABIFLAGS@', 'LIBC': '', 'LIBDEST': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@', 'LIBDIR': '/opt/anaconda1anaconda2anaconda3/lib', @@ -513,8 +513,8 @@ 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@m-darwin', - 'LIBRARY': 'libpython@PYVER@m.a', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS*-darwin', + 'LIBRARY': 'libpython@PYVER@@ABIFLAGS@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', 'LIBS': '-ldl -framework CoreFoundation', @@ -652,7 +652,7 @@ 'SIZEOF_VOID_P': 8, 'SIZEOF_WCHAR_T': 4, 'SIZEOF__BOOL': 1, - 'SOABI': 'cpython-37m-darwin', + 'SOABI': 'cpython-@PYVERNODOTS@@ABIFLAGS@-darwin', 'SRCDIRS': 'Parser Grammar Objects Python Modules Mac Programs', 'SRC_GDB_HOOKS': './Tools/gdb/libpython.py', 'STDC_HEADERS': 1, From 33391337db19ee39819b890f59ed0e964c17ae0d Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 16:31:42 -0500 Subject: [PATCH 42/54] CRLF line endings in 0021 patch --- ...-DLLSuffix-used-to-find-the-openssl-.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch index d104bb2d9..fadf7b28f 100644 --- a/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch +++ b/recipe/patches/0021-Win-Add-back-the-DLLSuffix-used-to-find-the-openssl-.patch @@ -13,13 +13,13 @@ index af1350cae7..81319b6869 100644 --- a/PCbuild/openssl.props +++ b/PCbuild/openssl.props @@ -11,6 +11,7 @@ - - - <_DLLSuffix>-1_1 -+ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64 - <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm - <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 - --- -2.23.0 - + + + <_DLLSuffix>-1_1 ++ <_DLLSuffix Condition="$(Platform) == 'x64'">$(_DLLSuffix)-x64 + <_DLLSuffix Condition="$(Platform) == 'ARM'">$(_DLLSuffix)-arm + <_DLLSuffix Condition="$(Platform) == 'ARM64'">$(_DLLSuffix)-arm64 + +-- +2.23.0 + From 0ca84399ffbef0119c57a0db45c7fa3af4a4d9b3 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 17:38:53 -0400 Subject: [PATCH 43/54] sysconfig_data --- recipe/sysconfigdata/default/_sysconfigdata_osx.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/sysconfigdata/default/_sysconfigdata_osx.py b/recipe/sysconfigdata/default/_sysconfigdata_osx.py index 5a431d605..23d0c4402 100644 --- a/recipe/sysconfigdata/default/_sysconfigdata_osx.py +++ b/recipe/sysconfigdata/default/_sysconfigdata_osx.py @@ -513,7 +513,7 @@ 'LIBOBJDIR': 'Python/', 'LIBOBJS': '', 'LIBPC': '/opt/anaconda1anaconda2anaconda3/lib/pkgconfig', - 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS*-darwin', + 'LIBPL': '/opt/anaconda1anaconda2anaconda3/lib/python@PYVER@/config-@PYVER@@ABIFLAGS@-darwin', 'LIBRARY': 'libpython@PYVER@@ABIFLAGS@.a', 'LIBRARY_OBJS': '\\', 'LIBRARY_OBJS_OMIT_FROZEN': '\\', From 0c529aaf4b675ef6320dc42510a43d9f12cc1130 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:21:02 -0500 Subject: [PATCH 44/54] try VS2015 with PGO --- recipe/bld.bat | 3 --- recipe/conda_build_config.yaml | 4 ++-- recipe/meta.yaml | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 08684fbd9..a204e058a 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -27,9 +27,6 @@ if "%DEBUG_C%"=="yes" ( ) else ( set PGO=--pgo ) -:: Disable PGO for now -set PGO= -dir %LIBRARY_BIN% call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index c4393043f..33af063c3 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,8 @@ python: # [win] - 3.8 # [win] c_compiler: # [win] - - vs2017 # [win] + - vs2015 # [win] cxx_compiler: # [win] - - vs2017 # [win] + - vs2015 # [win] vc: # [win] - 14.1 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d3a354a10..7414421a9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -102,7 +102,6 @@ requirements: - tk # [not win] - ncurses # [not win] - libffi # [not win] - - vc # [win] run: - sqlite - xz # [not win] From c7cab0c45107835282d7c5705d26a57d7929cf5b Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:25:55 -0500 Subject: [PATCH 45/54] more VS2015 changes --- .ci_support/win_target_platformwin-64.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_support/win_target_platformwin-64.yaml b/.ci_support/win_target_platformwin-64.yaml index 019e848e5..012114ffe 100644 --- a/.ci_support/win_target_platformwin-64.yaml +++ b/.ci_support/win_target_platformwin-64.yaml @@ -1,11 +1,11 @@ c_compiler: -- vs2017 +- vs2015 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- vs2017 +- vs2015 openssl: - 1.1.1a pin_run_as_build: @@ -24,7 +24,7 @@ target_platform: tk: - '8.6' vc: -- '14.1' +- '14' zip_keys: - - vc - c_compiler From 320aea52041796aeb1c7eea73aceb140c9b125a2 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:30:53 -0500 Subject: [PATCH 46/54] one more VS2015 changes --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7414421a9..e91f0364d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,7 @@ build: - DLLs/_ctypes.pyd # [win] script_env: - python_branding - skip: true # [win and vc != '14.1'] + skip: true # [win and vc != '14'] # We delete the shared libraries. ignore_run_exports: # [unix] - bzip2 # [unix] From 85c8d3ba4f3b585cfe72ed8afcd1b37de752c560 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 18:35:51 -0400 Subject: [PATCH 47/54] PGO revert selectors are very hard for versions --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e91f0364d..f4027f97b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,7 @@ build: - DLLs/_ctypes.pyd # [win] script_env: - python_branding - skip: true # [win and vc != '14'] + skip: true # [win and vc != 14] # We delete the shared libraries. ignore_run_exports: # [unix] - bzip2 # [unix] From 139b423d51bdbb12e8dc03167784e09811e9d1cc Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:48:47 -0500 Subject: [PATCH 48/54] Revert "PGO revert selectors are very hard for versions" This reverts commit 85c8d3ba4f3b585cfe72ed8afcd1b37de752c560. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f4027f97b..e91f0364d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,7 @@ build: - DLLs/_ctypes.pyd # [win] script_env: - python_branding - skip: true # [win and vc != 14] + skip: true # [win and vc != '14'] # We delete the shared libraries. ignore_run_exports: # [unix] - bzip2 # [unix] From 2d73933e21a7d52765f835c286e1450f4e49ae94 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:48:50 -0500 Subject: [PATCH 49/54] Revert "one more VS2015 changes" This reverts commit 320aea52041796aeb1c7eea73aceb140c9b125a2. --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e91f0364d..7414421a9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -78,7 +78,7 @@ build: - DLLs/_ctypes.pyd # [win] script_env: - python_branding - skip: true # [win and vc != '14'] + skip: true # [win and vc != '14.1'] # We delete the shared libraries. ignore_run_exports: # [unix] - bzip2 # [unix] From 9f5ad4df695d790a14f33fd15fbeb762dcf1d6fc Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:48:50 -0500 Subject: [PATCH 50/54] Revert "more VS2015 changes" This reverts commit c7cab0c45107835282d7c5705d26a57d7929cf5b. --- .ci_support/win_target_platformwin-64.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci_support/win_target_platformwin-64.yaml b/.ci_support/win_target_platformwin-64.yaml index 012114ffe..019e848e5 100644 --- a/.ci_support/win_target_platformwin-64.yaml +++ b/.ci_support/win_target_platformwin-64.yaml @@ -1,11 +1,11 @@ c_compiler: -- vs2015 +- vs2017 channel_sources: - conda-forge,defaults channel_targets: - conda-forge main cxx_compiler: -- vs2015 +- vs2017 openssl: - 1.1.1a pin_run_as_build: @@ -24,7 +24,7 @@ target_platform: tk: - '8.6' vc: -- '14' +- '14.1' zip_keys: - - vc - c_compiler From bb8f985553bb4f3938a80cbf06032544bb88c4a4 Mon Sep 17 00:00:00 2001 From: Jonathan Helmus Date: Thu, 31 Oct 2019 17:48:51 -0500 Subject: [PATCH 51/54] Revert "try VS2015 with PGO" This reverts commit 0c529aaf4b675ef6320dc42510a43d9f12cc1130. --- recipe/bld.bat | 3 +++ recipe/conda_build_config.yaml | 4 ++-- recipe/meta.yaml | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index a204e058a..08684fbd9 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -27,6 +27,9 @@ if "%DEBUG_C%"=="yes" ( ) else ( set PGO=--pgo ) +:: Disable PGO for now +set PGO= +dir %LIBRARY_BIN% call build.bat %PGO% -m -e -v -p %PLATFORM% if errorlevel 1 exit 1 diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 33af063c3..c4393043f 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,8 @@ python: # [win] - 3.8 # [win] c_compiler: # [win] - - vs2015 # [win] + - vs2017 # [win] cxx_compiler: # [win] - - vs2015 # [win] + - vs2017 # [win] vc: # [win] - 14.1 # [win] diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7414421a9..d3a354a10 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -102,6 +102,7 @@ requirements: - tk # [not win] - ncurses # [not win] - libffi # [not win] + - vc # [win] run: - sqlite - xz # [not win] From 53e88383dc3bbe60193c377ede47716db8f4d5a4 Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 19:23:18 -0400 Subject: [PATCH 52/54] Update .drone.yml --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 65d53994a..03aad5d82 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,6 +17,7 @@ steps: from_secret: BINSTAR_TOKEN commands: - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - echo "$FEEDSTOCK_ROOT" - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - export CI=drone - export GIT_BRANCH="$DRONE_BRANCH" From 00c040b8bd516d66b5b96a6738ca37d3bc2923df Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 19:28:47 -0400 Subject: [PATCH 53/54] Update .drone.yml --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 03aad5d82..e7320954e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,6 +16,7 @@ steps: BINSTAR_TOKEN: from_secret: BINSTAR_TOKEN commands: + - pwd - export FEEDSTOCK_ROOT="$CI_WORKSPACE" - echo "$FEEDSTOCK_ROOT" - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" From 38542b0b3ed85521f5e560951fd1967d25ad811e Mon Sep 17 00:00:00 2001 From: Marius van Niekerk Date: Thu, 31 Oct 2019 19:29:29 -0400 Subject: [PATCH 54/54] Update .drone.yml --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e7320954e..1db2be8a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ steps: from_secret: BINSTAR_TOKEN commands: - pwd - - export FEEDSTOCK_ROOT="$CI_WORKSPACE" + - export FEEDSTOCK_ROOT="${CI_WORKSPACE:-$(pwd)}" - echo "$FEEDSTOCK_ROOT" - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - export CI=drone
CircleCITravis - - OSX + + macOS
AppveyorDrone - - windows + + linux
win_c_compilervs2015cxx_compilervs2015target_platformwin-64vc14win_target_platformwin-64 - variant + variant