From 3395daccfe49044929c3e1a8e78fb84c40332514 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Mon, 8 Jun 2020 14:30:21 +1200 Subject: [PATCH 1/2] Deprecate using Ryu with older python versions. --- .travis.yml | 5 ----- setup.cfg | 2 -- tox.ini | 5 ----- 3 files changed, 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 712ffd12..0ce5d205 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,6 @@ matrix: - python: 3.6 env: TOX_ENV=autopep8 - - python: 2.7 - env: TOX_ENV=pycodestyle - - python: 2.7 - env: TOX_ENV=py27 - - python: 3.5 env: TOX_ENV=py35 diff --git a/setup.cfg b/setup.cfg index c3757abb..e8afa658 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,9 +13,7 @@ classifier = Topic :: System :: Networking Natural Language :: English Programming Language :: Python - Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 - Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 diff --git a/tox.ini b/tox.ini index 65136233..25f3ba99 100644 --- a/tox.ini +++ b/tox.ini @@ -20,11 +20,6 @@ commands = commands = python ryu/tests/integrated/run_test.py -[testenv:py27] -commands = - {[testenv]commands} - {[testenv:scenario]commands} - [testenv:py36] commands = {[testenv]commands} From b6bf01a5c95da0de1e6831a3cf41243e69297854 Mon Sep 17 00:00:00 2001 From: Brad Cowie Date: Mon, 8 Jun 2020 14:30:58 +1200 Subject: [PATCH 2/2] Remove workaround for issue with older python versions. --- setup.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/setup.py b/setup.py index cf2a404d..fee79eb1 100644 --- a/setup.py +++ b/setup.py @@ -14,12 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -# a bug workaround. http://bugs.python.org/issue15881 -try: - import multiprocessing -except ImportError: - pass - import setuptools import ryu.hooks