From f9307fd2867bdb8c2e69f81805e53fa4bc1b6a2c Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@google.com>
Date: Thu, 2 Dec 2021 20:23:56 -0800
Subject: [PATCH 1/7] ENH: track JS versions in default HTML display

---
 altair/utils/html.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/altair/utils/html.py b/altair/utils/html.py
index 301e9e41c..1aa507e9c 100644
--- a/altair/utils/html.py
+++ b/altair/utils/html.py
@@ -85,6 +85,7 @@
     """
 <div id="{{ output_div }}"></div>
 <script type="text/javascript">
+  var VEGA_DEBUG = (typeof VEGA_DEBUG == "undefined") ? {} : VEGA_DEBUG;
   (function(spec, embedOpt){
     let outputDiv = document.currentScript.previousElementSibling;
     if (outputDiv.id !== "{{ output_div }}") {
@@ -97,15 +98,21 @@
       "vega-embed": "{{ base_url }}/vega-embed@{{ vegaembed_version }}?noext",
     };
 
-    function loadScript(lib) {
-      return new Promise(function(resolve, reject) {
-        var s = document.createElement('script');
-        s.src = paths[lib];
-        s.async = true;
-        s.onload = () => resolve(paths[lib]);
-        s.onerror = () => reject(`Error loading script: ${paths[lib]}`);
-        document.getElementsByTagName("head")[0].appendChild(s);
-      });
+    function maybeLoadScript(lib, version) {
+      var key = `${lib.replace("-", "")}_version`;
+      return (VEGA_DEBUG[key] == version) ?
+        Promise.resolve(paths[lib]) :
+        new Promise(function(resolve, reject) {
+          var s = document.createElement('script');
+          document.getElementsByTagName("head")[0].appendChild(s);
+          s.async = true;
+          s.onload = () => {
+            VEGA_DEBUG[key] = version;
+            return resolve(paths[lib]);
+          };
+          s.onerror = () => reject(`Error loading script: ${paths[lib]}`);
+          s.src = paths[lib];
+        });
     }
 
     function showError(err) {
@@ -121,12 +128,10 @@
     if(typeof define === "function" && define.amd) {
       requirejs.config({paths});
       require(["vega-embed"], displayChart, err => showError(`Error loading script: ${err.message}`));
-    } else if (typeof vegaEmbed === "function") {
-      displayChart(vegaEmbed);
     } else {
-      loadScript("vega")
-        .then(() => loadScript("vega-lite"))
-        .then(() => loadScript("vega-embed"))
+      maybeLoadScript("vega", "{{vega_version}}")
+        .then(() => maybeLoadScript("vega-lite", "{{vegalite_version}}"))
+        .then(() => maybeLoadScript("vega-embed", "{{vegaembed_version}}"))
         .catch(showError)
         .then(() => displayChart(vegaEmbed));
     }

From 77bf79eb5d3cb44fb9ce974de766aba6f0a4c327 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@google.com>
Date: Mon, 13 Dec 2021 06:51:20 -0800
Subject: [PATCH 2/7] MAINT: pin mistune in dev requirements

---
 requirements_dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements_dev.txt b/requirements_dev.txt
index 10ee2f58b..5383e908c 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -4,6 +4,7 @@ ipython
 flake8
 pytest
 sphinx
+mistune<2.0.0  # necessary for m2r v0.2
 m2r
 vega_datasets
 recommonmark

From 64b79f7ec95157c6479b61dd81131bed597a1da4 Mon Sep 17 00:00:00 2001
From: mattijn <mattijn@gmail.com>
Date: Mon, 13 Dec 2021 17:17:47 +0100
Subject: [PATCH 3/7] Update customization.rst (#2531)

remove note about `rangeStep`
---
 doc/user_guide/customization.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/user_guide/customization.rst b/doc/user_guide/customization.rst
index e128a69b8..b2ac50e40 100644
--- a/doc/user_guide/customization.rst
+++ b/doc/user_guide/customization.rst
@@ -512,10 +512,6 @@ Here is an example of setting the step width for a discrete scale:
 
 The width of the bars are set using ``mark_bar(size=30)`` and the width that is allocated for each bar bar in the the chart is set using ``width=alt.Step(100)``
 
-.. note::
-
-   If both ``width`` and ``rangeStep`` are specified, then ``rangeStep`` will be ignored.
-
 
 .. _customization-chart-size:
 

From 92905934e7652832276744cdb7c7ab9e9e05b747 Mon Sep 17 00:00:00 2001
From: Jake Vanderplas <jakevdp@gmail.com>
Date: Sun, 19 Dec 2021 06:01:52 -0800
Subject: [PATCH 4/7] MAINT: remove upper restriction on jsonschema version
 (#2537)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index a5edc9aa8..c6925037f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 entrypoints
 jinja2
-jsonschema>=3.0,<4.0
+jsonschema>=3.0
 numpy
 pandas>=0.18
 toolz

From c1523443f2a3c15c6181a3a7a154351518784df7 Mon Sep 17 00:00:00 2001
From: Jake Vanderplas <jakevdp@gmail.com>
Date: Mon, 20 Dec 2021 09:31:00 -0800
Subject: [PATCH 5/7] Add pyramid example (#2538)

---
 altair/examples/pyramid.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 altair/examples/pyramid.py

diff --git a/altair/examples/pyramid.py b/altair/examples/pyramid.py
new file mode 100644
index 000000000..a53b90e05
--- /dev/null
+++ b/altair/examples/pyramid.py
@@ -0,0 +1,19 @@
+"""
+Pyramid Pie Chart
+-----------------
+Altair reproduction of http://robslink.com/SAS/democd91/pyramid_pie.htm
+"""
+import altair as alt
+import pandas as pd
+
+category = ['Sky', 'Shady side of a pyramid', 'Sunny side of a pyramid']
+color = ["#416D9D", "#674028", "#DEAC58"]
+df = pd.DataFrame({'category': category, 'value': [75, 10, 15]})
+
+alt.Chart(df).mark_arc(outerRadius=80).encode(
+    alt.Theta('value:Q', scale=alt.Scale(range=[2.356, 8.639])),
+    alt.Color('category:N',
+        scale=alt.Scale(domain=category, range=color),
+        legend=alt.Legend(title=None, orient='none', legendX=160, legendY=50)),
+    order='value:Q'
+).properties(width=150, height=150).configure_view(strokeOpacity=0)
\ No newline at end of file

From 082d8a04f75418295b456cbac7abb91f9e45ef6a Mon Sep 17 00:00:00 2001
From: Jake Vanderplas <jakevdp@gmail.com>
Date: Wed, 29 Dec 2021 05:04:42 -0800
Subject: [PATCH 6/7] MAINT: fix some doc/build issues (#2542)

---
 altair/examples/line_with_log_scale.py | 2 +-
 doc/Makefile                           | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/altair/examples/line_with_log_scale.py b/altair/examples/line_with_log_scale.py
index a47cd40cd..b45fcd92e 100644
--- a/altair/examples/line_with_log_scale.py
+++ b/altair/examples/line_with_log_scale.py
@@ -1,7 +1,7 @@
 """
 Line Chart with Logarithmic Scale
 ---------------------------------
-How to make a line chart on a `<Logarithmic scale> https://en.wikipedia.org/wiki/Logarithmic_scale`_.
+How to make a line chart on a `Logarithmic scale <https://en.wikipedia.org/wiki/Logarithmic_scale>`_.
 """
 # category: line charts
 import altair as alt
diff --git a/doc/Makefile b/doc/Makefile
index 461a1992c..929e7fe22 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -67,18 +67,21 @@ clean-all: clean clean-generated clean-images
 
 .PHONY: html
 html:
+	mkdir -p _images
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
 .PHONY: dirhtml
 dirhtml:
+	mkdir -p _images
 	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
 
 .PHONY: singlehtml
 singlehtml:
+	mkdir -p _images
 	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
 	@echo
 	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."

From d44c14881db5d20fafe4c7bd3f7b85987fa64b93 Mon Sep 17 00:00:00 2001
From: Jake VanderPlas <jakevdp@google.com>
Date: Wed, 29 Dec 2021 05:19:47 -0800
Subject: [PATCH 7/7] MAINT: bump version to 4.2.0

---
 altair/__init__.py       | 2 +-
 doc/conf.py              | 2 +-
 doc/releases/changes.rst | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/altair/__init__.py b/altair/__init__.py
index f061cb9b3..7079e8ccc 100644
--- a/altair/__init__.py
+++ b/altair/__init__.py
@@ -1,5 +1,5 @@
 # flake8: noqa
-__version__ = "4.2.0.dev0"
+__version__ = "4.2.0"
 
 from .vegalite import *
 from . import examples
diff --git a/doc/conf.py b/doc/conf.py
index 336d55d0d..0344be5f9 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -73,7 +73,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = "4.2.0.dev0"
+version = "4.2.0"
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/doc/releases/changes.rst b/doc/releases/changes.rst
index 69bf73d96..341ab30d6 100644
--- a/doc/releases/changes.rst
+++ b/doc/releases/changes.rst
@@ -3,8 +3,8 @@
 Altair Change Log
 =================
 
-Version 4.2.0 (unreleased)
---------------------------
+Version 4.2.0 (released Dec 29, 2021)
+-------------------------------------
 - Update Vega-Lite from version 4.8.1 to version 4.17.0;
   see `Vega-Lite Release Notes <https://github.com/vega/vega-lite/releases>`_.