diff options
| author | Saptak S <saptak013@gmail.com> | 2020-07-04 13:42:20 +0530 |
|---|---|---|
| committer | Saptak S <saptak013@gmail.com> | 2020-07-04 13:42:20 +0530 |
| commit | 41681f82ecceffc09ca32d1e9cef6dd7fcbaefe4 (patch) | |
| tree | a9f5390b96113d0d02c5add1972697feb3bf1e0b /poetry.lock | |
| parent | 08f891f4f64792b1dea4aad4d7b90f039c51475c (diff) | |
| parent | 172a30d5c9facbf50fe3b11f663b338a8d9a2c73 (diff) | |
| download | onionshare-41681f82ecceffc09ca32d1e9cef6dd7fcbaefe4.tar.gz onionshare-41681f82ecceffc09ca32d1e9cef6dd7fcbaefe4.zip | |
Merge branch 'develop' of github.com:micahflee/onionshare into chat
Diffstat (limited to 'poetry.lock')
| -rw-r--r-- | poetry.lock | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/poetry.lock b/poetry.lock index ec16e0d2..635d58eb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -53,9 +53,9 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" version = "7.1.1" [[package]] -category = "dev" +category = "main" description = "Cross-platform colored terminal text." -marker = "sys_platform == \"win32\"" +marker = "platform_system == \"Windows\" or sys_platform == \"win32\"" name = "colorama" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" @@ -412,6 +412,7 @@ doc = ["sphinx", "sphinx-rtd-theme"] [[package]] category = "main" +<<<<<<< HEAD description = "Engine.IO server" name = "python-engineio" optional = false @@ -440,6 +441,23 @@ six = ">=1.9.0" [package.extras] asyncio_client = ["aiohttp (>=3.4)", "websockets (>=7.0)"] client = ["requests (>=2.21.0)", "websocket-client (>=0.54.0)"] +======= +description = "QR Code image generator" +name = "qrcode" +optional = false +python-versions = "*" +version = "6.1" + +[package.dependencies] +colorama = "*" +six = "*" + +[package.extras] +dev = ["tox", "pytest", "mock"] +maintainer = ["zest.releaser"] +pil = ["pillow"] +test = ["pytest", "pytest-cov", "mock"] +>>>>>>> 172a30d5c9facbf50fe3b11f663b338a8d9a2c73 [[package]] category = "main" @@ -536,7 +554,11 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] +<<<<<<< HEAD content-hash = "181ea24287292c0ab933307bbff258d4f2791642116c7c39d3bde83d573c089b" +======= +content-hash = "3f46cfec01bcb5166c9f354aaf4439064b477955f3ea2373fcfdb65d5b89276e" +>>>>>>> 172a30d5c9facbf50fe3b11f663b338a8d9a2c73 python-versions = "^3.7" [metadata.files] @@ -796,6 +818,7 @@ pytest-qt = [ {file = "pytest-qt-3.3.0.tar.gz", hash = "sha256:714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"}, {file = "pytest_qt-3.3.0-py2.py3-none-any.whl", hash = "sha256:5f8928288f50489d83f5d38caf2d7d9fcd6e7cf769947902caa4661dc7c851e3"}, ] +<<<<<<< HEAD python-engineio = [ {file = "python-engineio-3.12.1.tar.gz", hash = "sha256:2481732d93646998f7372ef0ecf003af7817b82720b881db173c3d50b4887916"}, {file = "python_engineio-3.12.1-py2.py3-none-any.whl", hash = "sha256:222926adb4bc6e03a8fc8e0ef2a3309f030c1c3f8e0fcc94c9ba214574565f02"}, @@ -803,6 +826,11 @@ python-engineio = [ python-socketio = [ {file = "python-socketio-4.5.1.tar.gz", hash = "sha256:149b98c33f8c3d09273fb4ebeb83781e4dc9411b56b27d9f058bec1bd1ed74b7"}, {file = "python_socketio-4.5.1-py2.py3-none-any.whl", hash = "sha256:81280cbbb7018d8ecdd006bf6025979733d347c0f2612282c1e21f6ed7d3b55b"}, +======= +qrcode = [ + {file = "qrcode-6.1-py2.py3-none-any.whl", hash = "sha256:3996ee560fc39532910603704c82980ff6d4d5d629f9c3f25f34174ce8606cf5"}, + {file = "qrcode-6.1.tar.gz", hash = "sha256:505253854f607f2abf4d16092c61d4e9d511a3b4392e60bff957a68592b04369"}, +>>>>>>> 172a30d5c9facbf50fe3b11f663b338a8d9a2c73 ] requests = [ {file = "requests-2.23.0-py2.py3-none-any.whl", hash = "sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee"}, |