From 25e05418d84e47dd4917957c476eb43bd26701d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 20 Oct 2017 19:59:05 +0200 Subject: [PATCH] Upped version of requests and cookiecutter Fixes #2160 --- docs/plugins/gettingstarted.rst | 6 ++++-- setup.py | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docs/plugins/gettingstarted.rst b/docs/plugins/gettingstarted.rst index f8cc6fc3..20a30c67 100644 --- a/docs/plugins/gettingstarted.rst +++ b/docs/plugins/gettingstarted.rst @@ -138,9 +138,11 @@ best way possible, meaning we want to make our plugin a fully installable python install directly via `OctoPrint's built-in Plugin Manager `_ or alternatively manually utilizing Python's standard package manager ``pip`` directly. -So let's begin. We'll use the `cookiecutter `_ template for OctoPrint plugins here. This should already be installed if you used the `plugins` extra while installing OctoPrint. However, you may install it with:: +So let's begin. We'll use the `cookiecutter `_ template for OctoPrint plugins +here. This should already be installed if you used the ``plugins`` extra while installing OctoPrint. However, +you may install it with:: - (venv) $ pip install "cookiecutter>=1.4,<1.5" + (venv) $ pip install "cookiecutter>=1.4,<1.7" Then we can use the ``octoprint dev plugin:new`` command [#f1]_ to generate a new OctoPrint plugin skeleton for us:: diff --git a/setup.py b/setup.py index 73c23195..6cf46a1f 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ INSTALL_REQUIRES = [ "pylru>=1.0.9,<1.1", "rsa>=3.2,<3.3", "pkginfo>=1.2.1,<1.3", - "requests>=2.7,<2.8", + "requests>=2.18.4,<3", "semantic_version>=2.4.2,<2.5", "psutil>=3.2.1,<3.3", "Click>=6.2,<6.3", @@ -78,7 +78,7 @@ EXTRA_REQUIRES = dict( # Dependencies for developing OctoPrint plugins plugins=[ - "cookiecutter>=1.4,<1.5" + "cookiecutter>=1.4,<1.7" ] )