From bf3659d3cf2dbc5516bc949dd72bec592881b213 Mon Sep 17 00:00:00 2001
From: Flynn <crf204@gmail.com>
Date: Thu, 11 Jul 2019 21:04:25 -0400
Subject: [PATCH] resolve version conflicts

---
 poetry.lock    | 105 ++++++++++++++-----------------------------------
 pyproject.toml |   4 +-
 2 files changed, 32 insertions(+), 77 deletions(-)

diff --git a/poetry.lock b/poetry.lock
index c78a52b..97b060c 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1,6 +1,7 @@
 [[package]]
 category = "dev"
 description = "A configurable sidebar-enabled Sphinx theme"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "alabaster"
 optional = false
 python-versions = "*"
@@ -18,6 +19,7 @@ version = "1.4.3"
 [[package]]
 category = "dev"
 description = "An unobtrusive argparse wrapper with natural syntax"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "argh"
 optional = false
 python-versions = "*"
@@ -42,6 +44,7 @@ version = "19.1.0"
 [[package]]
 category = "dev"
 description = "Internationalization utilities"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "babel"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
@@ -165,6 +168,7 @@ version = "2.8"
 [[package]]
 category = "dev"
 description = "Getting image size from png/jpeg/jpeg2000/gif file"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "imagesize"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
@@ -192,6 +196,7 @@ version = "*"
 [[package]]
 category = "dev"
 description = "A small but fast and easy to use stand-alone template engine written in pure python."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "jinja2"
 optional = false
 python-versions = "*"
@@ -203,6 +208,7 @@ MarkupSafe = ">=0.23"
 [[package]]
 category = "dev"
 description = "Python LiveReload is an awesome tool for web developers"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "livereload"
 optional = false
 python-versions = "*"
@@ -215,6 +221,7 @@ tornado = "*"
 [[package]]
 category = "dev"
 description = "Safely add untrusted strings to HTML/XML markup."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "markupsafe"
 optional = false
 python-versions = ">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*"
@@ -263,6 +270,7 @@ version = "*"
 [[package]]
 category = "dev"
 description = "File system general utilities"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "pathtools"
 optional = false
 python-versions = "*"
@@ -290,6 +298,7 @@ importlib-metadata = ">=0.12"
 [[package]]
 category = "dev"
 description = "Utility that helps with local TCP ports managment. It can find an unused TCP localhost port and remember the association."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "port-for"
 optional = false
 python-versions = "*"
@@ -369,6 +378,7 @@ pytest = ">=3.6"
 [[package]]
 category = "dev"
 description = "World timezone definitions, modern and historical"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "pytz"
 optional = false
 python-versions = "*"
@@ -377,6 +387,7 @@ version = "2019.1"
 [[package]]
 category = "dev"
 description = "YAML parser and emitter for Python"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "pyyaml"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
@@ -396,20 +407,6 @@ bleach = ">=2.1.0"
 docutils = ">=0.13.1"
 six = "*"
 
-[[package]]
-category = "dev"
-description = "Python HTTP for Humans."
-name = "requests"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "2.21.0"
-
-[package.dependencies]
-certifi = ">=2017.4.17"
-chardet = ">=3.0.2,<3.1.0"
-idna = ">=2.5,<2.9"
-urllib3 = ">=1.21.1,<1.25"
-
 [[package]]
 category = "dev"
 description = "Python HTTP for Humans."
@@ -455,6 +452,7 @@ version = "1.12.0"
 [[package]]
 category = "dev"
 description = "This package provides 23 stemmers for 22 languages generated from Snowball algorithms."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "snowballstemmer"
 optional = false
 python-versions = "*"
@@ -463,33 +461,7 @@ version = "1.9.0"
 [[package]]
 category = "dev"
 description = "Python documentation generator"
-name = "sphinx"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.8.5"
-
-[package.dependencies]
-Jinja2 = ">=2.3"
-Pygments = ">=2.0"
-alabaster = ">=0.7,<0.8"
-babel = ">=1.3,<2.0 || >2.0"
-colorama = ">=0.3.5"
-docutils = ">=0.11"
-imagesize = "*"
-packaging = "*"
-requests = ">=2.0.0"
-setuptools = "*"
-six = ">=1.5"
-snowballstemmer = ">=1.1"
-sphinxcontrib-websupport = "*"
-
-[package.dependencies.typing]
-python = "<3.5"
-version = "*"
-
-[[package]]
-category = "dev"
-description = "Python documentation generator"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinx"
 optional = false
 python-versions = ">=3.5"
@@ -517,6 +489,7 @@ sphinxcontrib-serializinghtml = "*"
 [[package]]
 category = "dev"
 description = "Watch a Sphinx directory and rebuild the documentation when a change is detected. Also includes a livereload enabled web server."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinx-autobuild"
 optional = false
 python-versions = "*"
@@ -534,6 +507,7 @@ watchdog = ">=0.7.1"
 [[package]]
 category = "dev"
 description = "Read the Docs theme for Sphinx"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinx-rtd-theme"
 optional = false
 python-versions = "*"
@@ -545,6 +519,7 @@ sphinx = "*"
 [[package]]
 category = "dev"
 description = ""
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-applehelp"
 optional = false
 python-versions = "*"
@@ -553,6 +528,7 @@ version = "1.0.1"
 [[package]]
 category = "dev"
 description = ""
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-devhelp"
 optional = false
 python-versions = "*"
@@ -561,6 +537,7 @@ version = "1.0.1"
 [[package]]
 category = "dev"
 description = ""
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-htmlhelp"
 optional = false
 python-versions = "*"
@@ -569,6 +546,7 @@ version = "1.0.2"
 [[package]]
 category = "dev"
 description = "A sphinx extension which renders display math in HTML via JavaScript"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-jsmath"
 optional = false
 python-versions = ">=3.5"
@@ -577,6 +555,7 @@ version = "1.0.1"
 [[package]]
 category = "dev"
 description = ""
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-qthelp"
 optional = false
 python-versions = "*"
@@ -585,19 +564,12 @@ version = "1.0.2"
 [[package]]
 category = "dev"
 description = ""
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "sphinxcontrib-serializinghtml"
 optional = false
 python-versions = "*"
 version = "1.1.3"
 
-[[package]]
-category = "dev"
-description = "Sphinx API for Web Apps"
-name = "sphinxcontrib-websupport"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "1.1.2"
-
 [[package]]
 category = "dev"
 description = "Python Library for Tom's Obvious, Minimal Language"
@@ -610,10 +582,11 @@ version = "0.10.0"
 [[package]]
 category = "dev"
 description = "Tornado is a Python web framework and asynchronous networking library, originally developed at FriendFeed."
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "tornado"
 optional = false
-python-versions = ">= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*"
-version = "5.1.1"
+python-versions = ">= 3.5"
+version = "6.0.3"
 
 [[package]]
 category = "dev"
@@ -639,23 +612,6 @@ requests-toolbelt = ">=0.8.0,<0.9.0 || >0.9.0"
 setuptools = ">=0.7.0"
 tqdm = ">=4.14"
 
-[[package]]
-category = "dev"
-description = "Type Hints for Python"
-marker = "python_version < \"3.5\""
-name = "typing"
-optional = false
-python-versions = "*"
-version = "3.7.4"
-
-[[package]]
-category = "dev"
-description = "HTTP library with thread-safe connection pooling, file post, and more."
-name = "urllib3"
-optional = false
-python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4"
-version = "1.24.3"
-
 [[package]]
 category = "dev"
 description = "HTTP library with thread-safe connection pooling, file post, and more."
@@ -667,6 +623,7 @@ version = "1.25.3"
 [[package]]
 category = "dev"
 description = "Filesystem events monitoring"
+marker = "python_version >= \"3.7\" and python_version < \"4.0\""
 name = "watchdog"
 optional = false
 python-versions = "*"
@@ -702,7 +659,7 @@ python-versions = ">=2.7"
 version = "0.5.2"
 
 [metadata]
-content-hash = "e878e22acd88288deea2b128416a7e0ebfcbf8df8744f2bc3f61a98ca7e07ffe"
+content-hash = "f4eeb8cbd6e3054da15700274d433cb9e7afed74777e769494fcd73325ade6b7"
 python-versions = "~2.7 || ^3.4"
 
 [metadata.hashes]
@@ -744,12 +701,12 @@ pytest-cov = ["2b097cde81a302e1047331b48cadacf23577e431b61e9c6f49a1170bbe3d3da6"
 pytz = ["303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", "d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141"]
 pyyaml = ["57acc1d8533cbe51f6662a55434f0dbecfa2b9eaf115bede8f6fd00115a0c0d3", "588c94b3d16b76cfed8e0be54932e5729cc185caffaa5a451e7ad2f7ed8b4043", "68c8dd247f29f9a0d09375c9c6b8fdc64b60810ebf07ba4cdd64ceee3a58c7b7", "70d9818f1c9cd5c48bb87804f2efc8692f1023dac7f1a1a5c61d454043c1d265", "86a93cccd50f8c125286e637328ff4eef108400dd7089b46a7be3445eecfa391", "a0f329125a926876f647c9fa0ef32801587a12328b4a3c741270464e3e4fa778", "a3c252ab0fa1bb0d5a3f6449a4826732f3eb6c0270925548cac342bc9b22c225", "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955", "cd0618c5ba5bda5f4039b9398bb7fb6a317bb8298218c3de25c47c4740e4b95e", "ceacb9e5f8474dcf45b940578591c7f3d960e82f926c707788a570b51ba59190", "fe6a88094b64132c4bb3b631412e90032e8cfe9745a58370462240b8cb7553cd"]
 readme-renderer = ["bb16f55b259f27f75f640acf5e00cf897845a8b3e4731b5c1a436e4b8529202f", "c8532b79afc0375a85f10433eca157d6b50f7d6990f337fa498c96cd4bfc203d"]
-requests = ["502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", "7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b", "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", "9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"]
+requests = ["11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", "9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31"]
 requests-toolbelt = ["380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f", "968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"]
 scandir = ["2586c94e907d99617887daed6c1d102b5ca28f1085f90446554abf1faf73123e", "2ae41f43797ca0c11591c0c35f2f5875fa99f8797cb1a1fd440497ec0ae4b022", "2b8e3888b11abb2217a32af0766bc06b65cc4a928d8727828ee68af5a967fa6f", "2c712840c2e2ee8dfaf36034080108d30060d759c7b73a01a52251cc8989f11f", "4d4631f6062e658e9007ab3149a9b914f3548cb38bfb021c64f39a025ce578ae", "67f15b6f83e6507fdc6fca22fedf6ef8b334b399ca27c6b568cbfaa82a364173", "7d2d7a06a252764061a020407b997dd036f7bd6a175a5ba2b345f0a357f0b3f4", "8c5922863e44ffc00c5c693190648daa6d15e7c1207ed02d6f46a8dcc2869d32", "92c85ac42f41ffdc35b6da57ed991575bdbe69db895507af88b9f499b701c188", "b24086f2375c4a094a6b51e78b4cf7ca16c721dcee2eddd7aa6494b42d6d519d", "cb925555f43060a1745d0a321cca94bcea927c50114b623d73179189a4e100ac"]
 six = ["3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73"]
 snowballstemmer = ["9f3b9ffe0809d174f7047e121431acf99c89a7040f0ca84f94ba53a498e6d0c9"]
-sphinx = ["9f3e17c64b34afc653d7c5ec95766e03043cc6d80b0de224f59b6b6e19d37c3c", "c7658aab75c920288a8cf6f09f244c6cfdae30d82d803ac1634d9f223a80ca08", "22538e1bbe62b407cf5a8aabe1bb15848aa66bb79559f42f5202bbce6b757a69", "f9a79e746b87921cabc3baa375199c6076d1270cee53915dbd24fdbeaaacc427"]
+sphinx = ["22538e1bbe62b407cf5a8aabe1bb15848aa66bb79559f42f5202bbce6b757a69", "f9a79e746b87921cabc3baa375199c6076d1270cee53915dbd24fdbeaaacc427"]
 sphinx-autobuild = ["66388f81884666e3821edbe05dd53a0cfb68093873d17320d0610de8db28c74e", "e60aea0789cab02fa32ee63c7acae5ef41c06f1434d9fd0a74250a61f5994692"]
 sphinx-rtd-theme = ["00cf895504a7895ee433807c62094cf1e95f065843bf3acd17037c3e9a2becd4", "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"]
 sphinxcontrib-applehelp = ["edaa0ab2b2bc74403149cb0209d6775c96de797dfd5b5e2a71981309efab3897", "fb8dee85af95e5c30c91f10e7eb3c8967308518e0f7488a2828ef7bc191d0d5d"]
@@ -758,13 +715,11 @@ sphinxcontrib-htmlhelp = ["4670f99f8951bd78cd4ad2ab962f798f5618b17675c35c5ac3b21
 sphinxcontrib-jsmath = ["2ec2eaebfb78f3f2078e73666b1415417a116cc848b72e5172e596c871103178", "a9925e4a4587247ed2191a22df5f6970656cb8ca2bd6284309578f2153e0c4b8"]
 sphinxcontrib-qthelp = ["513049b93031beb1f57d4daea74068a4feb77aa5630f856fcff2e50de14e9a20", "79465ce11ae5694ff165becda529a600c754f4bc459778778c7017374d4d406f"]
 sphinxcontrib-serializinghtml = ["c0efb33f8052c04fd7a26c0a07f1678e8512e0faec19f4aa8f2473a8b81d5227", "db6615af393650bf1151a6cd39120c29abaf93cc60db8c48eb2dddbfdc3a9768"]
-sphinxcontrib-websupport = ["1501befb0fdf1d1c29a800fdbf4ef5dc5369377300ddbdd16d2cd40e54c6eefc", "e02f717baf02d0b6c3dd62cf81232ffca4c9d5c331e03766982e3ff9f1d2bc3f"]
 toml = ["229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", "235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", "f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3"]
-tornado = ["0662d28b1ca9f67108c7e3b77afabfb9c7e87bde174fbda78186ecedc2499a9d", "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409", "732e836008c708de2e89a31cb2fa6c0e5a70cb60492bee6f1ea1047500feaf7f", "8154ec22c450df4e06b35f131adc4f2f3a12ec85981a203301d310abf580500f", "8e9d728c4579682e837c92fdd98036bd5cdefa1da2aaf6acf26947e6dd0c01c5", "d4b3e5329f572f055b587efc57d29bd051589fb5a43ec8898c77a47ec2fa2bbb", "e5f2585afccbff22390cddac29849df463b252b711aa2ce7c5f3f342a5b3b444"]
+tornado = ["349884248c36801afa19e342a77cc4458caca694b0eda633f5878e458a44cb2c", "398e0d35e086ba38a0427c3b37f4337327231942e731edaa6e9fd1865bbd6f60", "4e73ef678b1a859f0cb29e1d895526a20ea64b5ffd510a2307b5998c7df24281", "559bce3d31484b665259f50cd94c5c28b961b09315ccd838f284687245f416e5", "abbe53a39734ef4aba061fca54e30c6b4639d3e1f59653f0da37a0003de148c7", "c845db36ba616912074c5b1ee897f8e0124df269468f25e4fe21fe72f6edd7a9", "c9399267c926a4e7c418baa5cbe91c7d1cf362d505a1ef898fde44a07c9dd8a5"]
 tqdm = ["14a285392c32b6f8222ecfbcd217838f88e11630affe9006cd0e94c7eff3cb61", "25d4c0ea02a305a688e7e9c2cdc8f862f989ef2a4701ab28ee963295f5b109ab"]
 twine = ["0fb0bfa3df4f62076cab5def36b1a71a2e4acb4d1fa5c97475b048117b1a6446", "d6c29c933ecfc74e9b1d9fa13aa1f87c5d5770e119f5a4ce032092f0ff5b14dc"]
-typing = ["38566c558a0a94d6531012c8e917b1b8518a41e418f7f15f00e129cc80162ad3", "53765ec4f83a2b720214727e319607879fec4acde22c4fbb54fa2604e79e44ce", "84698954b4e6719e912ef9a42a2431407fe3755590831699debda6fba92aac55"]
-urllib3 = ["2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", "a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb", "b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", "dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"]
+urllib3 = ["b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", "dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232"]
 watchdog = ["965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"]
 wcwidth = ["3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", "f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"]
 webencodings = ["a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78", "b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923"]
diff --git a/pyproject.toml b/pyproject.toml
index 2a604ce..9497a0b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -56,8 +56,8 @@ python = "~2.7 || ^3.4"
 
 [tool.poetry.dev-dependencies]
 sphinx = {version = "^2.1", python = "^3.7"}
-sphinx-autobuild = "^0.7.1"
-sphinx-rtd-theme = "^0.4.3"
+sphinx-autobuild = {version = "^0.7.1", python = "^3.7"}
+sphinx-rtd-theme = {version = "^0.4.3", python = "^3.7"}
 pytest = "^4.6"
 pytest-cov = "^2.7"
 twine = "^1.13"