From 20281c5f20280d9093e2ea3cac049f52b39ba5b2 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 18 Dec 2017 18:16:37 -0800
Subject: [PATCH] Proper pydruid and druiddb deps (#98)

---
 ops/config/states/superset/init.sls | 5 +++++
 requirements.in                     | 3 +--
 requirements.txt                    | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ops/config/states/superset/init.sls b/ops/config/states/superset/init.sls
index f4e38daa552b8..8998774dc9122 100644
--- a/ops/config/states/superset/init.sls
+++ b/ops/config/states/superset/init.sls
@@ -33,6 +33,11 @@ Install superset submodule:
    - name: sudo /usr/local/bin/service_venv pip install --use-wheel upstream/
    - cwd: /srv/service/next
 
+Install future pydruid:
+ cmd.run:
+   - name: sudo /usr/local/bin/service_venv pip install http://github.com/mistercrunch/pydruid/tarball/master
+   - cwd: /srv/service/next
+
 Ensure database is upgraded:
  cmd.run:
    - name: /usr/local/bin/service_venv superset db upgrade
diff --git a/requirements.in b/requirements.in
index 9c61658cd47af..6ce77bcaac946 100644
--- a/requirements.in
+++ b/requirements.in
@@ -131,5 +131,4 @@ s3werkzeugcache==0.1.1
 # oauth
 flask-oauthlib
 
-# pydruid
--e git+https://github.com/mistercrunch/pydruid.git@0.3.2beta#egg=pydruid-0.3.2beta
+druiddb
diff --git a/requirements.txt b/requirements.txt
index ae6b789c09e6c..6d9ef0e10a88e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@
 #
 #    control run piptools.compile superset-private
 #
--e git+https://github.com/mistercrunch/pydruid.git@0.3.2beta#egg=pydruid-0.3.2beta
 -e git+git://github.com/lyft/pylint@lyft_pylint#egg=pylint
 amqp==1.4.9
 anyjson==0.3.3
@@ -27,6 +26,7 @@ configparser==3.5.0       # via flake8
 coverage==4.4.1           # via pytest-cov
 cryptography==1.9
 docutils==0.14            # via botocore
+druiddb==0.1.9
 enum34==1.1.6
 flake8-tidy-imports==1.0.6
 flake8==3.3.0
@@ -35,6 +35,7 @@ flask-oauthlib==0.9.4
 flask-script==2.0.5
 flask==0.12.2             # via flask-cache, flask-oauthlib, flask-script
 funcsigs==1.0.2           # via mock
+future-fstrings==0.4.1    # via druiddb
 future==0.16.0            # via pyhive
 futures==3.1.1            # via s3transfer
 gevent==1.2.1
@@ -82,13 +83,14 @@ pyyaml==3.12
 rainbow-saddle==0.4.0
 redis==2.10.6
 requests-oauthlib==0.8.0  # via flask-oauthlib
-requests==2.17.3          # via lyft-requests, requests-oauthlib
+requests==2.17.3          # via druiddb, lyft-requests, requests-oauthlib
 s3transfer==0.1.11        # via boto3
 s3werkzeugcache==0.1.1
 six==1.10.0
 sqlalchemy-redshift==0.7.0
 sqlalchemy==1.1.9         # via sqlalchemy-redshift
 statsd==3.2.1
+tokenize-rt==2.0.1        # via future-fstrings
 typing==3.6.1
 ujson==1.35               # via lyft-stdlib
 urllib3==1.21.1           # via requests