Merge pull request #35 from conda-forge-admin/conda_forge_admin_34

nbdime 4.0.0
conda-forge · Nov 20, 2023 · 2460328 · 2460328
2 parents 81dafda + 1fb9138
commit 2460328
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 25 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/logging_utils.sh b/.scripts/logging_utils.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/README.md b/README.md
diff --git a/recipe/740-release-version.diff b/recipe/740-release-version.diff
@@ -0,0 +1,12 @@
+diff --git a/nbdime/_version.py b/nbdime/_version.py
+index e8741df1..713669f4 100644
+--- a/nbdime/_version.py
++++ b/nbdime/_version.py
+@@ -6,7 +6,7 @@
+
+ VersionInfo = namedtuple("VersionInfo", ["major", "minor", "micro", "releaselevel", "serial"])
+
+-_specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final"}
++_specifier_ = {"a": "alpha", "b": "beta", "rc": "candidate", "": "final", None: "final"}
+
+ __version__ = "4.0.0"
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,12 +1,14 @@
-{% set version = "3.2.1" %}
+{% set version = "4.0.0" %}
 
 package:
   name: nbdime
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/n/nbdime/nbdime-{{ version }}.tar.gz
-  sha256: 31409a30f848ffc6b32540697e82d5a0a1b84dcc32716ca74e78bcc4b457c453
+  sha256: d7edb551f2f9317a00b22411d3c38374cc9e0089e5eea205153f659afb57f88a
+  patches:
+    - 740-release-version.diff
 
 build:
   number: 0
@@ -28,9 +30,11 @@ build:
     - nbmerge = nbdime.nbmergeapp:main
     - nbmerge-web = nbdime.webapp.nbmergeweb:main
     - nbshow = nbdime.nbshowapp:main
-
 requirements:
   host:
+    - hatch-jupyter-builder >=0.5
+    - hatchling >=1.5.0
+    - jupyterlab >=4.0.0,<5
     - pip
     - python >=3.6
   run:
@@ -47,7 +51,7 @@ requirements:
 
 test:
   requires:
-    - jupyterlab >=3,<4
+    - jupyterlab >=4.0.0,<5.0.0a0
     - m2-grep  # [win]
     - pip
   imports:
@@ -70,19 +74,13 @@ test:
     - hg-nbmergeweb -h
     # print them all for debugging
     - jupyter labextension list
-    - jupyter nbextension list
     - jupyter server extension list
-    - jupyter serverextension list
     # write out lists to grep
     - jupyter labextension list 1>labextensions 2>&1
-    - jupyter nbextension list 1>nbextensions 2>&1
     - jupyter server extension list 1>server_extensions 2>&1
-    - jupyter serverextension list 1>serverextensions 2>&1
     # check files
     - grep -iE "nbdime-jupyterlab.*OK*" labextensions
-    - grep -iE "nbdime.*enabled" nbextensions
     - grep -iE "nbdime.*OK" server_extensions
-    - grep -iE "nbdime.*OK" serverextensions
 
 about:
   home: https://nbdime.readthedocs.io