Skip to content

Commit 6284e0d

Browse files
committed
Merge pull request #247 in LCL/wolframclientforpython from feature/setup to master
* commit '3e819f769514ab62b9243afeac33e082d1cff7fe': removing jython wolframclient/cli/commands/setup.py edited online with Bitbucket removing version constraints code lint moving dependency install to a setup command
2 parents ebb2555 + 3e819f7 commit 6284e0d

2 files changed

Lines changed: 28 additions & 20 deletions

File tree

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
from __future__ import absolute_import, print_function, unicode_literals
2+
3+
from wolframclient.cli.utils import SimpleCommand
4+
from wolframclient.utils import six
5+
from wolframclient.utils.decorators import to_tuple
6+
7+
8+
@to_tuple
9+
def dependencies():
10+
yield "pytz"
11+
12+
if not six.PY2:
13+
yield "aiohttp"
14+
yield "numpy"
15+
yield "oauthlib"
16+
yield "pandas"
17+
yield "pillow"
18+
yield "pyzmq"
19+
yield "requests"
20+
yield "unittest-xml-reporting"
21+
yield 'certifi>=2017.4.17'
22+
23+
class Command(SimpleCommand):
24+
""" Run test suites from the tests modules.
25+
A list of patterns can be provided to specify the tests to run.
26+
"""
27+
28+
dependencies = dependencies()

wolframclient/cli/commands/test.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,17 @@
44
import unittest
55

66
from wolframclient.cli.utils import SimpleCommand
7-
from wolframclient.utils import six
8-
from wolframclient.utils.decorators import to_tuple
97
from wolframclient.utils.functional import map
108
from wolframclient.utils.importutils import module_path
119

1210

13-
# @to_tuple
14-
# def dependencies():
15-
# yield ("pytz", "2018.6")
16-
#
17-
# if not six.JYTHON:
18-
# yield ("numpy", not six.PY2 and "1.15.3" or None)
19-
# yield ("pillow", "7.1.2")
20-
# yield ("requests", "2.20.0")
21-
# yield ("oauthlib", "2.1.0")
22-
# yield ("pyzmq", "17.1.2")
23-
# yield ("pandas", "1.0.4")
24-
# yield ("unittest-xml-reporting", None)
25-
# if not six.PY2:
26-
# yield ("aiohttp", "3.6.2")
27-
28-
2911
class Command(SimpleCommand):
3012
""" Run test suites from the tests modules.
3113
A list of patterns can be provided to specify the tests to run.
3214
"""
3315

3416
modules = ["wolframclient.tests"]
3517

36-
dependencies = ()
37-
3818
def add_arguments(self, parser):
3919
parser.add_argument(
4020
"-x",

0 commit comments

Comments
 (0)