From 55deb2bc87ca98ff29a5b7bc9e1131a0dee9c6db Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot Date: Sat, 23 Mar 2019 21:25:52 +0000 Subject: [PATCH] MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.3.2, and conda-forge-pinning 2019.03.17 --- .appveyor.yml | 2 +- .azure-pipelines/azure-pipelines-linux.yml | 18 ++-- .azure-pipelines/azure-pipelines-osx.yml | 45 ++++------ .azure-pipelines/azure-pipelines-win.yml | 25 ++++-- .ci_support/linux_python2.7.yaml | 2 + .ci_support/linux_python3.6.yaml | 2 + .ci_support/linux_python3.7.yaml | 2 + .ci_support/osx_python2.7.yaml | 2 + .ci_support/osx_python3.6.yaml | 2 + .ci_support/osx_python3.7.yaml | 2 + .circleci/build_steps.sh | 39 --------- .circleci/checkout_merge_commit.sh | 27 ------ .circleci/config.yml | 58 ++----------- .circleci/fast_finish_ci_pr_build.sh | 4 - .circleci/run_docker_build.sh | 57 ------------- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .travis.yml | 67 --------------- LICENSE.txt | 2 +- README.md | 98 ++++++++++++++++++++-- 19 files changed, 159 insertions(+), 297 deletions(-) delete mode 100755 .circleci/build_steps.sh delete mode 100755 .circleci/checkout_merge_commit.sh delete mode 100755 .circleci/fast_finish_ci_pr_build.sh delete mode 100755 .circleci/run_docker_build.sh delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml index 3cd948f..8e6230d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,7 +29,7 @@ install: # 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')" - ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%" + "%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.) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index eb9811e..b484d51 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -3,35 +3,37 @@ # -*- mode: yaml -*- jobs: -- job: linux_64 +- job: linux pool: vmImage: ubuntu-16.04 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: linux_python2.7: CONFIG: linux_python2.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True linux_python3.6: CONFIG: linux_python3.6 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True linux_python3.7: CONFIG: linux_python3.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: - script: | sudo pip install --upgrade pip sudo pip install setuptools shyaml displayName: Install dependencies - # configure qemu binfmt-misc running. This allows us to run docker containers + # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | - docker run --rm --privileged multiarch/qemu-user-static:register + docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes ls /proc/sys/fs/binfmt_misc/ condition: not(startsWith(variables['CONFIG'], 'linux_64')) displayName: Configure binfmt_misc - script: .azure-pipelines/run_docker_build.sh - displayName: Run docker build \ No newline at end of file + 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 756bdbb..694475d 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -3,22 +3,22 @@ # -*- mode: yaml -*- jobs: -- job: osx_64 +- job: osx pool: vmImage: macOS-10.13 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 8 matrix: osx_python2.7: CONFIG: osx_python2.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True osx_python3.6: CONFIG: osx_python3.6 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True osx_python3.7: CONFIG: osx_python3.7 - UPLOAD_PACKAGES: False + UPLOAD_PACKAGES: True steps: # TODO: Fast finish on azure pipelines? @@ -34,25 +34,18 @@ jobs: rm ~/uninstall_homebrew displayName: Remove homebrew - - script: | - echo "Installing Miniconda" - set -x -e - curl -o $(Build.StagingDirectory)/miniconda.sh https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh - chmod +x $(Build.StagingDirectory)/miniconda.sh - $(Build.StagingDirectory)/miniconda.sh -b -p $(Build.StagingDirectory)/miniconda - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - echo "Setting up Conda environment" - displayName: 'Install miniconda' + - bash: | + echo "##vso[task.prependpath]$CONDA/bin" + sudo chown -R $USER $CONDA + displayName: Add conda to PATH - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e - conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build + source activate base + conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build shyaml displayName: 'Add conda-forge-ci-setup=2' - script: | - set -x -e - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH + source activate base echo "Configuring conda." setup_conda_rc ./ ./recipe ./.ci_support/${CONFIG}.yaml @@ -65,26 +58,24 @@ jobs: displayName: Configure conda and conda-build - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base mangle_compiler ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Mangle compiler - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base make_build_number ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Generate build number clobber file - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml displayName: Build recipe - script: | - export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH - set -x -e + source activate base upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml displayName: Upload recipe + 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 1ca4471..6a040ec 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -3,10 +3,10 @@ # -*- mode: yaml -*- jobs: -- job: win_64 +- job: win pool: vmImage: vs2017-win2016 - timeoutInMinutes: 240 + timeoutInMinutes: 360 strategy: maxParallel: 4 matrix: @@ -73,7 +73,7 @@ jobs: # Configure the VM - script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml - + # Configure the VM. - script: | run_conda_forge_build_setup @@ -81,20 +81,29 @@ jobs: displayName: conda-forge build setup + - script: | + rmdir C:\strawberry /s /q + continueOnError: true + displayName: remove strawberryperl + # Special cased version setting some more things! - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + 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", - } + env: + VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin" + PYTHONUNBUFFERED: 1 condition: contains(variables['CONFIG'], 'vs2008') - script: | - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet + conda.exe build recipe -m .ci_support\%CONFIG%.yaml displayName: Build recipe + env: + PYTHONUNBUFFERED: 1 condition: not(contains(variables['CONFIG'], 'vs2008')) - script: | upload_package .\ .\recipe .ci_support\%CONFIG%.yaml + env: + BINSTAR_TOKEN: $(BINSTAR_TOKEN) condition: not(eq(variables['UPLOAD_PACKAGES'], 'False')) diff --git a/.ci_support/linux_python2.7.yaml b/.ci_support/linux_python2.7.yaml index dfe82b9..6c5c02c 100644 --- a/.ci_support/linux_python2.7.yaml +++ b/.ci_support/linux_python2.7.yaml @@ -1,5 +1,7 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index 78fb294..4003415 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -1,5 +1,7 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml index b3aafeb..2f6af0b 100644 --- a/.ci_support/linux_python3.7.yaml +++ b/.ci_support/linux_python3.7.yaml @@ -1,5 +1,7 @@ c_compiler: - gcc +c_compiler_version: +- '7' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/osx_python2.7.yaml b/.ci_support/osx_python2.7.yaml index b533f6e..1ac7452 100644 --- a/.ci_support/osx_python2.7.yaml +++ b/.ci_support/osx_python2.7.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index ac3866b..c23ee5d 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml index 3598ab9..d1d610f 100644 --- a/.ci_support/osx_python3.7.yaml +++ b/.ci_support/osx_python3.7.yaml @@ -2,6 +2,8 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' c_compiler: - clang +c_compiler_version: +- '4' channel_sources: - conda-forge,defaults channel_targets: diff --git a/.circleci/build_steps.sh b/.circleci/build_steps.sh deleted file mode 100755 index 1301eb6..0000000 --- a/.circleci/build_steps.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail -export PYTHONUNBUFFERED=1 -export FEEDSTOCK_ROOT=/home/conda/feedstock_root -export RECIPE_ROOT=/home/conda/recipe_root -export CI_SUPPORT=/home/conda/feedstock_root/.ci_support -export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" - -cat >~/.condarc < /dev/null -fi diff --git a/.circleci/config.yml b/.circleci/config.yml index 59da584..6ad461b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,62 +5,20 @@ version: 2 jobs: - build_linux_python2.7: + build: working_directory: ~/test machine: true - environment: - - CONFIG: "linux_python2.7" 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: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.6: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.6" - 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: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_build.sh - build_linux_python3.7: - working_directory: ~/test - machine: true - environment: - - CONFIG: "linux_python3.7" - 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: - command: docker pull condaforge/linux-anvil-comp7 - - run: - # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions. - command: ./.circleci/run_docker_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_linux_python2.7 - - build_linux_python3.6 - - build_linux_python3.7 + - 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 4c0b560..0000000 --- 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_docker_build.sh b/.circleci/run_docker_build.sh deleted file mode 100755 index 8bb0bda..0000000 --- a/.circleci/run_docker_build.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash - -# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here -# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent -# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also -# benefit from the improvement. - -set -xeuo pipefail - -THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )" -PROVIDER_DIR="$(basename $THISDIR)" - -FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) -RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe" - -docker info - -# In order for the conda-build process in the container to write to the mounted -# volumes, we need to run with the same id as the host machine, which is -# normally the owner of the mounted volumes, or at least has write permission -export HOST_USER_ID=$(id -u) -# Check if docker-machine is being used (normally on OSX) and get the uid from -# the VM -if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then - export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u) -fi - -ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts" - -if [ -z "$CONFIG" ]; then - echo "Need to set CONFIG env variable" - exit 1 -fi - -pip install shyaml -DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 ) - -mkdir -p "$ARTIFACTS" -DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}" -rm -f "$DONE_CANARY" -# Enable running in interactive mode attached to a tty -DOCKER_RUN_ARGS=" -it " - -export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" -docker run ${DOCKER_RUN_ARGS} \ - -v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \ - -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \ - -e CONFIG \ - -e BINSTAR_TOKEN \ - -e HOST_USER_ID \ - -e UPLOAD_PACKAGES \ - $DOCKER_IMAGE \ - bash \ - /home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh - -# verify that the end of the script was reached -test -f "$DONE_CANARY" \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 047fdaf..ba618a2 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -6,7 +6,7 @@ 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/conda_smithy.html#how-to-re-render ) with the latest `conda-smithy` (Use the phrase @conda-forge-admin, please rerender in a comment in this PR for automated rerendering) +* [ ] [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. - About pycryptodomex =================== @@ -20,9 +16,97 @@ primitives. Current build status ==================== -[![Linux](https://img.shields.io/circleci/project/github/conda-forge/pycryptodomex-feedstock/master.svg?label=Linux)](https://circleci.com/gh/conda-forge/pycryptodomex-feedstock) -[![OSX](https://img.shields.io/travis/conda-forge/pycryptodomex-feedstock/master.svg?label=macOS)](https://travis-ci.org/conda-forge/pycryptodomex-feedstock) -[![Windows](https://img.shields.io/appveyor/ci/conda-forge/pycryptodomex-feedstock/master.svg?label=Windows)](https://ci.appveyor.com/project/conda-forge/pycryptodomex-feedstock/branch/master) + + + + + + + + + + +
Appveyor + + windows + +
Azure +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariantStatus
linux_python2.7 + + variant + +
linux_python3.6 + + variant + +
linux_python3.7 + + variant + +
osx_python2.7 + + variant + +
osx_python3.6 + + variant + +
osx_python3.7 + + variant + +
win_c_compilervs2008python2.7 + + variant + +
win_c_compilervs2015python3.6 + + variant + +
win_c_compilervs2015python3.7 + + variant + +
+
+
Current release info ====================