Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Start a run for windows python 3.6 and 3.7 #39

Merged
merged 40 commits into from
Jan 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ac4ebb0
Start a run for windows python 3.6 and 3.7
hmaarrfk Jan 3, 2019
a670d1c
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28
hmaarrfk Jan 3, 2019
7d34d97
Make azure build windows. Enable all builds
hmaarrfk Jan 3, 2019
076afcd
bump the build number
hmaarrfk Jan 3, 2019
c160a08
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28
hmaarrfk Jan 3, 2019
e6ec1a8
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28
conda-forge-admin Jan 3, 2019
d8c99c0
Update azure-pipelines-win.yml
hmaarrfk Jan 3, 2019
c054059
remove azure
hmaarrfk Jan 4, 2019
d02813e
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28
conda-forge-admin Jan 4, 2019
38ec4d2
Update azure-pipelines-win.yml
hmaarrfk Jan 4, 2019
f7c75f5
force modern conda-build
hmaarrfk Jan 4, 2019
a2e51af
conda-build no version specifier
hmaarrfk Jan 4, 2019
b732e7e
conda-build version specifier
hmaarrfk Jan 4, 2019
2c37a75
use the setup script directly.
hmaarrfk Jan 4, 2019
b750677
Update meta.yaml
hmaarrfk Jan 4, 2019
efc5b7c
Just remove the pyproject.toml???
hmaarrfk Jan 4, 2019
75d072b
specify --prefix-length
hmaarrfk Jan 4, 2019
37820fc
remove the prefix length option to see if it fails again
hmaarrfk Jan 4, 2019
715f90f
Try a prefix length of 100?
hmaarrfk Jan 4, 2019
9c6626d
Update .appveyor.yml
hmaarrfk Jan 4, 2019
1147790
prefix length of 60 ( previously 75 failed, 50 passed???)
hmaarrfk Jan 4, 2019
03ce8e8
Trigger a new build with prefix 60
hmaarrfk Jan 4, 2019
adb5823
Update meta.yaml
hmaarrfk Jan 4, 2019
8a75e50
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2018.12.28
conda-forge-admin Jan 4, 2019
c815fd1
with a prefix length of 50
hmaarrfk Jan 4, 2019
19e081e
echo commands on windows
hmaarrfk Jan 4, 2019
2ad777c
Update meta.yaml
hmaarrfk Jan 4, 2019
80d0609
Get sources from github so we can restart the compilation.
hmaarrfk Jan 4, 2019
64e7412
force a new build for windows.
hmaarrfk Jan 4, 2019
8fd4a34
Force yet an other build for windows with prefeix length 50
hmaarrfk Jan 5, 2019
ebb48fe
build #4 for prefix=50 build
hmaarrfk Jan 6, 2019
2234ea3
Update .appveyor.yml
hmaarrfk Jan 8, 2019
48e1f89
dhirschfeld with the assist!!!!
hmaarrfk Jan 8, 2019
3618bee
don't be quiet.
hmaarrfk Jan 8, 2019
8412723
--prefix-length 37
hmaarrfk Jan 8, 2019
bd1e2b2
do the bad thing. install with setup.py
hmaarrfk Jan 8, 2019
1e3ddd5
build with setup, install with pip
hmaarrfk Jan 8, 2019
5f84f94
clean up the meta file.
hmaarrfk Jan 8, 2019
39a45d7
MNT: Re-rendered with conda-smithy 3.2.2 and pinning 2019.01.05
hmaarrfk Jan 8, 2019
677b6bf
add numpy 1.11 to the testing requirements
hmaarrfk Jan 8, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ jobs:

# Configure the VM
- script: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml

# Configure the VM.
- script: |
run_conda_forge_build_setup
displayName: conda-forge build setup
run_conda_forge_build_setup


# Special cased version setting some more things!
- script: |
Expand Down
8 changes: 8 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,11 @@ max_py_ver: '37'
max_r_ver: '35'
travis:
secure: {BINSTAR_TOKEN: KNzzMrzSSGiXvy81LmLDNc1z8E4iq1gdgCLbCLu66zm9E9N1pZmNR/gXpDQcehpUkgn3bI/pOFllxPcvwZp27Aut6WceDOcrFjtRDFz9CpCyl67tuRk3baGzQO3CpD4sMuauKSnRPkIRVtJTYMdnwkYFhAXI4Qk/IbE5WuuEKBWT0AV4v9dEz5uUBSyQdE3PrV9R18Y00WV7rPE579QAh1dfTGkrmdXi8R2zNlUuUfVyKGSxh7c3+7P3+apK1Kwoz4CiPIGv+MgO2ZqreYCc5OvqnPkPeeAumfATwJ2lKNXBOuLuOFOzdRpvMCSXYiMB194uTDS4LFLKLfVnXNirJfEUZ+EWQKvI/8An4lUEAdpwqzOjnk1WXprtWDFNPwS7tSjTi+u+iTF46QoqFHz2PrJFjSCSHfs3Bj4WqfEygRLjaGXTevuhT+By5evHheoXcDK7btnSCfVijdyx10qCd64gGXMSKfeH+BDObTUOnUM46ZiwDEjUIJnvPaQWrrJGAQrJvK95z+Rpcxh/0sRz4lhOp2gha+1QmGiMdSEQiPmB8PxAAtrf5hiDsdB/9Yj4RYzia8BmxLUMEXATVGZUITTufhmqOlKPrReUnOk87swFkjDbuKc54ydaYLT4PEOAAftmpGoDtQApMKvJ4HV1FmPlcpEBFHx4NS3tVk2q8Ik=}

# provider:
# win: azure

# azure:
# upload_packages: True
# # I only want azure to build and upload windows
# force: False
23 changes: 18 additions & 5 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ package:
version: {{ version }}

source:
# pypi sources include the cythonized files.
url: https://pypi.io/packages/source/s/scikit-image/scikit-image-{{ version }}.tar.gz
sha256: 86a9b3b4f74f231e0a6bcfd3235dcf3f0118df25dac21201da5e064d681e2c50
# Github sources don't include the cythonized files
# url: https://github.com/scikit-image/scikit-image/archive/v{{ version }}.tar.gz
# fn: scikit-image-{{ version }}.tar.gz
# sha256: 8da6fb09aeefb757735c510650ac0072be3831fa76d9747285f3c6ea1e0c5a08
patches:
# https://github.com/scikit-image/scikit-image/pull/3558
- 3558_dont_directly_call_test_fixtures.patch
Expand All @@ -17,15 +22,22 @@ source:
# https://github.com/scikit-image/scikit-image/pull/3572
- 3637_filter_out_deprecation_pending_warning.patch


build:
number: 1003
number: 1004
script:
- rm -rf skimage/viewer/tests # we don't depend on Qt
########################################################
# Remove these two lines at your own risk.
#
# pyproject.toml was getting detected by pip, and scikit-image was being built with modern numpy, not 1.11
- rm pyproject.toml
# I have no idea what this line actually fixes (other than speeding up the build a little bit)
# I think windows was freaking out about path lengths, and maybe this fixed it???
# https://github.com/conda-forge/scikit-image-feedstock/pull/39
- "{{ PYTHON }} setup.py build_ext -j2"
########################################################
- "{{ PYTHON }} -m pip install . --disable-pip-version-check --no-deps --ignore-installed --no-cache-dir --no-build-isolation -vvv"
# @conda-forge/python, try building this package yourself on windows using the line below
# you should notice that pip contacts pypi and fetches the dependencies from pypi.org
# but only on windows
# - "{{ PYTHON }} -m pip install . --disable-pip-version-check --no-deps --ignore-installed --no-cache-dir -vvv"
entry_points:
- skivi = skimage.scripts.skivi:main

Expand Down Expand Up @@ -62,6 +74,7 @@ test:
requires:
- pytest
- pytest-cov
- numpy 1.11
imports:
- skimage
commands:
Expand Down