Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master to main #102

Merged
merged 1 commit into from
Dec 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: tests
on:
push:
branches:
- master
- main
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<img src="https://github.com/holoviz/colorcet/blob/master/doc/_static/logo.png" width=200><br>
<img src="https://github.com/holoviz/colorcet/blob/main/doc/_static/logo.png" width=200><br>

-----------------

# Colorcet: Collection of perceptually uniform colormaps

| | |
| --- | --- |
| 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/) |
Expand Down
2 changes: 1 addition & 1 deletion doc/about.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
About
=====

Colorcet is completely open source, available under a `Creative Commons Attribution <https://github.com/holoviz/colorcet/blob/master/LICENSE.txt>`_ license freely for both commercial and non-commercial use. Colorcet was originally developed with the support of `Anaconda Inc. <https://anaconda.com>`_, and is now maintained by Anaconda developers and community contributors.
Colorcet is completely open source, available under a `Creative Commons Attribution <https://github.com/holoviz/colorcet/blob/main/LICENSE.txt>`_ license freely for both commercial and non-commercial use. Colorcet was originally developed with the support of `Anaconda Inc. <https://anaconda.com>`_, and is now maintained by Anaconda developers and community contributors.

Colorcet is part of the `HoloViz <https://holoviz.org>`_ family of tools. The `holoviz.org <https://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 <https://examples.pyviz.org>`_, and you can compare Colorcet to other available tools at `pyviz.org <https://pyviz.org>`_.

Expand Down
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@

-------

`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/master/examples/index.ipynb>`_
`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/main/examples/index.ipynb>`_
2 changes: 1 addition & 1 deletion doc/user_guide/Categorical.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ Categorical

-------

`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/master/examples/user_guide/Categorical.ipynb>`_
`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/main/examples/user_guide/Categorical.ipynb>`_
2 changes: 1 addition & 1 deletion doc/user_guide/Continuous.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ Continuous

-------

`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/master/examples/user_guide/Continuous.ipynb>`_
`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/main/examples/user_guide/Continuous.ipynb>`_
2 changes: 1 addition & 1 deletion doc/user_guide/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ User Guide

-------

`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/master/examples/user_guide/index.ipynb>`_
`Right click to download this notebook from GitHub. <https://raw.githubusercontent.com/holoviz/colorcet/main/examples/user_guide/index.ipynb>`_