diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4df7b237b..45e8a50b3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,11 @@ concurrency: cancel-in-progress: true jobs: + comment-pr: + permissions: + pull-requests: write + uses: ./.github/workflows/step_comment-pr.yml + pre-commit: uses: ./.github/workflows/step_pre-commit.yml @@ -54,7 +59,7 @@ jobs: uses: ./.github/workflows/step_tests-ui.yml build: - needs: [test-pip, test-conda, test-ui] + needs: [test-pip, test-conda, test-unit-functional-integration, test-ui] uses: ./.github/workflows/step_build.yml with: upload: ${{ inputs.upload-build-artifacts || false }} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0f3078fcb..012783294 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,8 +3,8 @@ on: push: tags: - "v[0-9]+.[0-9]+.[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+" - - "v[0-9]+.[0-9]+.[0-9]+-dev[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+rc[0-9]+" + - "v[0-9]+.[0-9]+.[0-9]+dev[0-9]+" jobs: pre-commit: @@ -18,12 +18,20 @@ jobs: needs: [ codeql ] uses: ./.github/workflows/step_tests-pip.yml + test-unit-functional-integration: + needs: [ codeql ] + uses: ./.github/workflows/step_test_unit_functional.yml + test-conda: needs: [ codeql ] uses: ./.github/workflows/step_tests-conda.yml + test-ui: + needs: [ codeql ] + uses: ./.github/workflows/step_tests-ui.yml + build: - needs: [ test-pip, test-conda ] + needs: [ test-pip, test-conda, test-unit-functional-integration, test-ui ] uses: ./.github/workflows/step_build.yml publish: diff --git a/.github/workflows/step_comment-pr.yml b/.github/workflows/step_comment-pr.yml new file mode 100644 index 000000000..38d06b57b --- /dev/null +++ b/.github/workflows/step_comment-pr.yml @@ -0,0 +1,29 @@ +name: comment-pr +run-name: Comment PR + +on: + workflow_call: + +jobs: + comment-pr: + runs-on: ubuntu-latest + name: Comment PR + if: github.event_name == 'pull_request' + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Comment PR + uses: thollander/actions-comment-pull-request@v2 + with: + message: | + Thank you for making this pull request. + + Did you know? You can try it on Binder: [![Binder:lab](https://img.shields.io/badge/binder-jupyterlab-0172B2.svg)](https://mybinder.org/v2/gh/${{ github.repository }}/${{ github.head_ref }}?urlpath=lab/tree/demo/get_started.ipynb) or [![Binder:notebook](https://img.shields.io/badge/binder-notebook-0172B2.svg)](https://mybinder.org/v2/gh/${{ github.repository }}/${{ github.head_ref }}?filepath=demo). + + Also, the version of Jupytext developed in this PR can be installed with `pip`: + ``` + pip install git+https://github.com/${{ github.repository }}.git@${{ github.head_ref }} + ``` + (this requires `nodejs`, see more at [Developing Jupytext](https://jupytext.readthedocs.io/en/latest/developing.html)) + comment_tag: binder_link diff --git a/README.md b/README.md index 6f33cfb5e..62ac115a3 100755 --- a/README.md +++ b/README.md @@ -10,8 +10,8 @@ [![Conda Version](https://img.shields.io/conda/vn/conda-forge/jupytext.svg)](https://anaconda.org/conda-forge/jupytext) [![Pypi](https://img.shields.io/pypi/v/jupytext.svg)](https://pypi.python.org/pypi/jupytext) [![pyversions](https://img.shields.io/pypi/pyversions/jupytext.svg)](https://pypi.python.org/pypi/jupytext) -[![Binder:notebook](https://img.shields.io/badge/binder-notebook-0172B2.svg)](https://mybinder.org/v2/gh/mwouts/jupytext/main?filepath=demo) [![Binder:lab](https://img.shields.io/badge/binder-jupyterlab-0172B2.svg)](https://mybinder.org/v2/gh/mwouts/jupytext/main?urlpath=lab/tree/demo/get_started.ipynb) +[![Binder:notebook](https://img.shields.io/badge/binder-notebook-0172B2.svg)](https://mybinder.org/v2/gh/mwouts/jupytext/main?filepath=demo) [![launch - renku](https://renkulab.io/renku-badge.svg)](https://renkulab.io/projects/best-practices/jupytext/sessions/new?autostart=1) [![](https://img.shields.io/badge/YouTube-JupyterCon%202020-red.svg)](https://www.youtube.com/watch?v=SDYdeVfMh48) diff --git a/binder/requirements.txt b/binder/requirements.txt index 6107d84ec..426bdd1fa 100644 --- a/binder/requirements.txt +++ b/binder/requirements.txt @@ -1,9 +1,8 @@ jupyterlab>=4 +notebook>=7 plotly matplotlib wordcloud pandas wbdata bash_kernel -# https://github.com/mwouts/jupytext/issues/1051 -nbclassic>=0.5.5 diff --git a/docs/developing.md b/docs/developing.md index 5c78aa2a6..05e3e2ce0 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -7,7 +7,12 @@ If you want to test a feature that has been integrated in `main` but not deliver pip install git+https://github.com/mwouts/jupytext.git ``` -If you want only to build Jupytext core (e.g. not the JupyterLab extension) you can prefix the +The above requires `node`. You can install it with e.g. +``` +conda install 'nodejs>=20' -c conda-forge +``` + +Alternatively you can build only Jupytext core (e.g. skip the JupyterLab extension). To do so, prefix the above with `HATCH_BUILD_HOOKS_ENABLE=false`. Finally, if you want to test a development branch, use