Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nbdime 4.0.0 #35

Merged
merged 8 commits into from
Nov 20, 2023
Merged

nbdime 4.0.0 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28e89ca
dummy commit for rerendering
conda-forge-webservices[bot] Nov 20, 2023
06e1a1b
ENH updated version to 4.0.0
Nov 20, 2023
59f1af2
MNT: Re-rendered with conda-build 3.27.0, conda-smithy 3.29.0, and co…
Nov 20, 2023
6d6303d
start updating deps
bollwyvl Nov 20, 2023
57fb98c
Merge remote-tracking branch 'ADMIN/conda_forge_admin_34' into conda_…
bollwyvl Nov 20, 2023
b244a03
update tests
bollwyvl Nov 20, 2023
9a66dfa
patch version finding
bollwyvl Nov 20, 2023
1fb9138
remove more notebook 6 tests
bollwyvl Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 15 additions & 7 deletions .scripts/build_steps.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .scripts/run_docker_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions recipe/740-release-version.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
18 changes: 8 additions & 10 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand All @@ -47,7 +51,7 @@ requirements:

test:
requires:
- jupyterlab >=3,<4
- jupyterlab >=4.0.0,<5.0.0a0
- m2-grep # [win]
- pip
imports:
Expand All @@ -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
Expand Down