Skip to content

Commit 50e3813

Browse files
authored
Merge pull request #237 from QuLogic/remove-non-setuptools
Remove compatibility with pure distutils.
2 parents 7197d26 + 6448ba4 commit 50e3813

File tree

1 file changed

+14
-31
lines changed

1 file changed

+14
-31
lines changed

setup.py

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#-----------------------------------------------------------------------------
5151

5252
import os
53-
from glob import glob
5453

5554
from setuptools import setup
5655

@@ -71,7 +70,6 @@
7170
setup_args = dict(
7271
name = name,
7372
version = version_ns['__version__'],
74-
scripts = glob(pjoin('scripts', '*')),
7573
packages = packages,
7674
description = "Jupyter terminal console",
7775
long_description= "An IPython-like terminal frontend for Jupyter kernels in any language.",
@@ -89,38 +87,23 @@
8987
'Programming Language :: Python',
9088
'Programming Language :: Python :: 3',
9189
],
92-
)
93-
94-
if 'develop' in sys.argv or any(a.startswith('bdist') for a in sys.argv):
95-
import setuptools
96-
97-
setuptools_args = {}
98-
install_requires = setuptools_args['install_requires'] = [
99-
'jupyter_client',
100-
'ipython',
101-
'ipykernel', # bless IPython kernel for now
102-
'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
103-
'pygments',
104-
]
105-
106-
extras_require = setuptools_args['extras_require'] = {
107-
'test:sys_platform != "win32"': ['pexpect'],
108-
109-
110-
}
111-
112-
setuptools_args['python_requires'] = '>=3.6'
113-
114-
115-
setuptools_args['entry_points'] = {
90+
install_requires=[
91+
'jupyter_client',
92+
'ipython',
93+
'ipykernel', # bless IPython kernel for now
94+
'prompt_toolkit>=2.0.0,<3.1.0,!=3.0.0,!=3.0.1',
95+
'pygments',
96+
],
97+
extras_require={
98+
'test:sys_platform != "win32"': ['pexpect'],
99+
},
100+
python_requires='>=3.6',
101+
entry_points={
116102
'console_scripts': [
117103
'jupyter-console = jupyter_console.app:main',
118104
]
119-
}
120-
121-
if 'setuptools' in sys.modules:
122-
setup_args.update(setuptools_args)
123-
setup_args.pop('scripts')
105+
}
106+
)
124107

125108

126109
if __name__ == '__main__':

0 commit comments

Comments
 (0)