From 887450f4a2ba69685a447cadb14c4680bbbf9eec Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 27 Sep 2018 21:12:43 -0400 Subject: [PATCH 1/7] bump to 7.0.1, add tests --- .appveyor.yml | 3 --- .ci_support/linux_python3.5.yaml | 2 ++ .ci_support/linux_python3.6.yaml | 2 ++ .ci_support/linux_python3.7.yaml | 14 ---------- .ci_support/osx_python3.5.yaml | 2 ++ .ci_support/osx_python3.6.yaml | 2 ++ .ci_support/osx_python3.7.yaml | 20 -------------- .ci_support/win_python3.5.yaml | 2 ++ .ci_support/win_python3.6.yaml | 2 ++ .ci_support/win_python3.7.yaml | 10 ------- .circleci/config.yml | 18 ------------- .travis.yml | 1 - README.md | 2 +- recipe/meta.yaml | 46 +++++++++++++++++++++----------- 14 files changed, 43 insertions(+), 83 deletions(-) delete mode 100644 .ci_support/linux_python3.7.yaml delete mode 100644 .ci_support/osx_python3.7.yaml delete mode 100644 .ci_support/win_python3.7.yaml diff --git a/.appveyor.yml b/.appveyor.yml index 36cd412..0831f02 100644 --- 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 index 2c030c0..22b7d24 100644 --- 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 index 444bf0b..dd1cdf1 100644 --- 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 deleted file mode 100644 index 17d29ff..0000000 --- a/.ci_support/linux_python3.7.yaml +++ /dev/null @@ -1,14 +0,0 @@ -build_number_decrement: -- '0' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/.ci_support/osx_python3.5.yaml b/.ci_support/osx_python3.5.yaml index dd2dc34..5ed70ea 100644 --- 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 index 03de62b..6947339 100644 --- 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 deleted file mode 100644 index 6f78589..0000000 --- a/.ci_support/osx_python3.7.yaml +++ /dev/null @@ -1,20 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -build_number_decrement: -- '0' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- condaforge/linux-anvil -macos_machine: -- x86_64-apple-darwin13.4.0 -macos_min_version: -- '10.9' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/.ci_support/win_python3.5.yaml b/.ci_support/win_python3.5.yaml index d4d19cf..1e3d00d 100644 --- 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 index 3032431..84ab0c3 100644 --- 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 deleted file mode 100644 index 6eac991..0000000 --- a/.ci_support/win_python3.7.yaml +++ /dev/null @@ -1,10 +0,0 @@ -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- '3.7' diff --git a/.circleci/config.yml b/.circleci/config.yml index a83ae4a..01775ad 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,23 +35,6 @@ 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 @@ -59,4 +42,3 @@ workflows: jobs: - build_linux_python3.5 - build_linux_python3.6 - - build_linux_python3.7 diff --git a/.travis.yml b/.travis.yml index 4685090..8664eae 100644 --- 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 index c9b4cad..82be7be 100644 --- 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 index 3b2d6a8..6b9308b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "6.5.0" %} +{% set version = "7.0.1" %} package: name: ipython @@ -6,7 +6,7 @@ package: source: url: https://pypi.io/packages/source/i/ipython/ipython-{{ version }}.tar.gz - sha256: b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4 + sha256: 9fed506c3772c875a3048bc134a25e6f5e997b1569b2636f6a5d891f34cbfd46 build: number: 0 @@ -15,32 +15,40 @@ 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 + - 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 + - ipykernel + - nbformat + - nose>=0.10.1 + - numpy + - pygments + - requests + - testpath + - trio imports: - - IPython - IPython - IPython.core - IPython.core.magics @@ -60,10 +68,14 @@ test: - IPython.testing.tests - IPython.utils - IPython.utils.tests + commands: + - ipython -h + - ipython3 -h + - iptest about: home: https://ipython.org/ - license: BSD 3-clause + license: BSD-3-Clause license_family: BSD license_file: COPYING.rst summary: "IPython: Productive Interactive Computing" @@ -78,6 +90,8 @@ extra: recipe-maintainers: - Carreau - jakirkham + - fperez + - ellisonbg - minrk - ocefpaf - pelson From f78e50d85332e5e9f587e0530b09a4c90ec8fdb7 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 27 Sep 2018 21:22:56 -0400 Subject: [PATCH 2/7] also test matplotlib --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6b9308b..8a74ee7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,6 +48,7 @@ test: - requests - testpath - trio + - matplotlib imports: - IPython - IPython.core From 6ea223b587834b871ea910dda69224c9af6f00ee Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 27 Sep 2018 21:59:57 -0400 Subject: [PATCH 3/7] more work on tests --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8a74ee7..91a5077 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -72,7 +72,8 @@ test: commands: - ipython -h - ipython3 -h - - iptest + - NOSE_EXCLUDE=test_history iptest -j{{ CPU_COUNT }} # [unix] + - iptest -j{{ CPU_COUNT }} about: home: https://ipython.org/ From 19f3f6d034f6fbb22ed2bbdcdcc474e38e2c1c0a Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Thu, 27 Sep 2018 22:53:14 -0400 Subject: [PATCH 4/7] right, but don't then run all the tests (win selector) --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 91a5077..1ca12f2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -73,7 +73,7 @@ test: - ipython -h - ipython3 -h - NOSE_EXCLUDE=test_history iptest -j{{ CPU_COUNT }} # [unix] - - iptest -j{{ CPU_COUNT }} + - iptest -j{{ CPU_COUNT }} # [win] about: home: https://ipython.org/ From ae181f218817232032f42595d130160fb699b0d4 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Fri, 28 Sep 2018 08:36:51 -0400 Subject: [PATCH 5/7] curio is not on windows. sorting. --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1ca12f2..c4e5d1f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,8 +20,8 @@ build: requirements: host: - - python - pip + - python run: - appnope # [osx] - backcall @@ -39,7 +39,7 @@ requirements: test: requires: - - curio + - curio # [unix] - ipykernel - nbformat - nose>=0.10.1 From 2d27f285a0e74b14b5211692d1ffc611793c79f4 Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Fri, 28 Sep 2018 08:45:40 -0400 Subject: [PATCH 6/7] use LICENSE --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c4e5d1f..b0681ac 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -79,7 +79,7 @@ about: home: https://ipython.org/ 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 From d73d34b81c3a51cbbe3dbbcd30e295aca44e4d2d Mon Sep 17 00:00:00 2001 From: Nicholas Bollweg Date: Fri, 28 Sep 2018 10:20:32 -0400 Subject: [PATCH 7/7] add maintainers @bollwyvl @blink1073 --- recipe/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b0681ac..65f317e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -98,3 +98,5 @@ extra: - ocefpaf - pelson - takluyver + - bollwyvl + - blink1073