Skip to content

Commit c0c2e48

Browse files
committed
Remove Python 2-specfic dependencies
1 parent 4e382a8 commit c0c2e48

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

setup.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ def git_describe_to_python_version(version):
9191
stderr=subprocess.PIPE,
9292
)
9393
stdout = proc.communicate()[0].strip()
94-
if sys.version_info[0] > 2:
95-
stdout = stdout.decode("ascii")
94+
stdout = stdout.decode("ascii")
9695

9796
if proc.returncode == 0:
9897
version = git_describe_to_python_version(stdout)
@@ -235,18 +234,6 @@ def initialize_options(self):
235234
"urwid": ["urwid"],
236235
"watch": ["watchdog"],
237236
"jedi": ["jedi"],
238-
# need requests[security] for SNI support (only before 2.7.7)
239-
':python_full_version == "2.7.0" or '
240-
'python_full_version == "2.7.1" or '
241-
'python_full_version == "2.7.2" or '
242-
'python_full_version == "2.7.3" or '
243-
'python_full_version == "2.7.4" or '
244-
'python_full_version == "2.7.5" or '
245-
'python_full_version == "2.7.6"': [
246-
"pyOpenSSL",
247-
"pyasn1",
248-
"ndg-httpsclient",
249-
],
250237
}
251238

252239
packages = [
@@ -267,10 +254,6 @@ def initialize_options(self):
267254
]
268255
}
269256

270-
tests_require = []
271-
if sys.version_info[0] == 2:
272-
tests_require.append("mock")
273-
274257
# translations
275258
mo_files = []
276259
for language in os.listdir(translations_dir):
@@ -291,7 +274,6 @@ def initialize_options(self):
291274
classifiers=classifiers,
292275
install_requires=install_requires,
293276
extras_require=extras_require,
294-
tests_require=tests_require,
295277
packages=packages,
296278
data_files=data_files,
297279
package_data={

0 commit comments

Comments
 (0)