diff --git a/.github/workflows/step_pre-commit.yml b/.github/workflows/step_pre-commit.yml index 93fdb1e9..1d8b8a92 100644 --- a/.github/workflows/step_pre-commit.yml +++ b/.github/workflows/step_pre-commit.yml @@ -14,18 +14,16 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.x" - - name: Install pixi uses: prefix-dev/setup-pixi@v0.9.1 with: - pixi-version: v0.55.0 + pixi-version: v0.59.0 cache: true - - uses: pre-commit/action@v3.0.0 + - name: Pre-commit checks + run: | + eval "$(pixi shell-hook)" + pre-commit run --show-diff-on-failure --all-files lint-extension: runs-on: ubuntu-latest diff --git a/.gitignore b/.gitignore index 2de77185..4c4de659 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,9 @@ demo/get_started.ipynb .ipynb_checkpoints .jupyter_ystore.db* +# Marimo +__marimo__ + # Test related files .coverage .pytest_cache diff --git a/CHANGELOG.md b/CHANGELOG.md index cd480b1b..78b3578f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ Jupytext ChangeLog ================== -1.19.1.dev0 (development) +1.19.1 (2026-01-25) ------------------------- **Changed** - Jupytext does not change the file icons anymore! Thanks to [MichaƂ Krassowski](https://github.com/krassowski) for finally solving this long standing issue! ([#398](https://github.com/mwouts/jupytext/issues/398)) - We have bumped lodash from 4.17.21 to 4.17.23 in JupyterLab extension ([#1483](https://github.com/mwouts/jupytext/pull/1483)) -- We require `marimo<=0.19.4` in tests following a change in the location of the `marimo` import ([#1485](https://github.com/mwouts/jupytext/issues/1485)) +- We have updated the marimo examples using `marimo==0.19.6` following a change in the location of the `marimo` import ([#1485](https://github.com/mwouts/jupytext/issues/1485)) 1.19.0 (2026-01-18) diff --git a/pixi.lock b/pixi.lock index 265104c3..295b4699 100644 --- a/pixi.lock +++ b/pixi.lock @@ -221,7 +221,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/8c/04/c96f79d7b93e8f09d9298b333ca0d31cd9b2ee6c46c274fd0f531de9dc61/black-26.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ea/b4/694159c15c52b9f7ec7adf49d50e5f8ee71d3e9ef38adb4445d13dd56c20/coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/12/f0/f9e59fb8c310171497f379e25db060abef9fa605e09d63157eebec102676/coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -235,7 +235,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b2/70/00dc4246d9f3c69ecbb9bc36d5ad1a359884464a44711c665cb0afb1e9de/loro-1.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/5c/a2/488517a43ccf5a4b6b6eca6dd4ede0bd82b043d1539dd6bb908a19f8efd3/msgspec-0.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl @@ -459,7 +459,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/f5/13/710298938a61f0f54cdb4d1c0baeb672c01ff0358712eddaf29f76d32a0b/black-26.1.0-cp312-cp312-macosx_10_13_x86_64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ce/8a/87af46cccdfa78f53db747b09f5f9a21d5fc38d796834adac09b30a8ce74/coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/46/39/e92a35f7800222d3f7b2cbb7bbc3b65672ae8d501cb31801b2d2bd7acdf1/coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -473,7 +473,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/dd/b6/cfbf8088e8ca07d66e6c1eccde42e00bd61708f28e8ea0936f9582306323/loro-1.10.3-cp312-cp312-macosx_10_12_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/6f/1e25eee957e58e3afb2a44b94fa95e06cebc4c236193ed0de3012fff1e19/msgspec-0.20.0-cp312-cp312-macosx_10_13_x86_64.whl @@ -697,7 +697,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/cf/ad/5a131b01acc0e5336740a039628c0ab69d60cf09a2c87a4ec49f5826acda/black-26.1.0-cp313-cp313-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/32/33/7cbfe2bdc6e2f03d6b240d23dc45fdaf3fd270aaf2d640be77b7f16989ab/coverage-7.13.1-cp313-cp313-macosx_11_0_arm64.whl + - pypi: https://files.pythonhosted.org/packages/a3/a6/f8b5cfeddbab95fdef4dcd682d82e5dcff7a112ced57a959f89537ee9995/coverage-7.13.2-cp313-cp313-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -711,7 +711,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bc/3b/d1a01af3446cb98890349215bea7e71ba49dc3e50ffbfb90c5649657a8b8/loro-1.10.3-cp313-cp313-macosx_11_0_arm64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/57/b6/eff0305961a1d9447ec2b02f8c73c8946f22564d302a504185b730c9a761/msgspec-0.20.0-cp313-cp313-macosx_11_0_arm64.whl @@ -935,7 +935,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/a6/a3/e8d1526bea0446e040193185353920a9506eab60a7d8beb062029129c7d2/black-26.1.0-cp313-cp313-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/45/0b/0768b4231d5a044da8f75e097a8714ae1041246bb765d6b5563bab456735/coverage-7.13.1-cp313-cp313-win_amd64.whl + - pypi: https://files.pythonhosted.org/packages/0d/82/e5fcf5a97c72f45fc14829237a6550bf49d0ab882ac90e04b12a69db76b4/coverage-7.13.2-cp313-cp313-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -949,7 +949,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/3c/65c8b0b7f96c9b4fbd458867cf91f30fcd58ac25449d8ba9303586061671/loro-1.10.3-cp313-cp313-win_amd64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/25/5e8080fe0117f799b1b68008dc29a65862077296b92550632de015128579/msgspec-0.20.0-cp313-cp313-win_amd64.whl @@ -1200,7 +1200,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/8c/04/c96f79d7b93e8f09d9298b333ca0d31cd9b2ee6c46c274fd0f531de9dc61/black-26.1.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ea/b4/694159c15c52b9f7ec7adf49d50e5f8ee71d3e9ef38adb4445d13dd56c20/coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/12/f0/f9e59fb8c310171497f379e25db060abef9fa605e09d63157eebec102676/coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -1214,7 +1214,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b2/70/00dc4246d9f3c69ecbb9bc36d5ad1a359884464a44711c665cb0afb1e9de/loro-1.10.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/5c/a2/488517a43ccf5a4b6b6eca6dd4ede0bd82b043d1539dd6bb908a19f8efd3/msgspec-0.20.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl @@ -1442,7 +1442,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/f5/13/710298938a61f0f54cdb4d1c0baeb672c01ff0358712eddaf29f76d32a0b/black-26.1.0-cp312-cp312-macosx_10_13_x86_64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/ce/8a/87af46cccdfa78f53db747b09f5f9a21d5fc38d796834adac09b30a8ce74/coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl + - pypi: https://files.pythonhosted.org/packages/46/39/e92a35f7800222d3f7b2cbb7bbc3b65672ae8d501cb31801b2d2bd7acdf1/coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -1456,7 +1456,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/dd/b6/cfbf8088e8ca07d66e6c1eccde42e00bd61708f28e8ea0936f9582306323/loro-1.10.3-cp312-cp312-macosx_10_12_x86_64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/d9/6f/1e25eee957e58e3afb2a44b94fa95e06cebc4c236193ed0de3012fff1e19/msgspec-0.20.0-cp312-cp312-macosx_10_13_x86_64.whl @@ -1684,7 +1684,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/cf/ad/5a131b01acc0e5336740a039628c0ab69d60cf09a2c87a4ec49f5826acda/black-26.1.0-cp313-cp313-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/32/33/7cbfe2bdc6e2f03d6b240d23dc45fdaf3fd270aaf2d640be77b7f16989ab/coverage-7.13.1-cp313-cp313-macosx_11_0_arm64.whl + - pypi: https://files.pythonhosted.org/packages/a3/a6/f8b5cfeddbab95fdef4dcd682d82e5dcff7a112ced57a959f89537ee9995/coverage-7.13.2-cp313-cp313-macosx_11_0_arm64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -1698,7 +1698,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/bc/3b/d1a01af3446cb98890349215bea7e71ba49dc3e50ffbfb90c5649657a8b8/loro-1.10.3-cp313-cp313-macosx_11_0_arm64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/57/b6/eff0305961a1d9447ec2b02f8c73c8946f22564d302a504185b730c9a761/msgspec-0.20.0-cp313-cp313-macosx_11_0_arm64.whl @@ -1926,7 +1926,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/a6/a3/e8d1526bea0446e040193185353920a9506eab60a7d8beb062029129c7d2/black-26.1.0-cp313-cp313-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/b8/55/25c543864abc270f5fdd7814fa7b69fd23de1c40fb3d7993f4b6391f8d3b/boto3-1.42.34-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/99/226fb4b2d141d7ac59465e3cdd2ca3a9a2917d85e1a3160884a78b097bbb/botocore-1.42.34-py3-none-any.whl - - pypi: https://files.pythonhosted.org/packages/45/0b/0768b4231d5a044da8f75e097a8714ae1041246bb765d6b5563bab456735/coverage-7.13.1-cp313-cp313-win_amd64.whl + - pypi: https://files.pythonhosted.org/packages/0d/82/e5fcf5a97c72f45fc14829237a6550bf49d0ab882ac90e04b12a69db76b4/coverage-7.13.2-cp313-cp313-win_amd64.whl - pypi: https://files.pythonhosted.org/packages/ab/84/02fc1827e8cdded4aa65baef11296a9bbe595c474f0d6d758af082d849fd/execnet-2.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/9f/56/13ab06b4f93ca7cac71078fbe37fcea175d3216f31f85c3168a6bbd0bb9a/flake8-7.3.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/b9/5c/a3d95dc1ec6cdeb032d789b552ecc76effa3557ea9186e1566df6aac18df/fs-2.4.16-py2.py3-none-any.whl @@ -1940,7 +1940,7 @@ environments: - pypi: https://files.pythonhosted.org/packages/14/2f/967ba146e6d58cf6a652da73885f52fc68001525b4197effc174321d70b4/jmespath-1.1.0-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/e4/b5/91734dfbde32702f401c5270f32c95de6749a9a1cf32977fb66cd81fb9d8/jupyter_fs-1.1.2-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/29/3c/65c8b0b7f96c9b4fbd458867cf91f30fcd58ac25449d8ba9303586061671/loro-1.10.3-cp313-cp313-win_amd64.whl - - pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl + - pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/59/1b/6ef961f543593969d25b2afe57a3564200280528caa9bd1082eecdd7b3bc/markdown-3.10.1-py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl - pypi: https://files.pythonhosted.org/packages/f1/25/5e8080fe0117f799b1b68008dc29a65862077296b92550632de015128579/msgspec-0.20.0-cp313-cp313-win_amd64.whl @@ -2697,31 +2697,31 @@ packages: - pkg:pypi/comm?source=compressed-mapping size: 14690 timestamp: 1753453984907 -- pypi: https://files.pythonhosted.org/packages/32/33/7cbfe2bdc6e2f03d6b240d23dc45fdaf3fd270aaf2d640be77b7f16989ab/coverage-7.13.1-cp313-cp313-macosx_11_0_arm64.whl +- pypi: https://files.pythonhosted.org/packages/0d/82/e5fcf5a97c72f45fc14829237a6550bf49d0ab882ac90e04b12a69db76b4/coverage-7.13.2-cp313-cp313-win_amd64.whl name: coverage - version: 7.13.1 - sha256: 1dcb645d7e34dcbcc96cd7c132b1fc55c39263ca62eb961c064eb3928997363b + version: 7.13.2 + sha256: 14f500232e521201cf031549fb1ebdfc0a40f401cf519157f76c397e586c3beb requires_dist: - tomli ; python_full_version <= '3.11' and extra == 'toml' requires_python: '>=3.10' -- pypi: https://files.pythonhosted.org/packages/45/0b/0768b4231d5a044da8f75e097a8714ae1041246bb765d6b5563bab456735/coverage-7.13.1-cp313-cp313-win_amd64.whl +- pypi: https://files.pythonhosted.org/packages/12/f0/f9e59fb8c310171497f379e25db060abef9fa605e09d63157eebec102676/coverage-7.13.2-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl name: coverage - version: 7.13.1 - sha256: 5899d28b5276f536fcf840b18b61a9fce23cc3aec1d114c44c07fe94ebeaa500 + version: 7.13.2 + sha256: 264657171406c114787b441484de620e03d8f7202f113d62fcd3d9688baa3e6f requires_dist: - tomli ; python_full_version <= '3.11' and extra == 'toml' requires_python: '>=3.10' -- pypi: https://files.pythonhosted.org/packages/ce/8a/87af46cccdfa78f53db747b09f5f9a21d5fc38d796834adac09b30a8ce74/coverage-7.13.1-cp312-cp312-macosx_10_13_x86_64.whl +- pypi: https://files.pythonhosted.org/packages/46/39/e92a35f7800222d3f7b2cbb7bbc3b65672ae8d501cb31801b2d2bd7acdf1/coverage-7.13.2-cp312-cp312-macosx_10_13_x86_64.whl name: coverage - version: 7.13.1 - sha256: 6f34591000f06e62085b1865c9bc5f7858df748834662a51edadfd2c3bfe0dd3 + version: 7.13.2 + sha256: f106b2af193f965d0d3234f3f83fc35278c7fb935dfbde56ae2da3dd2c03b84d requires_dist: - tomli ; python_full_version <= '3.11' and extra == 'toml' requires_python: '>=3.10' -- pypi: https://files.pythonhosted.org/packages/ea/b4/694159c15c52b9f7ec7adf49d50e5f8ee71d3e9ef38adb4445d13dd56c20/coverage-7.13.1-cp312-cp312-manylinux1_x86_64.manylinux_2_28_x86_64.manylinux_2_5_x86_64.whl +- pypi: https://files.pythonhosted.org/packages/a3/a6/f8b5cfeddbab95fdef4dcd682d82e5dcff7a112ced57a959f89537ee9995/coverage-7.13.2-cp313-cp313-macosx_11_0_arm64.whl name: coverage - version: 7.13.1 - sha256: c223d078112e90dc0e5c4e35b98b9584164bea9fbbd221c0b21c5241f6d51b62 + version: 7.13.2 + sha256: 97e596de8fa9bada4d88fde64a3f4d37f1b6131e4faa32bad7808abc79887ddc requires_dist: - tomli ; python_full_version <= '3.11' and extra == 'toml' requires_python: '>=3.10' @@ -3904,8 +3904,8 @@ packages: timestamp: 1733599666357 - pypi: ./ name: jupytext - version: 1.19.1.dev0 - sha256: 7c09e1b4645435b29861f6a190dff38cb0c4c1775f3a07a2e80d8c4a96833ff1 + version: 1.19.1 + sha256: 3075ed5213ba2e38dcea206af239f344e1622d5b95bf7f02ae12e71fb404902e requires_dist: - markdown-it-py>=1.0 - mdit-py-plugins @@ -3921,7 +3921,7 @@ packages: - isort ; extra == 'dev' - jupyter-fs[fs]>=1.0 ; extra == 'dev' - jupyter-server!=2.11 ; extra == 'dev' - - marimo>=0.17.6,<=0.19.4 ; extra == 'dev' + - marimo>=0.19.6 ; python_full_version >= '3.10' and extra == 'dev' - nbconvert ; extra == 'dev' - pre-commit ; extra == 'dev' - pytest ; extra == 'dev' @@ -3956,7 +3956,7 @@ packages: - isort ; extra == 'test-external' - jupyter-fs[fs]>=1.0 ; extra == 'test-external' - jupyter-server!=2.11 ; extra == 'test-external' - - marimo>=0.17.6,<=0.19.4 ; extra == 'test-external' + - marimo>=0.19.6 ; python_full_version >= '3.10' and extra == 'test-external' - nbconvert ; extra == 'test-external' - pre-commit ; extra == 'test-external' - pytest ; extra == 'test-external' @@ -3980,7 +3980,6 @@ packages: - pytest-xdist ; extra == 'test-integration' - bash-kernel ; extra == 'test-ui' requires_python: '>=3.9' - editable: true - conda: https://conda.anaconda.org/conda-forge/noarch/keyring-25.7.0-pyh534df25_0.conda sha256: 9def5c6fb3b3b4952a4f6b55a019b5c7065b592682b84710229de5a0b73f6364 md5: c88f9579d08eb4031159f03640714ce3 @@ -4641,10 +4640,10 @@ packages: version: 1.10.3 sha256: 028948b48dcc5c2127f974dae4ad466ab69f0d1eeaf367a8145eb6501fb988f2 requires_python: '>=3.8' -- pypi: https://files.pythonhosted.org/packages/81/a3/ec4989605e1f3681bc0b66ea7cba7767c1b7074c67462400364b90f43b2a/marimo-0.19.4-py3-none-any.whl +- pypi: https://files.pythonhosted.org/packages/be/85/5e1e9af6327366177151479bea56b0d4e5d214bdf4f17d5185dc4a8871b2/marimo-0.19.6-py3-none-any.whl name: marimo - version: 0.19.4 - sha256: 872f3427213047076e73147c41085b6932d83a03ac84040ba9a611a0fcecb729 + version: 0.19.6 + sha256: 9e4f5fab438b3eeeb1e32808287a9ada9c12c5a4536af7458db6be8b8da38f2f requires_dist: - click>=8.0,<9 - jedi>=0.18.0 diff --git a/pyproject.toml b/pyproject.toml index 4e9bb260..46882dea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,7 @@ test-external = [ "gitpython", "pre-commit", # Marimo notebooks - "marimo>=0.17.6,<=0.19.4", #1485 + "marimo>=0.19.6;python_version>=\"3.10\"", #1485 # Interaction with other contents managers "jupyter-fs[fs]>=1.0" # 1398 ] diff --git a/src/jupytext/compare.py b/src/jupytext/compare.py index 4c7ba6f3..25834280 100644 --- a/src/jupytext/compare.py +++ b/src/jupytext/compare.py @@ -378,8 +378,8 @@ def assert_conversion_same_as_mirror(nb_file, fmt, mirror_name, compare_notebook if fmt.get("format_name") == "marimo": lines = expected.splitlines() lines = [ - # mirror files were generated with marimo 0.17.8 - f'__generated_with = "{marimo_version()}"' if line == '__generated_with = "0.17.8"' else line + # mirror files were generated with marimo 0.19.6 + f'__generated_with = "{marimo_version()}"' if line == '__generated_with = "0.19.6"' else line for line in lines ] expected = "\n".join(lines) + "\n" diff --git a/src/jupytext/version.py b/src/jupytext/version.py index cfe21472..d689a7c4 100644 --- a/src/jupytext/version.py +++ b/src/jupytext/version.py @@ -1,4 +1,4 @@ """Jupytext's version number""" # Must match [N!]N(.N)*[{a|b|rc}N][.postN][.devN], cf. PEP 440 -__version__ = "1.19.1.dev0" +__version__ = "1.19.1" diff --git a/tests/data/notebooks/inputs/marimo/basic_marimo_example.py b/tests/data/notebooks/inputs/marimo/basic_marimo_example.py index 0d0763f8..8ff4ed9e 100644 --- a/tests/data/notebooks/inputs/marimo/basic_marimo_example.py +++ b/tests/data/notebooks/inputs/marimo/basic_marimo_example.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -25,11 +31,5 @@ def _(x): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/Line_breaks_in_LateX_305.py b/tests/data/notebooks/outputs/ipynb_to_marimo/Line_breaks_in_LateX_305.py index 78064068..4ed39a48 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/Line_breaks_in_LateX_305.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/Line_breaks_in_LateX_305.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -52,11 +58,5 @@ def _(mo): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with function and cell metadata 164.py b/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with function and cell metadata 164.py index c25879e4..8dde1a6a 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with function and cell metadata 164.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with function and cell metadata 164.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell def _(): 1 + 1 @@ -44,11 +50,5 @@ def _(): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with many hash signs.py b/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with many hash signs.py index 7bf4c360..5dea548a 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with many hash signs.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/Notebook with many hash signs.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -39,11 +45,5 @@ def _(mo): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/cat_variable.py b/tests/data/notebooks/outputs/ipynb_to_marimo/cat_variable.py index a2eea6a2..9be71822 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/cat_variable.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/cat_variable.py @@ -1,6 +1,6 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/frozen_cell.py b/tests/data/notebooks/outputs/ipynb_to_marimo/frozen_cell.py index 428a3533..8f4d2a4f 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/frozen_cell.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/frozen_cell.py @@ -1,6 +1,6 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/jupyter.py b/tests/data/notebooks/outputs/ipynb_to_marimo/jupyter.py index 971e7064..ec34dfe5 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/jupyter.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/jupyter.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -50,11 +56,5 @@ def _(mo): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/notebook_with_complex_metadata.py b/tests/data/notebooks/outputs/ipynb_to_marimo/notebook_with_complex_metadata.py index 7d70c8c2..c76e9b79 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/notebook_with_complex_metadata.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/notebook_with_complex_metadata.py @@ -1,6 +1,6 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/plotly_graphs.py b/tests/data/notebooks/outputs/ipynb_to_marimo/plotly_graphs.py index 565c3c8d..8dd58281 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/plotly_graphs.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/plotly_graphs.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -47,11 +53,5 @@ def _(): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/sample_rise_notebook_66.py b/tests/data/notebooks/outputs/ipynb_to_marimo/sample_rise_notebook_66.py index a8d8e710..2f553bdd 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/sample_rise_notebook_66.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/sample_rise_notebook_66.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -26,11 +32,5 @@ def _(mo): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run() diff --git a/tests/data/notebooks/outputs/ipynb_to_marimo/text_outputs_and_images.py b/tests/data/notebooks/outputs/ipynb_to_marimo/text_outputs_and_images.py index 33cd7950..47a78a6c 100644 --- a/tests/data/notebooks/outputs/ipynb_to_marimo/text_outputs_and_images.py +++ b/tests/data/notebooks/outputs/ipynb_to_marimo/text_outputs_and_images.py @@ -1,9 +1,15 @@ import marimo -__generated_with = "0.17.8" +__generated_with = "0.19.6" app = marimo.App() +@app.cell +def _(): + import marimo as mo + return (mo,) + + @app.cell(hide_code=True) def _(mo): mo.md(r""" @@ -116,11 +122,5 @@ def _(undefined_variable): return -@app.cell -def _(): - import marimo as mo - return (mo,) - - if __name__ == "__main__": app.run()