From 3ced6b96cc5f3e5d82f943e26861156a410290d8 Mon Sep 17 00:00:00 2001
From: Lars Holmberg <lars.holmberg@svenskaspel.se>
Date: Mon, 3 Feb 2020 13:45:29 +0100
Subject: [PATCH] Release a new python3-only version.

---
 Makefile           |  2 +-
 locust/__init__.py |  2 +-
 setup.cfg          |  3 ---
 setup.py           | 29 +----------------------------
 4 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index c2ca627c0e..5fbc9bdece 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ test:
 	tox
 
 build:
-	rm -f dist/* && python setup.py sdist bdist_wheel
+	rm -f dist/* && python3 setup.py sdist bdist_wheel
 
 release: build
 	twine upload dist/*
diff --git a/locust/__init__.py b/locust/__init__.py
index 2ef85bd16a..3890f9a666 100644
--- a/locust/__init__.py
+++ b/locust/__init__.py
@@ -2,4 +2,4 @@
 from .exception import InterruptTaskSet, ResponseError, RescheduleTaskImmediately
 from .wait_time import between, constant, constant_pacing
 
-__version__ = "0.14.2"
+__version__ = "0.14.3"
diff --git a/setup.cfg b/setup.cfg
index ed8a958e0a..0c9e0fc144 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,2 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 license_file = LICENSE
diff --git a/setup.py b/setup.py
index d77ab7980c..3d178d40c2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,9 +5,6 @@
 import sys
 
 from setuptools import find_packages, setup
-from setuptools.command.develop import develop
-from setuptools.command.install import install
-from setuptools.command.egg_info import egg_info
 
 # parse version from locust/__init__.py
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
@@ -16,24 +13,6 @@
     version = str(ast.literal_eval(_version_re.search(
         f.read().decode('utf-8')).group(1)))
 
-class PostDevelopCommand(develop):
-    def run(self):
-        if sys.version_info[0] < 3 or sys.version_info[1] < 6:
-            sys.exit("Your Python version is no longer supported by Locust. Please upgrade Python to at least 3.6, or use a pinned old locust version (pip/pip3 install locustio==0.13.5)")
-        develop.run(self)
-
-class PostInstallCommand(install):
-    def run(self):
-        if sys.version_info[0] < 3 or sys.version_info[1] < 6:
-            sys.exit("Your Python version is no longer supported by Locust. Please upgrade Python to at least 3.6, or use a pinned old locust version (pip/pip3 install locustio==0.13.5)")
-        install.run(self)
-
-class PostEggInfoCommand(egg_info):
-    def run(self):
-        if sys.version_info[0] < 3 or sys.version_info[1] < 6:
-            sys.exit("Your Python version is no longer supported by Locust. Please upgrade Python to at least 3.6, or use a pinned old locust version (pip/pip3 install locustio==0.13.5)")
-        egg_info.run(self)
-
 setup(
     name='locustio',
     version=version,
@@ -45,8 +24,6 @@ def run(self):
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
@@ -63,6 +40,7 @@ def run(self):
     packages=find_packages(exclude=['examples', 'tests']),
     include_package_data=True,
     zip_safe=False,
+    python_requires=">=3.6",
     install_requires=[
         "gevent==1.5a2", 
         "flask>=0.10.1", 
@@ -81,9 +59,4 @@ def run(self):
             'locust = locust.main:main',
         ]
     },    
-    cmdclass={
-        'develop': PostDevelopCommand,
-        'install': PostInstallCommand,
-        'egg_info': PostEggInfoCommand,
-    },
 )