Getting rid of pyviz references (#840)

* Removing wording around pyviz

* Removing more pyviz references

* Using the svg rather than png

* build:website_dev

* Pointing appveyor to holoviz-developers

* Updating readme and about to point to status.holoviz.org

.travis.yml

@@ -88,7 +88,7 @@ jobs:
       env: HV_DOC_HTML="true" DESC="docs" OPTS="-o doc"
       script:
         - datashader fetch-data --path=examples --force
-        - nbsite generate-rst --org pyviz --project-name datashader --skip '.*tiling.*,.*streaming-aggregation.*'
+        - nbsite generate-rst --org holoviz --project-name datashader --skip '.*tiling.*,.*streaming-aggregation.*'
         - nbsite build --what=html --output=builtdocs
       deploy:
         provider: pages

README.md

@@ -6,11 +6,11 @@
 
 |    |    |
 | --- | --- |
-| Build Status | [![Linux/MacOS Build Status](https://travis-ci.org/holoviz/datashader.svg?branch=master)](https://travis-ci.org/holoviz/datashader) [![Windows Build status](https://img.shields.io/appveyor/ci/pyviz/datashader/master.svg?logo=appveyor)](https://ci.appveyor.com/project/pyviz/datashader/branch/master) |
+| Build Status | [![Linux/MacOS Build Status](https://travis-ci.org/holoviz/datashader.svg?branch=master)](https://travis-ci.org/holoviz/datashader) [![Windows Build status](https://img.shields.io/appveyor/ci/holoviz-developers/datashader/master.svg?logo=appveyor)](https://ci.appveyor.com/project/holoviz-developers/datashader/branch/master) |
 | Coverage | [![codecov](https://codecov.io/gh/holoviz/datashader/branch/master/graph/badge.svg)](https://codecov.io/gh/holoviz/datashader) |
 | Latest dev release | [![Github tag](https://img.shields.io/github/tag/holoviz/datashader.svg?label=tag&colorB=11ccbb)](https://github.com/holoviz/datashader/tags) |
 | Latest release | [![Github release](https://img.shields.io/github/release/holoviz/datashader.svg?label=tag&colorB=11ccbb)](https://github.com/holoviz/datashader/releases) [![PyPI version](https://img.shields.io/pypi/v/datashader.svg?colorB=cc77dd)](https://pypi.python.org/pypi/datashader) [![datashader version](https://img.shields.io/conda/v/pyviz/datashader.svg?colorB=4488ff&style=flat)](https://anaconda.org/pyviz/datashader) [![conda-forge version](https://img.shields.io/conda/v/conda-forge/datashader.svg?label=conda%7Cconda-forge&colorB=4488ff)](https://anaconda.org/conda-forge/datashader) [![defaults version](https://img.shields.io/conda/v/anaconda/datashader.svg?label=conda%7Cdefaults&style=flat&colorB=4488ff)](https://anaconda.org/anaconda/datashader) |
-| Docs | [![site](https://img.shields.io/website-up-down-green-red/http/datashader.org.svg)](http://datashader.org) |
+| Docs | [![gh-pages](https://img.shields.io/github/last-commit/holoviz/datashader/gh-pages.svg)](https://github.com/holoviz/datashader/tree/gh-pages) [![site](https://img.shields.io/website-up-down-green-red/http/datashader.org.svg)](http://datashader.org) |
 
 
 ## What is it?
@@ -117,8 +117,10 @@ including API documentation and papers and talks about the approach.
 ![NYC taxi](examples/assets/images/nyc_pickups_vs_dropoffs.jpg)
 
 
-## About PyViz
+## About HoloViz
 
-Datashader is part of the PyViz initiative for making Python-based visualization tools work well together.
-See [pyviz.org](http://pyviz.org) for related packages that you can use with Datashader and
-[status.pyviz.org](http://status.pyviz.org) for the current status of each PyViz project.
+Datashader is part of the [HoloViz](https://holoviz.org) ecosystem for making
+browser-based data visualization in Python easier to use, easier to learn, and more powerful. See [holoviz.org](http://holoviz.org) for related packages that you can use with Datashader and
+[status.holoviz.org](http://status.holoviz.org) for the current status of each HoloViz project.
+
+Datashader is supported and maintained by [Anaconda](https://anaconda.com).

ROADMAP.md

@@ -1,8 +1,8 @@
 # Datashader Roadmap, as of 4/2018
 
-Datashader is an open-source project, with contributions from a variety of developers with different priorities, so it is not possible to lay out a fully detailed timeline of upcoming features.  That said, there are clear priorities that the current developers have agreed on, which will be described here and updated occasionally. 
+Datashader is an open-source project, with contributions from a variety of developers with different priorities, so it is not possible to lay out a fully detailed timeline of upcoming features.  That said, there are clear priorities that the current developers have agreed on, which will be described here and updated occasionally.
 
-If you need any of the functionality listed below and want to help make it a priority, please respond to the relevant issue listed (preferably with offers of coding, financial, or other assistance!). 
+If you need any of the functionality listed below and want to help make it a priority, please respond to the relevant issue listed (preferably with offers of coding, financial, or other assistance!).
 
 1. **Ongoing maintenance, improved documentation and examples**
   - As always, there are various bugs and usability issues reported on the issue tracker, and we will address these as time permits.
@@ -30,6 +30,3 @@ If you need any of the functionality listed below and want to help make it a pri
   -  [#92](../../issues/92)  Box select support
   -  [#61](../../issues/61)  Add information on requirements for osm example
   - [#242](../../issues/242) Spatiotemporal data animation
-
-
-Also see the [PyViz.org roadmap](http://pyviz.org/roadmap.html).

datashader/tests/test_pandas.py

@@ -652,7 +652,7 @@ def test_trimesh_agg_api():
 
 
 def test_bug_570():
-    # See https://github.com/pyviz/datashader/issues/570
+    # See https://github.com/holoviz/datashader/issues/570
     df = pd.DataFrame({
         'Time': [1456353642.2053893, 1456353642.2917893],
         'data': [-59.4948743433377, 506.4847376716022],

doc/about.rst

@@ -1,8 +1,9 @@
 About Us
 ========
 
-Datashader is part of the PyViz initiative for making Python-based visualization tools work well together.
-See `pyviz.org <http://pyviz.org>`_ for related packages that you can use with Datashader and
-`status.pyviz.org <http://status.pyviz.org>`_ for the current status of each PyViz project.
+Datashader is part of the `HoloViz <https://holoviz.org>`_ ecosystem for making
+browser-based data visualization in Python easier to use, easier to learn, and more powerful.
+See `holoviz.org <http://holoviz.org>`_ for related packages that you can use with Datashader and
+`status.holoviz.org <http://status.holoviz.org>`_ for the current status of each HoloViz project.
 
-Datashader is supported and mantained by `Anaconda <https://anaconda.com>`_.
+Datashader is supported and maintained by `Anaconda <https://anaconda.com>`_.

doc/conf.py

@@ -11,9 +11,9 @@
 version = release  = __version__
 
 html_static_path += ['_static']
-html_theme = 'sphinx_pyviz_theme'
+html_theme = 'sphinx_holoviz_theme'
 html_theme_options = {
-    'logo': 'logo_horizontal.png',
+    'logo': 'logo_horizontal.svg',
     'include_logo_text': False,
     'favicon': 'favicon.ico',
     'primary_color': '#774c9a',
@@ -35,15 +35,15 @@
     'PROJECT': project,
     'DESCRIPTION': description,
     'AUTHOR': authors,
-    'WEBSITE_SERVER': 'http://datashader.org',
+    'WEBSITE_SERVER': 'https://datashader.org',
     'VERSION': version,
     'NAV': _NAV,
     'LINKS': _NAV,
     'SOCIAL': (
-        ('Github', 'https://github.com/bokeh/datashader/'),
+        ('Github', 'https://github.com/holoviz/datashader/'),
         ('Twitter', 'https://twitter.com/datashader/'),
         ('Gitter', 'https://gitter.im/pyviz/pyviz'),
-        ('PyViz', 'http://pyviz.org'),
+        ('HoloViz', 'https://holoviz.org'),
     )
 })
 

doc/getting_started/index.rst

@@ -1,8 +1,3 @@
-..
-   Originally generated by nbsite (0.5.2):
-     /Users/jsignell/conda/envs/earthml/envs/dsdocs/bin/nbsite generate-rst --org pyviz --project-name datashader --skip .*tiling.*
-   Will not subsequently be overwritten by nbsite, so can be edited.
-
 ***************
 Getting Started
 ***************
@@ -71,7 +66,7 @@ Developer Instructions
 
 2. Clone the datashader git repository if you do not already have it::
 
-    git clone git://github.com/pyviz/datashader.git
+    git clone git://github.com/holoviz/datashader.git
 
 3. Set up a new conda environment with all of the dependencies needed to run the examples::
 

examples/getting_started/2_Pipeline.ipynb

@@ -264,7 +264,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Currently only counts are supported for categories, but other reduction operators can be implemented as well (a [to-do item](https://github.com/pyviz/datashader/issues/140)).\n",
+    "Currently only counts are supported for categories, but other reduction operators can be implemented as well (a [to-do item](https://github.com/holoviz/datashader/issues/140)).\n",
     "\n",
     "You can then select a specific category or subset of them for further processing, where `.sum(dim='cat')` will collapse across such a subset to give a single aggregate array:"
    ]
@@ -513,7 +513,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "See [the API docs](http://datashader.readthedocs.org/en/latest/api.html#transfer-functions) for more details. Image composition operators to provide for the `how` argument of `tf.stack` (e.g. `over` (default), `source`, `add`, and `saturate`) are listed in [composite.py](https://raw.githubusercontent.com/pyviz/datashader/master/datashader/composite.py) and illustrated [here](http://cairographics.org/operators).\n",
+    "See [the API docs](https://datashader.org/api.html#transfer-functions) for more details. Image composition operators to provide for the `how` argument of `tf.stack` (e.g. `over` (default), `source`, `add`, and `saturate`) are listed in [composite.py](https://raw.githubusercontent.com/holoviz/datashader/master/datashader/composite.py) and illustrated [here](http://cairographics.org/operators).\n",
     "\n",
     "## Moving on\n",
     "\n",

examples/getting_started/3_Interactivity.ipynb

@@ -6,7 +6,7 @@
    "source": [
     "The [previous notebook](2-Pipeline.ipynb) showed all the steps required to get a Datashader rendering of your dataset, yielding raster images displayed using [Jupyter](http://jupyter.org)'s \"rich display\" support.  However, these bare images do not show the data ranges or axis labels, making them difficult to interpret.  Moreover, they are only static images, and datasets often need to be explored at multiple scales, which is much easier to do in an interactive program.  \n",
     "\n",
-    "To get axes and interactivity, the images generated by Datashader need to be embedded into a plot using an external library like [Matplotlib](http://matplotlib.org) or [Bokeh](http://bokeh.pydata.org). As we illustrate below, the most convenient way to make Datashader plots using these libraries is via the [HoloViews](http://holoviews.org) high-level data-science API. Plotly also includes Datashader support for Plotly, and native Datashader support for Matplotlib has been [sketched](https://github.com/pyviz/datashader/pull/200) but is not yet released.\n"
+    "To get axes and interactivity, the images generated by Datashader need to be embedded into a plot using an external library like [Matplotlib](http://matplotlib.org) or [Bokeh](http://bokeh.pydata.org). As we illustrate below, the most convenient way to make Datashader plots using these libraries is via the [HoloViews](http://holoviews.org) high-level data-science API. Plotly also includes Datashader support for Plotly, and native Datashader support for Matplotlib has been [sketched](https://github.com/holoviz/datashader/pull/200) but is not yet released.\n"
    ]
   },
   {
@@ -15,7 +15,7 @@
    "source": [
     "# Embedding Datashader with HoloViews\n",
     "\n",
-    "[HoloViews](http://holoviews.org) (1.7 and later) is a high-level data analysis and visualization library that makes it simple to generate interactive [Datashader](https://github.com/pyviz/datashader)-based plots.  Here's an illustration of how this all fits together when using HoloViews+[Bokeh](http://bokeh.pydata.org):\n",
+    "[HoloViews](http://holoviews.org) (1.7 and later) is a high-level data analysis and visualization library that makes it simple to generate interactive [Datashader](https://github.com/holoviz/datashader)-based plots.  Here's an illustration of how this all fits together when using HoloViews+[Bokeh](http://bokeh.pydata.org):\n",
     "\n",
     "  ![Datashader+Holoviews+Bokeh](../assets/images/ds_hv_bokeh.png)\n",
     "\n",

examples/index.ipynb

@@ -14,8 +14,8 @@
     "relationships of interest in a principled way.\n",
     "\n",
     "The computation-intensive steps in this process are written in Python\n",
-    "but transparently compiled to machine code using [Numba](http://numba.pydata.org) and flexibly\n",
-    "distributed across cores and processors using [Dask](http://dask.pydata.org), providing a\n",
+    "but transparently compiled to machine code using [Numba](https://numba.pydata.org) and flexibly\n",
+    "distributed across cores and processors using [Dask](https://dask.org), providing a\n",
     "highly optimized rendering pipeline that makes it practical to work\n",
     "with extremely large datasets even on standard hardware.\n",
     "\n",
@@ -58,8 +58,8 @@
     "\n",
     "## Installation\n",
     "\n",
-    "Please follow the instructions on [Getting Started](http://datashader.org/getting_started)\n",
-    "if you want to reproduce the specific examples on this website, or follow the instructions at [PyViz.org](http://pyviz.org) if you want to try out Datashader together with related plotting tools.\n",
+    "Please follow the instructions on [Getting Started](https://datashader.org/getting_started)\n",
+    "if you want to reproduce the specific examples on this website, or follow the instructions at [HoloViz.org](https://holoviz.org) if you want to try out Datashader together with related plotting tools.\n",
     "\n",
     "\n",
     "\n",
@@ -73,7 +73,7 @@
     "Some of the original ideas for datashader were developed under the\n",
     "name Abstract Rendering, which is described in a [2014 SPIE VDA paper](http://spie.org/Publications/Proceedings/Paper/10.1117/12.2041200).\n",
     "\n",
-    "The source code for datashader is maintained at our [Github site,](https://github.com/pyviz/datashader) and\n",
+    "The source code for datashader is maintained on [Github](https://github.com/holoviz/datashader), and\n",
     "is documented using the API link on this page.\n",
     "\n",
     "We recommend the [Getting Started Guide](getting_started) to learn\n",
@@ -85,7 +85,7 @@
     "Datashader, but the same information is available more conveniently via\n",
     "the `help()` command as needed when using each component.\n",
     "\n",
-    "Please feel free to report [issues](https://github.com/pyviz/datashader/issues) or [contribute code](https://help.github.com/articles/about-pull-requests). You are also welcome to chat with the developers on [gitter](https://gitter.im/pyviz/pyviz).\n"
+    "Please feel free to report [issues](https://github.com/holoviz/datashader/issues) or [contribute code](https://help.github.com/articles/about-pull-requests). You are also welcome to chat with the developers on [gitter](https://gitter.im/pyviz/pyviz).\n"
    ]
   }
  ],

examples/user_guide/10_Performance.ipynb

@@ -72,8 +72,8 @@
     ">>> agg = cvs.points(dask_df, ...)\n",
     "```\n",
     "\n",
-    "  [Benchmarking]: https://github.com/pyviz/datashader/issues/313\n",
-    "  [testing with various file formats]: https://github.com/pyviz/datashader/issues/129\n",
+    "  [Benchmarking]: https://github.com/holoviz/datashader/issues/313\n",
+    "  [testing with various file formats]: https://github.com/holoviz/datashader/issues/129\n",
     "  [Apache Parquet]: https://parquet.apache.org/\n",
     "  [fastparquet]: https://github.com/dask/fastparquet"
    ]