Merge pull request #58 from bollwyvl/bump/7.0.1-tests

Bump/7.0.1 tests
conda-forge · Sep 29, 2018 · 0368e41 · 0368e41 · conda-forge-linter · Sep 29, 2018
2 parents 322b80f + d73d34b
commit 0368e41
Show file tree

Hide file tree

Showing 14 changed files with 49 additions and 85 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -15,9 +15,6 @@ environment:
     - CONFIG: win_python3.6
       CONDA_INSTALL_LOCN: C:\Miniconda36-x64
 
-    - CONFIG: win_python3.7
-      CONDA_INSTALL_LOCN: C:\Miniconda36-x64
-
 
 # We always use a 64-bit machine, but can build x86 distributions
 # with the TARGET_ARCH variable.

diff --git a/.ci_support/linux_python3.5.yaml b/.ci_support/linux_python3.5.yaml
@@ -6,6 +6,8 @@ channel_targets:
 - conda-forge main
 docker_image:
 - condaforge/linux-anvil
+numpy:
+- '1.9'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_python3.6.yaml b/.ci_support/linux_python3.6.yaml
@@ -6,6 +6,8 @@ channel_targets:
 - conda-forge main
 docker_image:
 - condaforge/linux-anvil
+numpy:
+- '1.9'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/linux_python3.7.yaml b/.ci_support/linux_python3.7.yaml
diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml
@@ -12,6 +12,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
 - '10.9'
+numpy:
+- '1.9'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/osx_python3.6.yaml b/.ci_support/osx_python3.6.yaml
@@ -12,6 +12,8 @@ macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
 - '10.9'
+numpy:
+- '1.9'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/osx_python3.7.yaml b/.ci_support/osx_python3.7.yaml
diff --git a/.ci_support/win_python3.5.yaml b/.ci_support/win_python3.5.yaml
@@ -2,6 +2,8 @@ channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
+numpy:
+- '1.11'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_python3.6.yaml b/.ci_support/win_python3.6.yaml
@@ -2,6 +2,8 @@ channel_sources:
 - conda-forge,defaults
 channel_targets:
 - conda-forge main
+numpy:
+- '1.11'
 pin_run_as_build:
   python:
     min_pin: x.x

diff --git a/.ci_support/win_python3.7.yaml b/.ci_support/win_python3.7.yaml
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -35,28 +35,10 @@ jobs:
       - 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
-      - run:
-          # Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
-          command: ./.circleci/run_docker_build.sh
 
 workflows:
   version: 2
   build_and_test:
     jobs:
       - build_linux_python3.5
       - build_linux_python3.6
-      - build_linux_python3.7
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ env:
   matrix:
     - CONFIG=osx_python3.5
     - CONFIG=osx_python3.6
-    - CONFIG=osx_python3.7
 
   global:
     # The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ About ipython
 
 Home: https://ipython.org/
 
-Package license: BSD 3-clause
+Package license: BSD-3-Clause
 
 Feedstock license: BSD 3-Clause
 

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,12 +1,12 @@
-{% set version = "6.5.0" %}
+{% set version = "7.0.1" %}
 
 package:
   name: ipython
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/i/ipython/ipython-{{ version }}.tar.gz
-  sha256: b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4
+  sha256: 9fed506c3772c875a3048bc134a25e6f5e997b1569b2636f6a5d891f34cbfd46
 
 build:
   number: 0
@@ -15,32 +15,41 @@ build:
   entry_points:
     - ipython = IPython:start_ipython
     - ipython3 = IPython:start_ipython
+    - iptest = IPython.testing.iptestcontroller:main
+    - iptest3 = IPython.testing.iptestcontroller:main
 
 requirements:
   host:
-    - python
     - pip
-  run:
     - python
-    - pickleshare
-    - simplegeneric >0.8
-    - prompt_toolkit >=1.0.4,<2.0.0
-    - pygments
+  run:
+    - appnope  # [osx]
+    - backcall
+    - colorama  # [win]
     - decorator
-    - traitlets >=4.2
     - jedi >=0.10
     - pexpect  # [unix]
-    - appnope  # [osx]
-    - colorama  # [win]
+    - pickleshare
+    - prompt_toolkit >=2.0.0
+    - pygments
+    - python
+    - simplegeneric >0.8
+    - traitlets >=4.2
     - win_unicode_console >=0.5  # [win and py<36]
-    - backcall
 
 test:
-  commands:
-    - ipython -h
-    - ipython3 -h          # [py3k]
+  requires:
+    - curio  # [unix]
+    - ipykernel
+    - nbformat
+    - nose>=0.10.1
+    - numpy
+    - pygments
+    - requests
+    - testpath
+    - trio
+    - matplotlib
   imports:
-    - IPython
     - IPython
     - IPython.core
     - IPython.core.magics
@@ -60,12 +69,17 @@ test:
     - IPython.testing.tests
     - IPython.utils
     - IPython.utils.tests
+  commands:
+    - ipython -h
+    - ipython3 -h
+    - NOSE_EXCLUDE=test_history iptest -j{{ CPU_COUNT }}  # [unix]
+    - iptest -j{{ CPU_COUNT }}  # [win]
 
 about:
   home: https://ipython.org/
-  license: BSD 3-clause
+  license: BSD-3-Clause
   license_family: BSD
-  license_file: COPYING.rst
+  license_file: LICENSE
   summary: "IPython: Productive Interactive Computing"
   description: |
     IPython provides a rich architecture for interactive computing with
@@ -78,7 +92,11 @@ extra:
   recipe-maintainers:
     - Carreau
     - jakirkham
+    - fperez
+    - ellisonbg
     - minrk
     - ocefpaf
     - pelson
     - takluyver
+    - bollwyvl
+    - blink1073