From 0c2e5539cef7e80fb93f2018b370af78dc1d4ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Bournhonesque?= <raphael@bournhonesque.eu>
Date: Sat, 28 Jan 2017 18:38:14 +0100
Subject: [PATCH] Specify version number for ujson and plac

The required version was specified for plac in requirements.txt but not in setup.py, which could cause a conflicting version error.
Similarly, set the version of ujson in requirements.txt to be the same as in setup.py
---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 8e318bc05..538862aed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,6 @@ thinc>=6.2.0,<6.3.0
 murmurhash>=0.26,<0.27
 plac<0.9.3
 six
-ujson
+ujson>=1.35
 cloudpickle
 sputnik>=0.9.2,<0.10.0
diff --git a/setup.py b/setup.py
index ef4e14020..70099da0a 100644
--- a/setup.py
+++ b/setup.py
@@ -234,7 +234,7 @@ def setup_package():
                 'cymem>=1.30,<1.32',
                 'preshed>=0.46.0,<0.47.0',
                 'thinc>=6.2.0,<6.3.0',
-                'plac',
+                'plac<0.9.3',
                 'six',
                 'cloudpickle',
                 'pathlib',