Merge pull request #923 from jakevdp/vl-2.5

WIP: update Vega-Lite to version 2.5
vega · Jun 12, 2018 · 1e62dc0 · 1e62dc0
2 parents 040b570 + c62b5b2
commit 1e62dc0
Show file tree

Hide file tree

Showing 9 changed files with 1,287 additions and 649 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,6 +2,14 @@
 
 ## Version 2.2.0 (Unreleased):
 
+### Maintenance
+
+- update to Vega-Lite 2.5.2; see vega-lite change-logs [2.5.0](https://github.com/vega/vega-lite/releases/tag/v2.5.0) [2.5.1](https://github.com/vega/vega-lite/releases/tag/v2.5.1) [2.5.2](https://github.com/vega/vega-lite/releases/tag/v2.5.2)
+
+### Backward-incompatible changes
+
+- ``alt.SortField`` renamed to ``alt.EncodingSortField`` and ``alt.WindowSortField`` renamed to ``alt.SortField`` (https://github.com/vega/vega-lite/pull/3741)
+
 ## Version 2.1.0 (Released June 6, 2018):
 
 ### Enhancements

diff --git a/altair/vegalite/v2/examples/beckers_barley_trellis_plot.py b/altair/vegalite/v2/examples/beckers_barley_trellis_plot.py
@@ -13,7 +13,7 @@
     alt.X('median(yield)', scale=alt.Scale(zero=False)),
     alt.Y(
         'variety',
-        sort=alt.SortField(field='yield', op='median', order='descending'),
+        sort=alt.EncodingSortField(field='yield', op='median', order='descending'),
         scale=alt.Scale(rangeStep=20)
     ),
     color='year:N',

diff --git a/altair/vegalite/v2/schema/__init__.py b/altair/vegalite/v2/schema/__init__.py
@@ -1,5 +1,5 @@
 # flake8: noqa
 from .core import *
 from .channels import *
-SCHEMA_VERSION = 'v2.4.3'
-SCHEMA_URL = 'https://vega.github.io/schema/vega-lite/v2.4.3.json'
+SCHEMA_VERSION = 'v2.5.2'
+SCHEMA_URL = 'https://vega.github.io/schema/vega-lite/v2.5.2.json'
diff --git a/altair/vegalite/v2/schema/channels.py b/altair/vegalite/v2/schema/channels.py
diff --git a/altair/vegalite/v2/schema/core.py b/altair/vegalite/v2/schema/core.py
diff --git a/altair/vegalite/v2/schema/mixins.py b/altair/vegalite/v2/schema/mixins.py
diff --git a/altair/vegalite/v2/schema/vega-lite-schema.json b/altair/vegalite/v2/schema/vega-lite-schema.json
diff --git a/doc/user_guide/transform.rst b/doc/user_guide/transform.rst
@@ -251,7 +251,9 @@ expressions and objects:
 
 1. A `Vega expression`_ expressed as a string or built using the :mod:`~expr` module
 2. A Field predicate, such as :class:`~FieldOneOfPredicate`,
-   :class:`~FieldRangePredicate`, or :class:`~FieldEqualPredicate`
+   :class:`~FieldRangePredicate`, :class:`~FieldEqualPredicate`,
+   :class:`~FieldLTPredicate`, :class:`~FieldGTPredicate`,
+   :class:`~FieldLTEPredicate`, :class:`~FieldGTEPredicate`,
 3. A Selection predicate or object created by :func:`selection`
 4. A Logical operand that combines any of the above
 
@@ -295,6 +297,14 @@ are:
   specified values.
 - :class:`~FieldRangePredicate` evaluates whether a continuous field is within
   a range of values.
+- :class:`~FieldLTPredicate` evaluates whether a continuous field is less
+  than a given value
+- :class:`~FieldGTPredicate` evaluates whether a continuous field is greater
+  than a given value
+- :class:`~FieldLTEPredicate` evaluates whether a continuous field is less
+  than or equal to a given value
+- :class:`~FieldGTEPredicate` evaluates whether a continuous field is greater
+  than or equal to a given value
 
 Here is an examaple of a :class:`~FieldEqualPredicate` used to select just the
 values from year 2000 as in the above chart:

diff --git a/tools/generate_schema_wrapper.py b/tools/generate_schema_wrapper.py
@@ -41,7 +41,7 @@ def schema_class(*args, **kwargs):
     },
     'vega-lite': {
         'v1': 'v1.3.1',
-        'v2': 'v2.4.3'
+        'v2': 'v2.5.2'
     }
 }