Merging upstream version 0.14.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 7 deletions

diff --git a/setup.py b/setup.py
index 278e065..1e9f35a 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ except:
 
 description = "Git commit message linter written in python, checks your commit messages for style."
 long_description = """
-Great for use as a commit-msg git hook or as part of your gating script in a CI pipeline (e.g. jenkins, gitlab).
+Great for use as a commit-msg git hook or as part of your gating script in a CI pipeline (e.g. jenkins, github actions).
 Many of the gitlint validations are based on `well-known`_ community_ `standards`_, others are based on checks that
 we've found useful throughout the years. Gitlint has sane defaults, but you can also easily customize it to your
 own liking.
@@ -31,7 +31,7 @@ Source code on `github.com/jorisroovers/gitlint`_.
 .. _community: http://addamhardy.com/blog/2013/06/05/good-commit-messages-and-enforcing-them-with-git-hooks/
 .. _standards: http://chris.beams.io/posts/git-commit/
 .. _jorisroovers.github.io/gitlint: https://jorisroovers.github.io/gitlint
-.. _CHANGELOG: https://github.com/jorisroovers/gitlint/blob/master/CHANGELOG.md
+.. _CHANGELOG: https://github.com/jorisroovers/gitlint/blob/main/CHANGELOG.md
 .. _github.com/jorisroovers/gitlint: https://github.com/jorisroovers/gitlint
 """
 
@@ -57,6 +57,7 @@ setup(
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Environment :: Console",
@@ -89,13 +90,15 @@ setup(
     },
 )
 
-# Print a red deprecation warning for python 2.6 users
-if sys.version_info[0] == 2 and sys.version_info[1] <= 6:
-    msg = "\033[31mDEPRECATION: Python 2.6 or below are no longer supported by gitlint or the Python core team." + \
-          "Please upgrade your Python to a later version.\033[0m"
+# Print a red deprecation warning for python < 3.6 users
+if sys.version_info[:2] < (3, 6):
+    msg = "\033[31mDEPRECATION: You're using a python version that has reached end-of-life. " + \
+          "Gitlint does not support Python < 3.5 or < 2.7, and will be dropping support for " + \
+          "Python 2.7 and 3.5 in the next release. " + \
+          "Please upgrade your Python to 3.6 or above.\033[0m"
     print(msg)
 
-# Print a red deprecation warning for python 2.6 users
+# Print a warning message for Windows users
 PLATFORM_IS_WINDOWS = "windows" in platform.system().lower()
 if PLATFORM_IS_WINDOWS:
     msg = "\n\n\n\n\n****************\n" + \