diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index bc4de630..bde0bc1e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -43,7 +43,7 @@ jobs: name: Upload docs to GitHub pages runs-on: ubuntu-latest needs: build-docs - if: github.event_name == 'push' && github.ref_name == 'main' + if: contains(github.ref, 'tags') steps: - uses: actions/checkout@v3 - uses: actions/download-artifact@v3 diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index f488fa13..ee1c9ce4 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -73,21 +73,22 @@ jobs: needs: [test] runs-on: ubuntu-latest if: contains(github.ref, 'tags') + environment: pypi-deploy steps: - uses: actions/checkout@v2 - name: Set up Python uses: actions/setup-python@v2 with: python-version: "3.x" - - name: Install dependencies + - name: Install build run: | python -m pip install --upgrade pip - pip install -U setuptools setuptools_scm wheel twine build - - name: Build and publish - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.TWINE_API_KEY }} + python -m pip install --upgrade build + + - name: Build package run: | git tag python -m build . - twine upload dist/* + + - name: Publish package + uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/docs/_static/logo.png b/docs/_static/logo.png new file mode 100644 index 00000000..92232b6c Binary files /dev/null and b/docs/_static/logo.png differ diff --git a/docs/changelog.rst b/docs/changelog.rst index 75adbe4e..64771d30 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -15,6 +15,8 @@ Visual improvements ~~~~~~~~~~~~~~~~~~~ - The background of ``napari-matplotlib`` figures and axes is now transparent, and the text and axis colour respects the ``napari`` theme. - The icons in the Matplotlib toolbar are now the same size as icons in the napari window. +- Custom style sheets can now be set to customise plots. See the user guide + for more information. Changes ~~~~~~~ diff --git a/docs/conf.py b/docs/conf.py index 4351e610..2517a59c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -87,6 +87,7 @@ # a list of builtin themes. # html_theme = "pydata_sphinx_theme" +html_logo = "_static/logo.png" # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files,