From cf29c320beb2bc2f63f6b3e1577291d20839bc33 Mon Sep 17 00:00:00 2001
From: ruro <ruro.ruro@ya.ru>
Date: Mon, 17 May 2021 22:36:53 +0300
Subject: [PATCH] Fix CI for python 3.6 (#541)

* Partially revert "Drop support for python 3.6"

bump version and add Python 3.9 trove classifier

* update locale
---
 .bumpversion.cfg           |  2 +-
 .github/workflows/test.yml |  2 +-
 docs/release_notes.rst     |  4 ----
 setup.py                   |  5 +++--
 src/pydocstyle/utils.py    |  2 +-
 tox.ini                    | 13 +++++++++----
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index e4257935..ca69fbb8 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 7.0.0rc
+current_version = 6.1.1rc
 commit = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>.*))?
 serialize = 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index fecac446..1fdccd6e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index 4191a5ab..f3b645f9 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -8,10 +8,6 @@ Release Notes
 Current Development Version
 ---------------------------
 
-Major Updates
-
-* Support for Python 3.6 has been dropped (#539).
-
 
 6.1.0 - May 17th, 2021
 ---------------------------
diff --git a/setup.py b/setup.py
index b94c90d7..3139c495 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 # Do not update the version manually - it is managed by `bumpversion`.
-version = '7.0.0rc'
+version = '6.1.1rc'
 
 
 requirements = [
@@ -26,6 +26,7 @@
         'Environment :: Console',
         'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -33,7 +34,7 @@
         'Operating System :: OS Independent',
         'License :: OSI Approved :: MIT License',
     ],
-    python_requires='>=3.7',
+    python_requires='>=3.6',
     keywords='pydocstyle, PEP 257, pep257, PEP 8, pep8, docstrings',
     packages=('pydocstyle',),
     package_dir={'': 'src'},
diff --git a/src/pydocstyle/utils.py b/src/pydocstyle/utils.py
index 7e95fc36..692f0b7f 100644
--- a/src/pydocstyle/utils.py
+++ b/src/pydocstyle/utils.py
@@ -6,7 +6,7 @@
 from typing import Any, Iterable, Tuple
 
 # Do not update the version manually - it is managed by `bumpversion`.
-__version__ = '7.0.0rc'
+__version__ = '6.1.1rc'
 log = logging.getLogger(__name__)
 
 #: Regular expression for stripping non-alphanumeric characters
diff --git a/tox.ini b/tox.ini
index 437a9fec..4ff6d2bf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,14 +4,15 @@
 # install tox" and then run "tox" from this directory.
 
 [tox]
-envlist = {py37,py38,py39}-{tests,install},docs,install,py37-docs
+envlist = {py36,py37,py38,py39}-{tests,install},docs,install,py36-docs
 
 [testenv]
 download = true
 # Make sure reading the UTF-8 from test.py works regardless of the locale used.
+# Note, that "en_US" is used here instead of "C" as "C" is not available on mac.
 setenv =
-    LC_ALL=C.UTF-8
-    LANG=C.UTF-8
+    LC_ALL=en_US.UTF-8
+    LANG=en_US.UTF-8
 # To pass arguments to py.test, use `tox [options] -- [pytest posargs]`.
 commands =
     py.test --pep8 --cache-clear -vv src/tests {posargs}
@@ -36,7 +37,7 @@ deps =
    -rrequirements/docs.txt
 commands = sphinx-build -b html . _build
 
-[testenv:py37-docs]
+[testenv:py36-docs]
 changedir = {[testenv:docs]changedir}
 deps = {[testenv:docs]deps}
 commands = {[testenv:docs]commands}
@@ -44,6 +45,10 @@ commands = {[testenv:docs]commands}
 # There's no way to generate sub-sections in tox.
 # The following sections are all references to the `py37-install`.
 
+[testenv:py36-install]
+skip_install = {[testenv:install]skip_install}
+commands = {[testenv:install]commands}
+
 [testenv:py37-install]
 skip_install = {[testenv:install]skip_install}
 commands = {[testenv:install]commands}