From 605a491e22967ed4b93da8a5f86c230f619e2838 Mon Sep 17 00:00:00 2001 From: Tim Williams Date: Sun, 12 Aug 2018 14:42:18 -0400 Subject: [PATCH 1/4] modified meta.yaml for Windows build using msys2 --- recipe/meta.yaml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d24804c..6ff33e8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -21,24 +21,28 @@ source: - no_fileutils_test.patch build: - number: 2 - skip: True # [win or not py36] + number: 3 + skip: True # [not py36] detect_binary_files_with_prefix: True requirements: build: - - pkg-config + - pkg-config # [not win] - {{ compiler('c') }} host: - python - - libffi - - gettext + - libffi # [not win] + - m2-libffi # [win] + - gettext # [not win] + - m2-gettext # [win] - zlib - pcre - libiconv run: - - libffi - - gettext + - libffi # [not win] + - m2-libffi # [win] + - gettext # [not win] + - m2-gettext # [win] - zlib - pcre - libiconv From 3551994348c0b5a8d6d2a12a063f3eab652c6639 Mon Sep 17 00:00:00 2001 From: conda-forge-admin Date: Sun, 12 Aug 2018 18:47:48 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-smithy 3.1.11 and pinning 2018.08.05 --- .appveyor.yml | 53 +++++++++++++++++++ .ci_support/linux_python3.6.yaml | 2 +- .ci_support/osx_python3.6.yaml | 2 +- .../win_c_compilervs2015python3.6.yaml | 19 +++++++ .github/PULL_REQUEST_TEMPLATE.md | 2 +- README.md | 14 ++--- 6 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 .appveyor.yml create mode 100644 .ci_support/win_c_compilervs2015python3.6.yaml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..83b26b4 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,53 @@ +# 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". + +environment: + + BINSTAR_TOKEN: + # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml. + secure: tumuXLL8PU75WMnRDemRy02ruEq2RpNxeK3dz0MjFssnosPm2v4EFjfNB4PTotA1 + + matrix: + - CONFIG: win_c_compilervs2015python3.6 + 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: + # 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/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%" + del ff_ci_pr_build.py + + # Cywing'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 + + # Add our channels. + - cmd: conda.exe config --set show_channel_urls true + - cmd: conda.exe config --remove channels defaults + - cmd: conda.exe config --add channels defaults + - cmd: conda.exe config --add channels conda-forge + + # Configure the VM. + - cmd: conda.exe install -n root --quiet --yes conda-forge-ci-setup=1 + - cmd: run_conda_forge_build_setup + +# Skip .NET project specific build phase. +build: off + +test_script: + - conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet +deploy_script: + - cmd: upload_or_check_non_existence .\recipe conda-forge --channel=main -m .ci_support\%CONFIG%.yaml diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml index f4ffba3..a89b02d 100644 --- a/.ci_support/linux_python3.6.yaml +++ b/.ci_support/linux_python3.6.yaml @@ -10,8 +10,8 @@ pin_run_as_build: libiconv: max_pin: x.x python: - max_pin: x.x min_pin: x.x + max_pin: x.x zlib: max_pin: x.x python: diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml index 243f533..8942e4c 100644 --- a/.ci_support/osx_python3.6.yaml +++ b/.ci_support/osx_python3.6.yaml @@ -16,8 +16,8 @@ pin_run_as_build: libiconv: max_pin: x.x python: - max_pin: x.x min_pin: x.x + max_pin: x.x zlib: max_pin: x.x python: diff --git a/.ci_support/win_c_compilervs2015python3.6.yaml b/.ci_support/win_c_compilervs2015python3.6.yaml new file mode 100644 index 0000000..dd41891 --- /dev/null +++ b/.ci_support/win_c_compilervs2015python3.6.yaml @@ -0,0 +1,19 @@ +c_compiler: +- vs2015 +libiconv: +- '1.15' +pin_run_as_build: + libiconv: + max_pin: x.x + python: + min_pin: x.x + max_pin: x.x + zlib: + max_pin: x.x +python: +- '3.6' +zip_keys: +- - python + - c_compiler +zlib: +- '1.2' diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index dcfbaec..047fdaf 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` (`@conda-forge-admin, please rerender`) +* [ ] [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) * [ ] Ensured the license file is being packaged.