Merge pull request #180 from conda-forge-admin/conda_forge_admin_179

ipykernel 6.29.3
conda-forge · Feb 27, 2024 · 40cb944 · 40cb944
2 parents f7c1795 + b701729
commit 40cb944
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "6.29.2" %}
+{% set version = "6.29.3" %}
 
 {% set migrating = false %}
 
@@ -12,7 +12,7 @@ package:
 
 source:
   url: https://pypi.io/packages/source/i/ipykernel/ipykernel-{{ version }}.tar.gz
-  sha256: 3bade28004e3ff624ed57974948116670604ac5f676d12339693f3142176d3f0
+  sha256: e14c250d1f9ea3989490225cc1a542781b095a18a19447fcf2b5eaf7d0ac5bd2
 
 build:
   number: 0
@@ -65,8 +65,8 @@ test:
     - flaky
     - numpy
     - pip
-    - pytest >=6.0
-    - pytest-asyncio
+    - pytest >=7.0
+    - pytest-asyncio >=0.23.5
     - pytest-cov
     - pytest-timeout
     - python !={{ host_python }}

diff --git a/recipe/run_test.py b/recipe/run_test.py
@@ -12,17 +12,20 @@
 py_major = sys.version_info[0]
 py_impl = platform.python_implementation().lower()
 machine = platform.machine().lower()
+system = platform.system().lower()
 
 is_aarch = "aarch64" in machine
 is_ppc = "ppc" in machine
 is_pypy = py_impl == "pypy"
+is_win = system == "windows"
 
 prefix = Path(os.environ["PREFIX"])
 
 
 def check_kernel() -> int:
     print(f"Python implementation: {py_impl}")
     print(f"              Machine: {machine}")
+    print(f"               System: {system}")
 
     specfile = prefix / f"share/jupyter/kernels/python{py_major}/kernel.json"
 
@@ -66,6 +69,11 @@ def build_pytest_args() -> typing.List[str]:
             "--no-cov-on-fail",
         ]
 
+    if is_win:
+        # test_pickleutil fails on windows, `pickleutil` deprecated anyway, 
+        test_skips.extend([
+            "pickleutil",
+        ])
 
     if len(test_skips) == 1:
         # single-term parens work unexpectedly