From 42696adb9a8109fac8e3c68b115064d98f4c824f Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Tue, 7 Nov 2023 15:30:46 -0500
Subject: [PATCH 1/6] update to 2.10.0

---
 abs.yaml         |  2 ++
 recipe/meta.yaml | 44 ++++++++++++++++----------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)
 create mode 100644 abs.yaml

diff --git a/abs.yaml b/abs.yaml
new file mode 100644
index 0000000..d8b084b
--- /dev/null
+++ b/abs.yaml
@@ -0,0 +1,2 @@
+channels:
+  - https://staging.continuum.io/prefect/fs/jupyter_client-feedstock/pr26/011df1f
\ No newline at end of file
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 5329bad..3af36a5 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -1,5 +1,5 @@
 {% set name = "jupyter_server" %}
-{% set version = "2.5.0" %}
+{% set version = "2.10.0" %}
 
 package:
   name: {{ name|lower }}
@@ -7,18 +7,16 @@ package:
 
 source:
   url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
-  sha256: 9fde612791f716fd34d610cd939704a9639643744751ba66e7ee8fdc9cead07e
+  sha256: 47b8f5e63440125cb1bb8957bf12b18453ee5ed9efe42d2f7b2ca66a7019a278
   patches:
     # tests fail on some platforms because server doesn't start as
     # root by default
     - 00_allow_root_in_tests.patch
 
 build:
-  number: 1
-  # This package depends on jupyter_events, which eventually depends on y-py which isn't available on
-  # s390x because of rust toolchain issues.
-  skip: true  # [py<38 or s390x]
-  script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --ignore-installed --no-cache-dir -vvv
+  number: 0
+  skip: true  # [py<38]
+  script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --ignore-installed --no-cache-dir -vv
   entry_points:
     - jupyter-server = jupyter_server.serverapp:main
 
@@ -30,10 +28,8 @@ requirements:
     - pip
     - nodejs 18.15.0
     - hatch-jupyter-builder
-    - hatchling
+    - hatchling >=1.11
     - python
-    - setuptools
-    - wheel
   run:
     - python
     - anyio >=3.1.0,<4
@@ -41,29 +37,22 @@ requirements:
     - jinja2
     - jupyter_client >=7.4.4
     - jupyter_core >=4.12,!=5.0.*
-    - jupyter_events >=0.4.0
+    - jupyter_events >=0.6.0
     - jupyter_server_terminals
     - nbconvert >=6.4.4  # avoid hard dependency on pandoc (TODO nbconvert-core???)
     - nbformat >=5.3.0
+    - packaging
     - prometheus_client
     - pywinpty  # [win]
     - pyzmq >=24
-    - send2trash
+    - send2trash >=1.8.2
     - terminado >=0.8.3
     - tornado >=6.2.0
     - traitlets >=5.6.0
     - websocket-client
+    - overrides
 
-{% set xtests = ["delete", "merge_config", "test_culling"] %}
-
-# test_restart_kernel does not seem to be problematic in standalone testing, but is flaky in the
-# current anaconda build env
-{% set xtests = xtests + ["test_restart_kernel[jp_server_config0]", "test_connection[jp_server_config0]"] %}
-
-# some tests aren't working on windows due shell config in the anaconda build env
-# Error: "FileNotFoundError: The command was not found or was not executable: /bin/bash"
-{% set xtests = xtests + ["test_terminal", "test_authorized_requests", "test_bad_symlink", "test_good_symlink"]  %} # [ win ]
-
+{% set xtests = [] %}
 {% set tests = "not (" + " or ".join(xtests) + ")" %}
 
 test:
@@ -79,20 +68,19 @@ test:
     - pytest-console-scripts
     - pytest-cov
     - pytest-timeout
-    - pytest-jupyter-server >=0.6.0
+    - pytest-jupyter-server >=0.4
     - requests
+    - flaky
   imports:
     - jupyter_server
   commands:
     - pip check
     - jupyter server -h
     - echo "{{ tests }}"
-    - pytest -vvv --cov=jupyter_server -k "{{ tests }}" --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=70
+    - pytest -vvv --cov=jupyter_server --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=70
   #downstreams:
-    # nodejs >=14,<15 currently isn't available on osx-arm64
-    # Skip win because of a false positive pip check fail: jupyter-server 1.13.5 has requirement pywinpty<2
-    #- jupyterlab >=3.2  # [not ((osx and arm64) or win or s390x)]
-    #- jupyterlab_server >=2.14.0  # [not (linux and s390x)]
+    #- jupyterlab
+    #- jupyterlab_server
 
 about:
   home: https://jupyter.org

From 6a032ea81cd6cd4941018c31a0cc58e31e7d661e Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Tue, 7 Nov 2023 15:36:46 -0500
Subject: [PATCH 2/6] correct typo around tests

---
 recipe/meta.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 3af36a5..31770b6 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -52,7 +52,7 @@ requirements:
     - websocket-client
     - overrides
 
-{% set xtests = [] %}
+{% set xtests = [ "not_a_real_test" ] %}
 {% set tests = "not (" + " or ".join(xtests) + ")" %}
 
 test:
@@ -77,7 +77,7 @@ test:
     - pip check
     - jupyter server -h
     - echo "{{ tests }}"
-    - pytest -vvv --cov=jupyter_server --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=70
+    - pytest -vvv --cov=jupyter_server -k "{{ tests }}" --cov-report=term-missing:skip-covered --no-cov-on-fail --cov-fail-under=70
   #downstreams:
     #- jupyterlab
     #- jupyterlab_server

From 58b1273bc795239ef7d3fff1b3415547fc873372 Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Tue, 7 Nov 2023 16:54:09 -0500
Subject: [PATCH 3/6] amend skipped tests

---
 recipe/meta.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 31770b6..4ea6052 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -53,6 +53,14 @@ requirements:
     - overrides
 
 {% set xtests = [ "not_a_real_test" ] %}
+
+# test_culling does not seem to be problematic in standalone testing, but is flaky in the current anaconda build env
+{% set xtests = xtests + ["test_culling"] %}
+
+# some tests aren't working on windows due shell config in the anaconda build env
+# Error: "FileNotFoundError: The command was not found or was not executable: /bin/bash"
+{% set xtests = xtests + ["test_terminal", "test_authorized_requests"]  %} # [ win ]
+
 {% set tests = "not (" + " or ".join(xtests) + ")" %}
 
 test:

From b92d2ab3c4609af95f518a5887255163dd0d1837 Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Tue, 7 Nov 2023 17:28:29 -0500
Subject: [PATCH 4/6] update tests

---
 recipe/meta.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 4ea6052..0e33b47 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -15,7 +15,8 @@ source:
 
 build:
   number: 0
-  skip: true  # [py<38]
+  # This package depends on nodejs, which isn't available on s390x because it's not included in SOW packages
+  skip: true  # [py<38 or s390x]
   script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --ignore-installed --no-cache-dir -vv
   entry_points:
     - jupyter-server = jupyter_server.serverapp:main
@@ -52,10 +53,11 @@ requirements:
     - websocket-client
     - overrides
 
-{% set xtests = [ "not_a_real_test" ] %}
+{% set xtests = [ "test_culling" ] %}
 
-# test_culling does not seem to be problematic in standalone testing, but is flaky in the current anaconda build env
-{% set xtests = xtests + ["test_culling"] %}
+# test_restart_kernel does not seem to be problematic in standalone testing, but is flaky in the
+# current anaconda build env
+{% set xtests = xtests + ["test_restart_kernel[jp_server_config0]", "test_connection[jp_server_config0]"] %}
 
 # some tests aren't working on windows due shell config in the anaconda build env
 # Error: "FileNotFoundError: The command was not found or was not executable: /bin/bash"

From 8a93297c2f09e7439451e079b36569a231ba1b6a Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Wed, 8 Nov 2023 11:19:38 -0500
Subject: [PATCH 5/6] remove temp channel

---
 abs.yaml | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 abs.yaml

diff --git a/abs.yaml b/abs.yaml
deleted file mode 100644
index d8b084b..0000000
--- a/abs.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-channels:
-  - https://staging.continuum.io/prefect/fs/jupyter_client-feedstock/pr26/011df1f
\ No newline at end of file

From a6149dd9773d919ff2c5a25bcfd70bf8d0ab23b8 Mon Sep 17 00:00:00 2001
From: Charles Bousseau <cbousseau@anaconda.com>
Date: Wed, 8 Nov 2023 11:52:34 -0500
Subject: [PATCH 6/6] correct anyio bound

---
 recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 0e33b47..b417c88 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -33,7 +33,7 @@ requirements:
     - python
   run:
     - python
-    - anyio >=3.1.0,<4
+    - anyio >=3.1.0
     - argon2-cffi
     - jinja2
     - jupyter_client >=7.4.4