From 53b08730e4dbd3446c3f079b7861ef3f57ffcbec Mon Sep 17 00:00:00 2001 From: Ryan Mast Date: Fri, 13 Dec 2019 10:07:10 -0800 Subject: [PATCH] Pin the colorama version only for Python 3.4 --- changelog/6340.trivial.rst | 1 - changelog/6345.trivial.rst | 1 + setup.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 changelog/6340.trivial.rst create mode 100644 changelog/6345.trivial.rst diff --git a/changelog/6340.trivial.rst b/changelog/6340.trivial.rst deleted file mode 100644 index 6debef98696..00000000000 --- a/changelog/6340.trivial.rst +++ /dev/null @@ -1 +0,0 @@ -Pin ``colorama`` to ``0.4.1`` as later versions no longer support Python 3.4. diff --git a/changelog/6345.trivial.rst b/changelog/6345.trivial.rst new file mode 100644 index 00000000000..e954583143a --- /dev/null +++ b/changelog/6345.trivial.rst @@ -0,0 +1 @@ +Pin ``colorama`` to ``0.4.1`` only for Python 3.4 so newer Python versions can still receive colorama updates. diff --git a/setup.py b/setup.py index 2e81874e5a2..1053bce4a5a 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,8 @@ "atomicwrites>=1.0", 'funcsigs>=1.0;python_version<"3.0"', 'pathlib2>=2.2.0;python_version<"3.6"', - 'colorama<=0.4.1;sys_platform=="win32"', + 'colorama<=0.4.1;sys_platform=="win32" and python_version=="3.4"', + 'colorama;sys_platform=="win32" and python_version!="3.4"', "pluggy>=0.12,<1.0", 'importlib-metadata>=0.12;python_version<"3.8"', "wcwidth",