diff --git a/.appveyor.yml b/.appveyor.yml index e97decb3a..33a403fbb 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,10 +10,10 @@ environment: secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 matrix: - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.6vc14 + - CONFIG: win_python3.6.____cpython CONDA_INSTALL_LOCN: C:\Miniconda36-x64 - - CONFIG: win_c_compilervs2015cxx_compilervs2015python3.7vc14 + - CONFIG: win_python3.7.____cpython CONDA_INSTALL_LOCN: C:\Miniconda36-x64 @@ -24,6 +24,11 @@ platform: 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 @@ -47,4 +52,4 @@ 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 + - 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 dce52776f..6edbe0d93 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,16 +10,12 @@ jobs: strategy: maxParallel: 8 matrix: - linux_python2.7target_platformlinux-64: - CONFIG: linux_python2.7target_platformlinux-64 + linux_python3.6.____cpythontarget_platformlinux-64: + CONFIG: linux_python3.6.____cpythontarget_platformlinux-64 UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.6target_platformlinux-64: - CONFIG: linux_python3.6target_platformlinux-64 - UPLOAD_PACKAGES: True - DOCKER_IMAGE: condaforge/linux-anvil-comp7 - linux_python3.7target_platformlinux-64: - CONFIG: linux_python3.7target_platformlinux-64 + linux_python3.7.____cpythontarget_platformlinux-64: + CONFIG: linux_python3.7.____cpythontarget_platformlinux-64 UPLOAD_PACKAGES: True DOCKER_IMAGE: condaforge/linux-anvil-comp7 steps: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f60ae16f2..2f532603f 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,19 +5,16 @@ jobs: - job: osx pool: - vmImage: macOS-10.13 + vmImage: macOS-10.14 timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: - osx_python2.7: - CONFIG: osx_python2.7 + osx_python3.6.____cpython: + CONFIG: osx_python3.6.____cpython UPLOAD_PACKAGES: True - osx_python3.6: - CONFIG: osx_python3.6 - UPLOAD_PACKAGES: True - osx_python3.7: - CONFIG: osx_python3.7 + osx_python3.7.____cpython: + CONFIG: osx_python3.7.____cpython UPLOAD_PACKAGES: True steps: @@ -48,7 +45,7 @@ jobs: source activate base echo "Configuring conda." - setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml + setup_conda_rc ./ "./recipe" ./.ci_support/${CONFIG}.yaml export CI=azure source run_conda_forge_build_setup conda update --yes --quiet --override-channels -c conda-forge -c defaults --all @@ -59,23 +56,23 @@ jobs: - script: | source activate base - mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml + mangle_compiler ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | source activate base - make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml + make_build_number ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | source activate base - conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml + conda build "./recipe" -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | source activate base export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME - upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml + upload_package ./ "./recipe" ./.ci_support/${CONFIG}.yaml displayName: Upload package env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) diff --git a/.ci_support/linux_aarch64_python3.6target_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.6target_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64.yaml index c6c735d63..eaba79e32 100644 --- a/.ci_support/linux_aarch64_python3.6target_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64.yaml @@ -49,7 +49,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.6' +- 3.6.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_aarch64_python3.7target_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml similarity index 97% rename from .ci_support/linux_aarch64_python3.7target_platformlinux-aarch64.yaml rename to .ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml index e73ce7c3c..e2c52ead5 100644 --- a/.ci_support/linux_aarch64_python3.7target_platformlinux-aarch64.yaml +++ b/.ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml @@ -49,7 +49,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.7' +- 3.7.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_ppc64le_python3.6target_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml similarity index 97% rename from .ci_support/linux_ppc64le_python3.6target_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml index 03a85c0a4..296a9e9f7 100644 --- a/.ci_support/linux_ppc64le_python3.6target_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml @@ -41,7 +41,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.6' +- 3.6.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_ppc64le_python3.7target_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml similarity index 97% rename from .ci_support/linux_ppc64le_python3.7target_platformlinux-ppc64le.yaml rename to .ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml index 1936090d7..f827d532d 100644 --- a/.ci_support/linux_ppc64le_python3.7target_platformlinux-ppc64le.yaml +++ b/.ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml @@ -41,7 +41,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.7' +- 3.7.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_python2.7target_platformlinux-64.yaml b/.ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml similarity index 97% rename from .ci_support/linux_python2.7target_platformlinux-64.yaml rename to .ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml index b754a849d..7a9090d41 100644 --- a/.ci_support/linux_python2.7target_platformlinux-64.yaml +++ b/.ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml @@ -43,7 +43,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '2.7' +- 3.6.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_python3.6target_platformlinux-64.yaml b/.ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml similarity index 97% rename from .ci_support/linux_python3.6target_platformlinux-64.yaml rename to .ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml index 1891cc879..c82fcc437 100644 --- a/.ci_support/linux_python3.6target_platformlinux-64.yaml +++ b/.ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml @@ -43,7 +43,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.6' +- 3.7.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/linux_python3.7target_platformlinux-64.yaml b/.ci_support/linux_python3.7target_platformlinux-64.yaml deleted file mode 100644 index 7b884d5b4..000000000 --- a/.ci_support/linux_python3.7target_platformlinux-64.yaml +++ /dev/null @@ -1,58 +0,0 @@ -bzip2: -- '1' -c_compiler: -- gcc -c_compiler_version: -- '7' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- gxx -cxx_compiler_version: -- '7' -docker_image: -- condaforge/linux-anvil-comp7 -libffi: -- '3.2' -ncurses: -- '6.1' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.x - openssl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x -python: -- '3.7' -readline: -- '8.0' -sqlite: -- '3' -target_platform: -- linux-64 -tk: -- '8.6' -xz: -- '5.2' -zlib: -- '1.2' diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml deleted file mode 100644 index fb3ebfa57..000000000 --- a/.ci_support/osx_python2.7.yaml +++ /dev/null @@ -1,60 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -bzip2: -- '1' -c_compiler: -- clang -c_compiler_version: -- '9' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -cxx_compiler: -- clangxx -cxx_compiler_version: -- '9' -libffi: -- '3.2' -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -ncurses: -- '6.1' -openssl: -- 1.1.1 -pin_run_as_build: - bzip2: - max_pin: x - libffi: - max_pin: x.x - ncurses: - max_pin: x.x - openssl: - max_pin: x.x.x - python: - min_pin: x.x - max_pin: x.x - readline: - max_pin: x - sqlite: - max_pin: x - tk: - max_pin: x.x - xz: - max_pin: x.x - zlib: - max_pin: x.x -python: -- '2.7' -readline: -- '8.0' -sqlite: -- '3' -tk: -- '8.6' -xz: -- '5.2' -zlib: -- '1.2' diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.____cpython.yaml similarity index 97% rename from .ci_support/osx_python3.6.yaml rename to .ci_support/osx_python3.6.____cpython.yaml index eb05b098c..e8eaad22e 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.____cpython.yaml @@ -47,7 +47,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.6' +- 3.6.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.____cpython.yaml similarity index 97% rename from .ci_support/osx_python3.7.yaml rename to .ci_support/osx_python3.7.____cpython.yaml index ca242a982..740dfa57e 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.____cpython.yaml @@ -47,7 +47,7 @@ pin_run_as_build: zlib: max_pin: x.x python: -- '3.7' +- 3.7.* *_cpython readline: - '8.0' sqlite: diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6vc14.yaml b/.ci_support/win_python3.6.____cpython.yaml similarity index 76% rename from .ci_support/win_c_compilervs2015cxx_compilervs2015python3.6vc14.yaml rename to .ci_support/win_python3.6.____cpython.yaml index bbcae19a2..65c313776 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.6vc14.yaml +++ b/.ci_support/win_python3.6.____cpython.yaml @@ -13,11 +13,6 @@ pin_run_as_build: vc: max_pin: x python: -- '3.6' +- 3.6.* *_cpython vc: - '14' -zip_keys: -- - python - - vc - - c_compiler - - cxx_compiler diff --git a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7vc14.yaml b/.ci_support/win_python3.7.____cpython.yaml similarity index 76% rename from .ci_support/win_c_compilervs2015cxx_compilervs2015python3.7vc14.yaml rename to .ci_support/win_python3.7.____cpython.yaml index 3aa1a05d0..d3ca4028a 100644 --- a/.ci_support/win_c_compilervs2015cxx_compilervs2015python3.7vc14.yaml +++ b/.ci_support/win_python3.7.____cpython.yaml @@ -13,11 +13,6 @@ pin_run_as_build: vc: max_pin: x python: -- '3.7' +- 3.7.* *_cpython vc: - '14' -zip_keys: -- - python - - vc - - c_compiler - - cxx_compiler diff --git a/.drone.yml b/.drone.yml index 1b3703450..f7c8fa772 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_python3.6target_platf_h6b731c3333 +name: linux_aarch64_python3.6.____cpython_h83c16aa69a platform: os: linux @@ -10,7 +10,7 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_python3.6target_platformlinux-aarch64 + CONFIG: linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64 UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: @@ -26,7 +26,7 @@ steps: --- kind: pipeline -name: linux_aarch64_python3.7target_platf_h40271f266f +name: linux_aarch64_python3.7.____cpython_h07a3c734fe platform: os: linux @@ -36,7 +36,7 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_python3.7target_platformlinux-aarch64 + CONFIG: linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64 UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.travis.yml b/.travis.yml index 745234773..88949a8ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ env: matrix: include: - - env: CONFIG=linux_ppc64le_python3.6target_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le - - env: CONFIG=linux_ppc64le_python3.7target_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le + - env: CONFIG=linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=condaforge/linux-anvil-ppc64le os: linux arch: ppc64le diff --git a/README.md b/README.md index 241e6da72..ae3674fde 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ About python Home: http://www.python.org/ -Package license: PSF +Package license: Python-2.0 Feedstock license: BSD 3-Clause @@ -56,87 +56,73 @@ Current build status - + - + - + - + - + - + - + - + - + - + - - - - - - diff --git a/recipe/brand_python.py b/recipe/brand_python.py index d58bee0b2..0eca88d89 100644 --- a/recipe/brand_python.py +++ b/recipe/brand_python.py @@ -17,7 +17,7 @@ def patch_platform(msg): fh.write(line) if line.startswith('_sys_version_parser'): next_line = next(lines_it) - fh.write(" r'([\w.+]+)\s*" + re.escape(' ' + msg) + "\s*'\n") + fh.write(" r'([\w.+]+)\s*" + '(?:' + re.escape(' ' + msg) + ')?' + "\s*'\n") def patch_get_version(msg): with open(get_version_file, 'r') as fh: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7fc53e6f1..3be80425e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -83,7 +83,7 @@ source: sha256: de3c87b26a80e789986d8e6950c6304175d3829afe9c6c7211eb7257266ab0ac # [win] build: - number: 1009 + number: 1010 # Windows has issues updating python if conda is using files itself. # Copy rather than link. no_link: @@ -113,6 +113,7 @@ requirements: - make # [unix] - pkg-config # [unix] - llvm-tools # [osx] + - m2-patch # [win] host: - bzip2 # [unix] - sqlite # [unix] @@ -150,7 +151,7 @@ test: about: home: http://www.python.org/ - license: PSF + license: Python-2.0 license_file: LICENSE summary: General purpose programming language description: |
VariantStatus
linux_aarch64_python3.6target_platformlinux-aarch64linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64 - variant + variant
linux_aarch64_python3.7target_platformlinux-aarch64linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64 - variant + variant
linux_ppc64le_python3.6target_platformlinux-ppc64lelinux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le - variant + variant
linux_ppc64le_python3.7target_platformlinux-ppc64lelinux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le - variant + variant
linux_python2.7target_platformlinux-64linux_python3.6.____cpythontarget_platformlinux-64 - variant + variant
linux_python3.6target_platformlinux-64linux_python3.7.____cpythontarget_platformlinux-64 - variant + variant
linux_python3.7target_platformlinux-64osx_python3.6.____cpython - variant + variant
osx_python2.7osx_python3.7.____cpython - variant + variant
osx_python3.6win_python3.6.____cpython - variant + variant
osx_python3.7win_python3.7.____cpython - variant - -
win_c_compilervs2015cxx_compilervs2015python3.6vc14 - - variant - -
win_c_compilervs2015cxx_compilervs2015python3.7vc14 - - variant + variant