Here's an update of jupyter core to the latest version (5.4.0). This is
the start of updating the jupyter stack which is somewhat outdated.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_core/Makefile,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile
--- Makefile 7 Sep 2023 20:58:31 -0000 1.20
+++ Makefile 21 Oct 2023 19:28:20 -0000
@@ -1,6 +1,6 @@
COMMENT = Jupyter core package
-MODPY_EGG_VERSION = 4.7.0
+MODPY_EGG_VERSION = 5.4.0
DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
@@ -12,16 +12,20 @@ HOMEPAGE = https://jupyter.org/
PERMIT_PACKAGE = Yes
MODULES = lang/python
-MODPY_PI = Yes
-MODPY_PYBUILD = setuptools
-MODPY_PYTEST_ARGS = jupyter_core
-
-RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
- devel/py-nose$(MODPY_FLAVOR)
FLAVORS = python3
FLAVOR = python3
+
+MODPY_PI = Yes
+MODPY_PYBUILD = hatchling
+
+RUN_DEPENDS = devel/py-traitlets${MODPY_FLAVOR} \
+ sysutils/py-platformdirs${MODPY_FLAVOR}
+
+TEST_DEPENDS = devel/pre-commit${MODPY_FLAVOR} \
+ devel/py-ipykernel${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR} \
+ devel/py-test-timeout${MODPY_FLAVOR}
PORTHOME = ${WRKDIR}
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_core/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 7 Sep 2023 20:58:31 -0000 1.7
+++ distinfo 21 Oct 2023 19:28:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.7.0.tar.gz) =
qh+Ulqs6vnLaTv4NqrDLIjOZeRRYH5oHHgdJjGrdjtM=
-SIZE (jupyter_core-4.7.0.tar.gz) = 66444
+SHA256 (jupyter_core-5.4.0.tar.gz) =
5LmDRLuU7i4+bEUZqX0AFlYAn5yyt/K68Vs8IFdwAR0=
+SIZE (jupyter_core-5.4.0.tar.gz) = 85162
Index: patches/patch-jupyter_core_tests_test_command_py
===================================================================
RCS file: patches/patch-jupyter_core_tests_test_command_py
diff -N patches/patch-jupyter_core_tests_test_command_py
--- patches/patch-jupyter_core_tests_test_command_py 7 Sep 2023 20:58:31
-0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,88 +0,0 @@
-Index: jupyter_core/tests/test_command.py
---- jupyter_core/tests/test_command.py.orig
-+++ jupyter_core/tests/test_command.py
-@@ -114,20 +114,24 @@ def test_subcommand_not_found():
-
- @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
- def test_subcommand_list(tmpdir):
-+ if sys.version_info.major == 3:
-+ cmd_sufx = '-3'
-+ else:
-+ cmd_sufx = ''
- a = tmpdir.mkdir("a")
- for cmd in ('jupyter-foo-bar',
- 'jupyter-xyz',
- 'jupyter-babel-fish'):
-- a.join(cmd).write('')
-+ a.join(cmd + cmd_sufx).write('')
- b = tmpdir.mkdir("b")
- for cmd in ('jupyter-foo',
- 'jupyterstuff',
- 'jupyter-yo-eyropa-ganymyde-callysto'):
-- b.join(cmd).write('')
-+ b.join(cmd + cmd_sufx).write('')
- c = tmpdir.mkdir("c")
- for cmd in ('jupyter-baz',
- 'jupyter-bop'):
-- c.join(cmd).write('')
-+ b.join(cmd + cmd_sufx).write('')
-
- path = os.pathsep.join(map(str, [a, b]))
-
-@@ -147,13 +151,17 @@ def test_subcommand_list(tmpdir):
- ]
-
- def test_not_on_path(tmpdir):
-+ if sys.version_info.major == 3:
-+ cmd_sufx = '-3'
-+ else:
-+ cmd_sufx = ''
- a = tmpdir.mkdir("a")
- jupyter = a.join('jupyter')
- jupyter.write(
- 'from jupyter_core import command; command.main()'
- )
- jupyter.chmod(0o700)
-- witness = a.join('jupyter-witness')
-+ witness = a.join('jupyter-witness' + cmd_sufx)
- witness_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS ME")')
- write_executable(witness, witness_src)
-
-@@ -163,23 +171,27 @@ def test_not_on_path(tmpdir):
- if sys.platform == 'win32':
- env[str('PATHEXT')] = '.EXE'
- # This won't work on windows unless
-- out = check_output([sys.executable, str(jupyter), 'witness'], env=env)
-+ out = check_output([sys.executable, str(jupyter), 'witness' + cmd_sufx],
env=env)
- assert b'WITNESS' in out
-
-
- def test_path_priority(tmpdir):
-+ if sys.version_info.major == 3:
-+ cmd_sufx = '-3'
-+ else:
-+ cmd_sufx = ''
- a = tmpdir.mkdir("a")
- jupyter = a.join('jupyter')
- jupyter.write(
- 'from jupyter_core import command; command.main()'
- )
- jupyter.chmod(0o700)
-- witness_a = a.join('jupyter-witness')
-+ witness_a = a.join('jupyter-witness' + cmd_sufx)
- witness_a_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS A")')
- write_executable(witness_a, witness_a_src)
-
- b = tmpdir.mkdir("b")
-- witness_b = b.join('jupyter-witness')
-+ witness_b = b.join('jupyter-witness' + cmd_sufx)
- witness_b_src = '#!%s\n%s\n' % (sys.executable, 'print("WITNESS B")')
- write_executable(witness_b, witness_b_src)
-
-@@ -188,5 +200,5 @@ def test_path_priority(tmpdir):
- env[str('SYSTEMROOT')] = os.environ['SYSTEMROOT']
- if sys.platform == 'win32':
- env[str('PATHEXT')] = '.EXE'
-- out = check_output([sys.executable, str(jupyter), 'witness'], env=env)
-+ out = check_output([sys.executable, str(jupyter), 'witness' + cmd_sufx],
env=env)
- assert b'WITNESS A' in out
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_core/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 7 Sep 2023 20:58:31 -0000 1.6
+++ pkg/PLIST 21 Oct 2023 19:28:20 -0000
@@ -9,12 +9,12 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jupyter.py
lib/python${MODPY_VERSION}/site-packages/jupyter_core/
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/COPYING.md
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/jupyter_core-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
lib/python${MODPY_VERSION}/site-packages/jupyter_core/__init__.py
lib/python${MODPY_VERSION}/site-packages/jupyter_core/__main__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/${MODPY_PYCACHE}/
@@ -38,72 +38,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/jupyter_core/command.py
lib/python${MODPY_VERSION}/site-packages/jupyter_core/migrate.py
lib/python${MODPY_VERSION}/site-packages/jupyter_core/paths.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}mocking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}mocking.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_application.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_command.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_command.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_migrate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_migrate.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/${MODPY_PYCACHE}test_paths.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/nbextensions/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/nbextensions/myext.js
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_console_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_console_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_kernel_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_kernel_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_nbconvert_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_nbconvert_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_notebook_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/${MODPY_PYCACHE}ipython_notebook_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/ipython_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/ipython_console_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/ipython_kernel_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/ipython_nbconvert_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/ipython_notebook_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/static/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/static/custom/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/static/custom/custom.css
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython/profile_default/static/custom/custom.js
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_console_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_console_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_kernel_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_kernel_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_nbconvert_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_nbconvert_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_notebook_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/${MODPY_PYCACHE}ipython_notebook_config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/ipython_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/ipython_console_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/ipython_kernel_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/ipython_nbconvert_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/ipython_notebook_config.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/static/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/static/custom/
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/static/custom/custom.css
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/dotipython_empty/profile_default/static/custom/custom.js
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/mocking.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/test_application.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/test_command.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/test_migrate.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_core/tests/test_paths.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_core/py.typed
lib/python${MODPY_VERSION}/site-packages/jupyter_core/troubleshoot.py
lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/
lib/python${MODPY_VERSION}/site-packages/jupyter_core/utils/__init__.py
