From a4acc92f0ef9261d9b7f9a644b6afaceb15a1b5a Mon Sep 17 00:00:00 2001 From: maximlt Date: Thu, 29 Dec 2022 11:06:38 +0100 Subject: [PATCH] master to main --- .github/workflows/test.yaml | 2 +- .gitignore | 2 +- README.md | 6 +++--- doc/about.rst | 2 +- doc/index.rst | 2 +- doc/user_guide/Categorical.rst | 2 +- doc/user_guide/Continuous.rst | 2 +- doc/user_guide/index.rst | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 96574cb..c298d56 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,7 +3,7 @@ name: tests on: push: branches: - - master + - main pull_request: branches: - '*' diff --git a/.gitignore b/.gitignore index b74b084..303ec0a 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,7 @@ pip-wheel-metadata doc/**/*.rst doc/**/*.ipynb doc/**/*.json -# this dir contains the whole website and should not be checked in on master +# this dir contains the whole website and should not be checked in on main builtdocs/ # myst-nb output dir jupyter_execute/ diff --git a/README.md b/README.md index 2d68a91..8c0518b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -
+
----------------- @@ -6,8 +6,8 @@ | | | | --- | --- | -| Build Status | [![Linux/MacOS Build Status](https://github.com/holoviz/colorcet/workflows/tests/badge.svg?query=branch%3Amaster)](https://github.com/holoviz/colorcet/actions/workflows/tests.yaml?query=branch%3Amaster) | -| Coverage | [![codecov](https://codecov.io/gh/holoviz/colorcet/branch/master/graph/badge.svg)](https://codecov.io/gh/holoviz/colorcet) || +| Build Status | [![Linux/MacOS Build Status](https://github.com/holoviz/colorcet/workflows/tests/badge.svg?query=branch%3Amain)](https://github.com/holoviz/colorcet/actions/workflows/tests.yaml?query=branch%3Amain) | +| Coverage | [![codecov](https://codecov.io/gh/holoviz/colorcet/branch/main/graph/badge.svg)](https://codecov.io/gh/holoviz/colorcet) || | Latest dev release | [![Github tag](https://img.shields.io/github/tag/holoviz/colorcet.svg?label=tag&colorB=11ccbb)](https://github.com/holoviz/colorcet/tags) [![dev-site](https://img.shields.io/website-up-down-green-red/https/pyviz-dev.github.io/colorcet.svg?label=dev%20website)](https://pyviz-dev.github.io/colorcet/) | | Latest release | [![Github release](https://img.shields.io/github/release/holoviz/colorcet.svg?label=tag&colorB=11ccbb)](https://github.com/holoviz/colorcet/releases) [![PyPI version](https://img.shields.io/pypi/v/colorcet.svg?colorB=cc77dd)](https://pypi.python.org/pypi/colorcet) [![colorcet version](https://img.shields.io/conda/v/holoviz/colorcet.svg?colorB=4488ff&style=flat)](https://anaconda.org/holoviz/colorcet) [![conda-forge version](https://img.shields.io/conda/v/conda-forge/colorcet.svg?label=conda%7Cconda-forge&colorB=4488ff)](https://anaconda.org/conda-forge/colorcet) [![defaults version](https://img.shields.io/conda/v/anaconda/colorcet.svg?label=conda%7Cdefaults&style=flat&colorB=4488ff)](https://anaconda.org/anaconda/colorcet) | | Python | [![Python support](https://img.shields.io/pypi/pyversions/colorcet.svg)](https://pypi.org/project/colorcet/) | diff --git a/doc/about.rst b/doc/about.rst index 3b4c9fc..2f5cc12 100644 --- a/doc/about.rst +++ b/doc/about.rst @@ -1,7 +1,7 @@ About ===== -Colorcet is completely open source, available under a `Creative Commons Attribution `_ license freely for both commercial and non-commercial use. Colorcet was originally developed with the support of `Anaconda Inc. `_, and is now maintained by Anaconda developers and community contributors. +Colorcet is completely open source, available under a `Creative Commons Attribution `_ license freely for both commercial and non-commercial use. Colorcet was originally developed with the support of `Anaconda Inc. `_, and is now maintained by Anaconda developers and community contributors. Colorcet is part of the `HoloViz `_ family of tools. The `holoviz.org `_ website shows how to use Colorcet together with other libraries to solve complex problems, with detailed tutorials and examples. You can see a variety of projects using Colorcet at `examples.pyviz.org `_, and you can compare Colorcet to other available tools at `pyviz.org `_. diff --git a/doc/index.rst b/doc/index.rst index 4e75dfe..81c8c06 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -23,4 +23,4 @@ ------- -`Right click to download this notebook from GitHub. `_ +`Right click to download this notebook from GitHub. `_ diff --git a/doc/user_guide/Categorical.rst b/doc/user_guide/Categorical.rst index 17af236..26c2178 100644 --- a/doc/user_guide/Categorical.rst +++ b/doc/user_guide/Categorical.rst @@ -13,4 +13,4 @@ Categorical ------- -`Right click to download this notebook from GitHub. `_ +`Right click to download this notebook from GitHub. `_ diff --git a/doc/user_guide/Continuous.rst b/doc/user_guide/Continuous.rst index 8cd02ab..efc2570 100644 --- a/doc/user_guide/Continuous.rst +++ b/doc/user_guide/Continuous.rst @@ -14,4 +14,4 @@ Continuous ------- -`Right click to download this notebook from GitHub. `_ +`Right click to download this notebook from GitHub. `_ diff --git a/doc/user_guide/index.rst b/doc/user_guide/index.rst index 0a722a1..faba56d 100644 --- a/doc/user_guide/index.rst +++ b/doc/user_guide/index.rst @@ -22,4 +22,4 @@ User Guide ------- -`Right click to download this notebook from GitHub. `_ +`Right click to download this notebook from GitHub. `_