From f5f93faeebb5559a2ca93cefc458e16f60d81185 Mon Sep 17 00:00:00 2001
From: UK992 <urbankrajnc92@gmail.com>
Date: Sat, 25 Feb 2017 06:41:05 -0800
Subject: [PATCH] servo: Merge #15731 - Update `servo-tidy` to 0.3.0 (from
 UK992:tidy); r=Wafflespeanut

r? @Wafflespeanut

It's ready to publishing to PyPI.

Source-Repo: https://github.com/servo/servo
Source-Revision: 524ba6a442f3215935f0b80b8b198eef096363bb

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : d287c6e99677b67c888cd9a0b9d9ac3cd3d2b53f
---
 servo/python/tidy/HISTORY.rst | 12 +++++++++++-
 servo/python/tidy/README.rst  | 23 ++++++++++++++++-------
 servo/python/tidy/setup.py    |  4 ++--
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/servo/python/tidy/HISTORY.rst b/servo/python/tidy/HISTORY.rst
index bc36c7e908fc..e2330d8ad330 100644
--- a/servo/python/tidy/HISTORY.rst
+++ b/servo/python/tidy/HISTORY.rst
@@ -1,7 +1,17 @@
 Release History
 ---------------
 
-0.1.0 (2016-08-09)
+0.3.0 (2017-02-24)
+++++++++++++++++++
+
+- Added checking for blocked packages
+- Added checking for alphabetical order for JSON keys and ``#![feature(...)]``
+- Improved duplicated packages checking
+- Improved ordering ``use`` statements
+- Allow tidy to run custom project-specific lints
+- And many other improvements
+
+0.2.0 (2016-08-09)
 ++++++++++++++++++
 
 - Improve license checking to disregard comments and line breaks
diff --git a/servo/python/tidy/README.rst b/servo/python/tidy/README.rst
index c296afd09a0c..06c0bc71309a 100644
--- a/servo/python/tidy/README.rst
+++ b/servo/python/tidy/README.rst
@@ -3,15 +3,24 @@ servo_tidy
 
 Servo's code and license checker.
 
-Install from PyPI (coming soon) or
+Installation
+++++++++++++
 
-```
-pip install -e git+https://github.com/servo/servo.git#egg=servo_tidy&subdirectory=python/tidy
-```
+Install from PyPI:
+
+::
+
+  pip install servo-tidy
+
+or from git:
+
+::
+
+  pip install -e git+https://github.com/servo/servo.git#egg=servo_tidy&subdirectory=python/tidy
 
 To run the tests
 ++++++++++++++++
 
-```
-./mach test-tidy --self-test
-```
+::
+
+  ./mach test-tidy --self-test
diff --git a/servo/python/tidy/setup.py b/servo/python/tidy/setup.py
index 0f7e125f0852..c761bea7b2f2 100644
--- a/servo/python/tidy/setup.py
+++ b/servo/python/tidy/setup.py
@@ -11,11 +11,11 @@ import os
 from setuptools import setup, find_packages
 
 
-VERSION = '0.2.0'
+VERSION = '0.3.0'
 
 install_requires = [
     "flake8==2.4.1",
-    "toml==0.9.1",
+    "toml==0.9.2",
     "colorama==0.3.7",
 ]