|
|
0d485a0 |
From 4a8766adc16d682d9659c26500c5c027de8646d1 Mon Sep 17 00:00:00 2001
|
|
|
0d485a0 |
From: =?UTF-8?q?Tadej=20Jane=C5=BE?= <tadej.j@nez.si>
|
|
|
0d485a0 |
Date: Wed, 31 Jul 2019 12:36:12 +0200
|
|
|
0d485a0 |
Subject: [PATCH 02/15] Remove remaining references to Python 2.6, 3.2 and 3.3
|
|
|
0d485a0 |
|
|
|
0d485a0 |
---
|
|
|
0d485a0 |
setup.py | 9 ---------
|
|
|
0d485a0 |
tox.ini | 7 +------
|
|
|
0d485a0 |
2 files changed, 1 insertion(+), 15 deletions(-)
|
|
|
0d485a0 |
|
|
|
0d485a0 |
diff --git a/setup.py b/setup.py
|
|
|
0d485a0 |
index 9ecf8d2..b91a9c7 100644
|
|
|
0d485a0 |
--- a/setup.py
|
|
|
0d485a0 |
+++ b/setup.py
|
|
|
0d485a0 |
@@ -65,18 +65,9 @@ setup(
|
|
|
0d485a0 |
'virtualenv>=1.11', 'virtualenv-clone>=0.2.5', 'setuptools>=17.1'
|
|
|
0d485a0 |
],
|
|
|
0d485a0 |
extras_require={
|
|
|
0d485a0 |
- ':python_version=="2.6"': [
|
|
|
0d485a0 |
- 'argparse', 'pathlib', 'backports.shutil_get_terminal_size', 'shutilwhich'
|
|
|
0d485a0 |
- ],
|
|
|
0d485a0 |
':python_version=="2.7"': [
|
|
|
0d485a0 |
'pathlib', 'backports.shutil_get_terminal_size', 'shutilwhich'
|
|
|
0d485a0 |
],
|
|
|
0d485a0 |
- ':python_version=="3.2"': [
|
|
|
0d485a0 |
- 'pathlib', 'backports.shutil_get_terminal_size', 'shutilwhich'
|
|
|
0d485a0 |
- ],
|
|
|
0d485a0 |
- ':python_version=="3.3"': [
|
|
|
0d485a0 |
- 'pathlib'
|
|
|
0d485a0 |
- ],
|
|
|
0d485a0 |
':sys_platform=="win32"': [
|
|
|
0d485a0 |
'shellingham'
|
|
|
0d485a0 |
],
|
|
|
0d485a0 |
diff --git a/tox.ini b/tox.ini
|
|
|
0d485a0 |
index 6de3330..5cac4f3 100644
|
|
|
0d485a0 |
--- a/tox.ini
|
|
|
0d485a0 |
+++ b/tox.ini
|
|
|
0d485a0 |
@@ -1,6 +1,6 @@
|
|
|
0d485a0 |
[tox]
|
|
|
0d485a0 |
skip_missing_interpreters=True
|
|
|
0d485a0 |
-envlist = py26, py27, py33, py34, py35, py36, py37, pypy
|
|
|
0d485a0 |
+envlist = py27, py34, py35, py36, py37, pypy
|
|
|
0d485a0 |
|
|
|
0d485a0 |
[testenv]
|
|
|
0d485a0 |
passenv = CI HOME
|
|
|
0d485a0 |
@@ -8,15 +8,10 @@ passenv = CI HOME
|
|
|
0d485a0 |
commands = py.test -rw []
|
|
|
0d485a0 |
deps =
|
|
|
0d485a0 |
-r{toxinidir}/requirements.txt
|
|
|
0d485a0 |
- py26: pathlib>=1.0.1
|
|
|
0d485a0 |
- py26: mock
|
|
|
0d485a0 |
- py26: backports.shutil_get_terminal_size
|
|
|
0d485a0 |
- py26: shutilwhich
|
|
|
0d485a0 |
py27: pathlib>=1.0.1
|
|
|
0d485a0 |
py27: mock
|
|
|
0d485a0 |
py27: backports.shutil_get_terminal_size
|
|
|
0d485a0 |
py27: shutilwhich
|
|
|
0d485a0 |
- py33: pathlib>=1.0.1
|
|
|
0d485a0 |
pypy: shutilwhich
|
|
|
0d485a0 |
pypy: pathlib>=1.0.1
|
|
|
0d485a0 |
pypy: mock
|
|
|
0d485a0 |
--
|
|
|
0d485a0 |
2.31.1
|
|
|
0d485a0 |
|