From 9129a65b885053cb7571e00d5b003106e436ca0b Mon Sep 17 00:00:00 2001
From: Lorenz Diener <lorenzd@gmail.com>
Date: Sat, 22 Jun 2019 15:34:59 +0200
Subject: Make blurhash a feature dependency

---
 Pipfile.lock   | 47 ++++++++++++++++++++---------------------------
 docs/index.rst |  1 +
 setup.py       | 10 +++++++---
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/Pipfile.lock b/Pipfile.lock
index 2fef63c..afe5399 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -29,19 +29,12 @@
             ],
             "version": "==19.1.0"
         },
-        "blurhash": {
-            "hashes": [
-                "sha256:a0dd5ead974112838a4fd6bbbb680e4a7403bdb072137afc44db0eca0d14b15c",
-                "sha256:e0eb2ee8122963d419338fa4c3c249e22b0be413e63873757fd1b0007c04e5cd"
-            ],
-            "version": "==1.1.3"
-        },
         "certifi": {
             "hashes": [
-                "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5",
-                "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae"
+                "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939",
+                "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695"
             ],
-            "version": "==2019.3.9"
+            "version": "==2019.6.16"
         },
         "chardet": {
             "hashes": [
@@ -102,10 +95,10 @@
         },
         "importlib-metadata": {
             "hashes": [
-                "sha256:a9f185022cfa69e9ca5f7eabfd5a58b689894cb78a11e3c8c89398a8ccbb8e7f",
-                "sha256:df1403cd3aebeb2b1dcd3515ca062eecb5bd3ea7611f18cba81130c68707e879"
+                "sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7",
+                "sha256:cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db"
             ],
-            "version": "==0.17"
+            "version": "==0.18"
         },
         "mastodon-py": {
             "editable": true,
@@ -232,19 +225,19 @@
         },
         "pyyaml": {
             "hashes": [
-                "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c",
-                "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95",
-                "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2",
-                "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4",
-                "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad",
-                "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba",
-                "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1",
-                "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e",
-                "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673",
-                "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13",
-                "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19"
+                "sha256:57acc1d8533cbe51f6662a55434f0dbecfa2b9eaf115bede8f6fd00115a0c0d3",
+                "sha256:588c94b3d16b76cfed8e0be54932e5729cc185caffaa5a451e7ad2f7ed8b4043",
+                "sha256:68c8dd247f29f9a0d09375c9c6b8fdc64b60810ebf07ba4cdd64ceee3a58c7b7",
+                "sha256:70d9818f1c9cd5c48bb87804f2efc8692f1023dac7f1a1a5c61d454043c1d265",
+                "sha256:86a93cccd50f8c125286e637328ff4eef108400dd7089b46a7be3445eecfa391",
+                "sha256:a0f329125a926876f647c9fa0ef32801587a12328b4a3c741270464e3e4fa778",
+                "sha256:a3c252ab0fa1bb0d5a3f6449a4826732f3eb6c0270925548cac342bc9b22c225",
+                "sha256:b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955",
+                "sha256:cd0618c5ba5bda5f4039b9398bb7fb6a317bb8298218c3de25c47c4740e4b95e",
+                "sha256:ceacb9e5f8474dcf45b940578591c7f3d960e82f926c707788a570b51ba59190",
+                "sha256:fe6a88094b64132c4bb3b631412e90032e8cfe9745a58370462240b8cb7553cd"
             ],
-            "version": "==5.1"
+            "version": "==5.1.1"
         },
         "requests": {
             "hashes": [
@@ -285,9 +278,9 @@
         },
         "wrapt": {
             "hashes": [
-                "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533"
+                "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1"
             ],
-            "version": "==1.11.1"
+            "version": "==1.11.2"
         },
         "yarl": {
             "hashes": [
diff --git a/docs/index.rst b/docs/index.rst
index 45d8202..898c09a 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1073,6 +1073,7 @@ These functions allow for convenient retrieval of paginated data.
 Blurhash decoding
 -----------------
 This function allows for easy basic decoding of blurhash strings to images.
+This requires Mastodon.pys optional "blurhash" feature dependencies.
 
 .. automethod:: Mastodon.decode_blurhash
 
diff --git a/setup.py b/setup.py
index 524a3c7..7f5c783 100644
--- a/setup.py
+++ b/setup.py
@@ -15,9 +15,14 @@ webpush_deps = [
     'cryptography>=1.6.0',
 ]
 
+blurhash_deps = [
+    'blurhash>=1.1.3',
+]
+
 extras = {
-      "test": test_deps + webpush_deps,
-      "webpush": webpush_deps,
+    "test": test_deps + webpush_deps + blurhash_deps,
+    "webpush": webpush_deps,
+    "blurhash": blurhash_deps,
 }
 
 setup(name='Mastodon.py',
@@ -31,7 +36,6 @@ setup(name='Mastodon.py',
           'pytz',
           'python-magic',
           'decorator>=4.0.0', 
-          'blurhash>=1.1.3',
       ],
       tests_require=test_deps,
       extras_require=extras,
-- 
cgit v1.2.3