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

build 0.19b2 #53

Closed
wants to merge 55 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
95e8716
recipe: Restrict to NumPy 1.10.x only.
jakirkham Sep 27, 2016
1e7dbd9
Re-render with `conda-smithy` version `1.2.0`.
jakirkham Sep 27, 2016
677c623
recipe: Restrict to NumPy 1.11.x only.
jakirkham Sep 27, 2016
4ea44bd
Re-render with `conda-smithy` version `1.2.0`.
jakirkham Sep 27, 2016
d9ac189
Merge pull request #12 from jakirkham/config_master_np1.10
jakirkham Sep 28, 2016
ccd3400
Merge pull request #13 from jakirkham/config_master_np1.11
jakirkham Sep 28, 2016
35397b6
Release0.18 np1.10 (#17)
amueller Sep 28, 2016
f53d9ef
Release 0.18 (#11)
amueller Sep 28, 2016
c6b5f24
MNT: Updated the feedstock for conda-smithy version 1.3.2.
conda-forge-admin Oct 12, 2016
220f980
MNT: Updated the feedstock for conda-smithy version 1.3.2.
conda-forge-admin Oct 12, 2016
66af77e
Merge pull request #18 from conda-forge-admin/feedstock_rerender_master
jakirkham Oct 12, 2016
bebd406
Merge pull request #19 from conda-forge-admin/feedstock_rerender_mast…
jakirkham Oct 12, 2016
6c7ae29
MNT: Re-rendered with conda-smithy 1.4.6
jakirkham Nov 3, 2016
4fce354
MNT: Re-rendered with conda-smithy 1.4.6
jakirkham Nov 3, 2016
fcf32aa
Merge pull request #22 from jakirkham/re-render_master_np1.10_1.4.6
jakirkham Nov 3, 2016
d32bfd2
Merge pull request #21 from jakirkham/re-render_master_1.4.6
jakirkham Nov 3, 2016
465208a
MNT: Updated some of the pinned versions
Dec 7, 2016
dbd572e
MNT: Updated some of the pinned versions
Dec 7, 2016
5c64c22
Merge pull request #25 from conda-forge-admin/feedstock_version_pin_m…
jakirkham Dec 7, 2016
8a80b23
Merge pull request #26 from conda-forge-admin/feedstock_version_pin_m…
jakirkham Dec 7, 2016
6a21804
MNT: Re-rendered with conda-smithy 1.7.0
jakirkham Jan 8, 2017
296d01f
MNT: Re-rendered with conda-smithy 1.7.0
jakirkham Jan 8, 2017
2fe9fdd
Merge pull request #29 from jakirkham/re-render__master_np1.10__1.7.0
jakirkham Jan 8, 2017
90067bb
Merge pull request #30 from jakirkham/re-render__master__1.7.0
jakirkham Jan 8, 2017
d2a0fc3
MNT: Re-rendered with conda-smithy 2.0.0
astaric Jan 20, 2017
c827326
Merge pull request #33 from astaric/numpy-1.12
jakirkham Jan 24, 2017
a42593d
Update maintainers
astaric Jan 27, 2017
93560e6
MNT: Re-rendered with conda-smithy 2.0.1
astaric Feb 5, 2017
ac7eb2f
Merge pull request #37 from astaric/np112-py36
jakirkham Feb 6, 2017
c6d0b95
Merge pull request #36 from astaric/update-maintainers
jakirkham Feb 6, 2017
f138c0c
Skip failing tests to allow 0.18.1 release on conda-forge (#40)
lesteve Mar 28, 2017
b0a3d5b
MNT: Updated the feedstock for conda-smithy version 2.2.2.
conda-forge-admin Apr 1, 2017
d7386ad
Merge pull request #42 from conda-forge-admin/feedstock_rerender_master
jakirkham Apr 9, 2017
6aa2bb1
Merge remote-tracking branch 'conda-forge/master' into
jakirkham Apr 9, 2017
01d8782
Merge pull request #46 from jakirkham/merge_np1.10
jakirkham Apr 9, 2017
49b149a
MNT: Re-rendered with conda-smithy 2.3.1
jakirkham Jun 9, 2017
7881549
Merge pull request #48 from jakirkham/re-render__master_np1.12__2.3.1
jakirkham Jun 9, 2017
07f79b7
Switch master from NumPy 1.12 to 1.13
jakirkham Jun 9, 2017
5bff7d4
MNT: Re-rendered with conda-smithy 2.3.1
jakirkham Jun 9, 2017
5e54da2
Apply some patches for NumPy 1.13 support
jakirkham Jun 12, 2017
ac7b256
Drop NumPy 1.13 patches
jakirkham Jun 21, 2017
677a706
Release 0.18.2
jakirkham Jun 21, 2017
dcae678
Update skip test patch for 0.18.2
jakirkham Jun 21, 2017
8f319ed
Merge pull request #50 from jakirkham/release_0.18.2
jakirkham Jun 23, 2017
762ed2c
build 0.19b2 in rc channel
amueller Jul 19, 2017
812affa
MNT: Re-rendered with conda-smithy 2.3.2
amueller Jul 19, 2017
5cfd765
Merge branch 'rc' into 0.19b2
amueller Jul 19, 2017
0d1cac1
remove unused patch
amueller Jul 19, 2017
308dc4b
MNT: Re-rendered with conda-smithy 2.3.2
amueller Jul 19, 2017
9ce6698
MNT: Re-rendered with conda-smithy 2.3.2.post.dev52
jakirkham Jul 20, 2017
ac7c7a2
Drop NumPy 1.13 constraint
jakirkham Jul 20, 2017
7923207
MNT: Re-rendered with conda-smithy 2.3.2.post.dev52
jakirkham Jul 20, 2017
5c44c49
pinning cython 0.25.2
amueller Jul 24, 2017
7eea17c
rerender after pulling?
amueller Jul 24, 2017
a049243
MNT: Re-rendered with conda-smithy 2.3.2.post.dev53
jakirkham Jul 24, 2017
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
224 changes: 224 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
version: 2

jobs:
build__CONDA_NPY_111__CONDA_PY_27:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "111"
- CONDA_PY: "27"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_112__CONDA_PY_27:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "112"
- CONDA_PY: "27"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_113__CONDA_PY_27:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "113"
- CONDA_PY: "27"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_111__CONDA_PY_35:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "111"
- CONDA_PY: "35"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_112__CONDA_PY_35:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "112"
- CONDA_PY: "35"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_113__CONDA_PY_35:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "113"
- CONDA_PY: "35"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_111__CONDA_PY_36:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "111"
- CONDA_PY: "36"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_112__CONDA_PY_36:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "112"
- CONDA_PY: "36"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_NPY_113__CONDA_PY_36:
working_directory: ~/test
machine: true
environment:
- CONDA_NPY: "113"
- CONDA_PY: "36"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_NPY=${CONDA_NPY}"
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh

workflows:
version: 2
build_and_test:
jobs:
- build__CONDA_NPY_111__CONDA_PY_27
- build__CONDA_NPY_112__CONDA_PY_27
- build__CONDA_NPY_113__CONDA_PY_27
- build__CONDA_NPY_111__CONDA_PY_35
- build__CONDA_NPY_112__CONDA_PY_35
- build__CONDA_NPY_113__CONDA_PY_35
- build__CONDA_NPY_111__CONDA_PY_36
- build__CONDA_NPY_112__CONDA_PY_36
- build__CONDA_NPY_113__CONDA_PY_36
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
* text=auto

*.patch binary
*.diff binary
meta.yaml text eol=lf
build.sh text eol=lf
bld.bat text eol=crlf
38 changes: 30 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,58 @@
language: generic

os: osx
osx_image: beta-xcode6.1
osx_image: xcode6.4

env:
matrix:

- CONDA_NPY=110 CONDA_PY=27
- CONDA_NPY=111 CONDA_PY=27
- CONDA_NPY=110 CONDA_PY=34
- CONDA_NPY=111 CONDA_PY=34
- CONDA_NPY=110 CONDA_PY=35
- CONDA_NPY=112 CONDA_PY=27
- CONDA_NPY=113 CONDA_PY=27
- CONDA_NPY=111 CONDA_PY=35
- CONDA_NPY=112 CONDA_PY=35
- CONDA_NPY=113 CONDA_PY=35
- CONDA_NPY=111 CONDA_PY=36
- CONDA_NPY=112 CONDA_PY=36
- CONDA_NPY=113 CONDA_PY=36
global:
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
- secure: "cXmMh0qV5bhXevVtdcMf8VOVIG0zOA0cQRihCsOaDG0yPSP1tW0N40llDkDhjk80wIKMMzuwofaarESzW5i5+GTbvDMmzpeHZAEoXYUIsNTxNJMX7KcvxNdeVIGNM8tcM3a4Zp/u0cvOjDs6xSHeZPdNit3x8rDaARASwU+YZnIIY8Iieizo3LmWxRghjOdFYnr0frOshy38PI+l1ywYqsN/L8+4GqxWtkTuzK3fnI3MlwfDC8tVImjXuukHK3J78SsDdnbTBJlV0tcNV8iGa08Md55bgv9HEgFbHRSunc22lLjFRHMT10Hvl0H0HdylYkQTKC7iOwIw9D3kIp4uR+g0rDKzBuuYF+jV65+UhR5TKMiH4QIiMxBMLpB8QU1Ey58L2X2t1j06d+VZYp2UiubGNvxjXun9tWFnIotFoho1bfW0gUURNvk+fEs0O/0LpReTweNVJLc1JakT7eitFm5gaV8CNzAsNcBCpPsHWiCMQm+FD3D57q+DIJ4ONl0OOBYSDNkziJEvgB0XyV7UpGobm0xu/JTPg+Qq2op3GDxgCfILqhApTEVkMKQJv+o5yHO/JIonxCbE41xIotw8JjhQ2VROFLPGh3F3buiJ26VUbI41yoN20D4y0Bvj7HPdiBHVWNcUmkj1xYZckivnxjCE5eth/TBJiK9gqjgRw6w="


before_install:
# Fast finish the PR.
- |
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1

# Remove homebrew.
- brew remove --force $(brew list)
- brew cleanup -s
- rm -rf $(brew --cache)
- |
echo ""
echo "Removing homebrew from Travis CI to avoid conflicts."
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
chmod +x ~/uninstall_homebrew
~/uninstall_homebrew -fq
rm ~/uninstall_homebrew


install:
# Install Miniconda.
- |
echo ""
echo "Installing a fresh version of Miniconda."
MINICONDA_URL="https://repo.continuum.io/miniconda"
MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
bash $MINICONDA_FILE -b

# Configure conda.
- |
echo ""
echo "Configuring conda."
source /Users/travis/miniconda3/bin/activate root
conda config --remove channels defaults
conda config --add channels defaults
conda config --add channels conda-forge
conda config --set show_channel_urls true
conda install --yes --quiet conda-forge-build-setup
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BSD 3-clause license
Copyright (c) conda-forge
Copyright (c) 2015-2017, conda-forge
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
25 changes: 12 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@ Summary: A set of python modules for machine learning and data mining



Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/scikit-learn-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/scikit-learn-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/scikit-learn-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/scikit-learn-feedstock)
Windows: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)

Current release info
====================
Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/scikit-learn/badges/version.svg)](https://anaconda.org/conda-forge/scikit-learn)
Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/scikit-learn/badges/downloads.svg)](https://anaconda.org/conda-forge/scikit-learn)

Installing scikit-learn
=======================

Expand All @@ -33,7 +45,6 @@ conda search scikit-learn --channel conda-forge
```



About conda-forge
=================

Expand Down Expand Up @@ -68,18 +79,6 @@ Terminology
**conda-forge** - the place where the feedstock and smithy live and work to
produce the finished article (built conda distributions)

Current build status
====================

Linux: [![Circle CI](https://circleci.com/gh/conda-forge/scikit-learn-feedstock.svg?style=shield)](https://circleci.com/gh/conda-forge/scikit-learn-feedstock)
OSX: [![TravisCI](https://travis-ci.org/conda-forge/scikit-learn-feedstock.svg?branch=master)](https://travis-ci.org/conda-forge/scikit-learn-feedstock)
Windows: ![](https://cdn.rawgit.com/conda-forge/conda-smithy/90845bba35bec53edac7a16638aa4d77217a3713/conda_smithy/static/disabled.svg)

Current release info
====================
Version: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/scikit-learn/badges/version.svg)](https://anaconda.org/conda-forge/scikit-learn)
Downloads: [![Anaconda-Server Badge](https://anaconda.org/conda-forge/scikit-learn/badges/downloads.svg)](https://anaconda.org/conda-forge/scikit-learn)


Updating scikit-learn-feedstock
===============================
Expand Down
4 changes: 4 additions & 0 deletions ci_support/fast_finish_ci_pr_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}"
Loading