diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 7bf188169..6edbe0d93 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -10,8 +10,12 @@ jobs: strategy: maxParallel: 8 matrix: - linux_target_platformlinux-64: - CONFIG: linux_target_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.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 cf57a7a6b..507d020bd 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,13 +5,16 @@ jobs: - job: osx pool: - vmImage: macOS-10.13 + vmImage: macOS-10.14 timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: - osx_target_platformosx-64: - CONFIG: osx_target_platformosx-64 + osx_python3.6.____cpythontarget_platformosx-64: + CONFIG: osx_python3.6.____cpythontarget_platformosx-64 + UPLOAD_PACKAGES: True + osx_python3.7.____cpythontarget_platformosx-64: + CONFIG: osx_python3.7.____cpythontarget_platformosx-64 UPLOAD_PACKAGES: True steps: @@ -42,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 @@ -53,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/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 7ed43d23a..f53dc729e 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -58,13 +58,13 @@ jobs: inputs: packageSpecs: 'python=3.6 conda-build conda conda-forge::conda-forge-ci-setup=2' # Optional installOptions: "-c conda-forge" - updateConda: false + updateConda: true displayName: Install conda-build and activate environment - script: set PYTHONUNBUFFERED=1 # Configure the VM - - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml + - script: setup_conda_rc .\ ".\recipe" .\.ci_support\%CONFIG%.yaml # Configure the VM. - script: | @@ -80,7 +80,7 @@ jobs: # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml displayName: Build recipe (vs2008) env: VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" @@ -88,7 +88,7 @@ jobs: condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -96,7 +96,7 @@ jobs: - script: | set "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.6.____cpythontarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64.yaml new file mode 100644 index 000000000..eaba79e32 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64.yaml @@ -0,0 +1,64 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- condaforge/linux-anvil-aarch64 +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.6.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml b/.ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml new file mode 100644 index 000000000..e2c52ead5 --- /dev/null +++ b/.ci_support/linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64.yaml @@ -0,0 +1,64 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '7' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '7' +docker_image: +- condaforge/linux-anvil-aarch64 +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.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-aarch64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml new file mode 100644 index 000000000..296a9e9f7 --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le.yaml @@ -0,0 +1,54 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- condaforge/linux-anvil-ppc64le +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 + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.6.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml b/.ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml new file mode 100644 index 000000000..f827d532d --- /dev/null +++ b/.ci_support/linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le.yaml @@ -0,0 +1,54 @@ +bzip2: +- '1' +c_compiler: +- gcc +c_compiler_version: +- '8' +channel_sources: +- conda-forge,defaults +channel_targets: +- conda-forge main +cxx_compiler: +- gxx +cxx_compiler_version: +- '8' +docker_image: +- condaforge/linux-anvil-ppc64le +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 + xz: + max_pin: x.x + zlib: + max_pin: x.x +python: +- 3.7.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-ppc64le +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml b/.ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml new file mode 100644 index 000000000..7a9090d41 --- /dev/null +++ b/.ci_support/linux_python3.6.____cpythontarget_platformlinux-64.yaml @@ -0,0 +1,58 @@ +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.6.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml b/.ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml new file mode 100644 index 000000000..c82fcc437 --- /dev/null +++ b/.ci_support/linux_python3.7.____cpythontarget_platformlinux-64.yaml @@ -0,0 +1,58 @@ +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.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- linux-64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/osx_python3.6.____cpythontarget_platformosx-64.yaml b/.ci_support/osx_python3.6.____cpythontarget_platformosx-64.yaml new file mode 100644 index 000000000..16e9a0c4b --- /dev/null +++ b/.ci_support/osx_python3.6.____cpythontarget_platformosx-64.yaml @@ -0,0 +1,58 @@ +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' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + 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.6.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- osx-64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/osx_python3.7.____cpythontarget_platformosx-64.yaml b/.ci_support/osx_python3.7.____cpythontarget_platformosx-64.yaml new file mode 100644 index 000000000..b8e633d52 --- /dev/null +++ b/.ci_support/osx_python3.7.____cpythontarget_platformosx-64.yaml @@ -0,0 +1,58 @@ +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' +openssl: +- 1.1.1 +pin_run_as_build: + bzip2: + max_pin: x + libffi: + 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.* *_cpython +readline: +- '8.0' +sqlite: +- '3' +target_platform: +- osx-64 +tk: +- '8.6' +xz: +- '5.2' +zlib: +- '1.2' diff --git a/.ci_support/win_target_platformwin-64.yaml b/.ci_support/win_target_platformwin-64.yaml index 0bf2c236a..b6cb34c26 100644 --- a/.ci_support/win_target_platformwin-64.yaml +++ b/.ci_support/win_target_platformwin-64.yaml @@ -11,16 +11,18 @@ openssl: pin_run_as_build: openssl: max_pin: x.x.x + python: + min_pin: x.x + max_pin: x.x sqlite: max_pin: x tk: max_pin: x.x +python: +- '3.8' sqlite: - '3' target_platform: - win-64 tk: - '8.6' -zip_keys: -- - c_compiler - - cxx_compiler diff --git a/.drone.yml b/.drone.yml index 0a56f376c..f7c8fa772 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ --- kind: pipeline -name: linux_aarch64_target_platformlinux-aarch64 +name: linux_aarch64_python3.6.____cpython_h83c16aa69a platform: os: linux @@ -10,7 +10,33 @@ steps: - name: Install and build image: condaforge/linux-anvil-aarch64 environment: - CONFIG: linux_aarch64_target_platformlinux-aarch64 + CONFIG: linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64 + UPLOAD_PACKAGES: True + PLATFORM: linux-aarch64 + BINSTAR_TOKEN: + from_secret: BINSTAR_TOKEN + commands: + - export FEEDSTOCK_ROOT="$DRONE_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" + +--- +kind: pipeline +name: linux_aarch64_python3.7.____cpython_h07a3c734fe + +platform: + os: linux + arch: arm64 + +steps: +- name: Install and build + image: condaforge/linux-anvil-aarch64 + environment: + CONFIG: linux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64 UPLOAD_PACKAGES: True PLATFORM: linux-aarch64 BINSTAR_TOKEN: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 1f8df4bf6..6243a31d1 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @jakirkham @jjhelmus @mingwandroid @msarahan @ocefpaf @pelson @scopatz \ No newline at end of file +* @isuruf @jakirkham @jjhelmus @mingwandroid @msarahan @ocefpaf @pelson @scopatz \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6d8564478..88949a8ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,11 @@ env: matrix: include: - - env: CONFIG=linux_ppc64le_target_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.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 84f05864d..4b44ee29b 100644 --- a/README.md +++ b/README.md @@ -49,31 +49,59 @@ Current build status - + - + - + - + + + + + + + + + + + + + @@ -183,6 +211,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@isuruf](https://github.com/isuruf/) * [@jakirkham](https://github.com/jakirkham/) * [@jjhelmus](https://github.com/jjhelmus/) * [@mingwandroid](https://github.com/mingwandroid/) 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 dd8165cc8..1386d0980 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -77,7 +77,7 @@ source: build: - number: 4 + number: 5 # Windows has issues updating python if conda is using files itself. # Copy rather than link. no_link:
VariantStatus
linux_aarch64_target_platformlinux-aarch64linux_aarch64_python3.6.____cpythontarget_platformlinux-aarch64 - variant + variant
linux_ppc64le_target_platformlinux-ppc64lelinux_aarch64_python3.7.____cpythontarget_platformlinux-aarch64 - variant + variant
linux_target_platformlinux-64linux_ppc64le_python3.6.____cpythontarget_platformlinux-ppc64le - variant + variant
osx_target_platformosx-64linux_ppc64le_python3.7.____cpythontarget_platformlinux-ppc64le - variant + variant + +
linux_python3.6.____cpythontarget_platformlinux-64 + + variant + +
linux_python3.7.____cpythontarget_platformlinux-64 + + variant + +
osx_python3.6.____cpythontarget_platformosx-64 + + variant + +
osx_python3.7.____cpythontarget_platformosx-64 + + variant