Skip to content

Commit 79ba0e2

Browse files
committed
Remove docker scripts
1 parent 4d72680 commit 79ba0e2

File tree

5 files changed

+13
-66
lines changed

5 files changed

+13
-66
lines changed

CHANGES.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@ To accommodate growth and increased use of pieces of Mathics inside other packag
1313
Incompatible changes:
1414
+++++++++++++++++++++
1515

16-
* `-e` `--execute` is better suited for embedded use. It shows just evaluation output as text.
16+
* ``-e`` ``--execute`` is better suited for embedded use. It shows just evaluation output as text.
17+
* Docker scripts ``dmathics``, ``dmathicsscript`` and ``dmathicsserver`` have been removed. They are part of the ``docker-mathics`` a separate PyPI package.
18+
19+
The bump in the major version number reflects major changes in this release. Another major release is planned soon, with more major changes.
1720

18-
The bump in the major version number reflects major changes in this release.
19-
Another major release is planned soon, with more major changes.
2021
See below for future work planned.
2122

2223
New builtins

script/dmathics

Lines changed: 0 additions & 3 deletions
This file was deleted.

script/dmathicsscript

Lines changed: 0 additions & 3 deletions
This file was deleted.

script/dmathicsserver

Lines changed: 0 additions & 12 deletions
This file was deleted.

setup.py

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
#!/usr/bin/env python3
22
# -*- coding: utf-8 -*-
33

4-
"""Setuptools based setup script for Mathics.
4+
"""Python Setuptools for Mathics core
55
6-
For the easiest installation just type the following command (you'll probably
7-
need root privileges):
6+
For the easiest installation:
87
9-
python setup.py install
8+
pip install -e .
109
1110
This will install the library in the default location. For instructions on
1211
how to customize the install procedure read the output of:
@@ -21,8 +20,6 @@
2120
2221
python setup.py --help-commands
2322
24-
Or, if all else fails, feel free to write to the mathics users list at
25-
[email protected] and ask for help.
2623
"""
2724

2825
import sys
@@ -35,6 +32,7 @@
3532
print("Mathics does not support Python %d.%d" % sys.version_info[:2])
3633
sys.exit(-1)
3734

35+
3836
def get_srcdir():
3937
filename = osp.normcase(osp.dirname(osp.abspath(__file__)))
4038
return osp.realpath(filename)
@@ -54,7 +52,9 @@ def read(*rnames):
5452
is_PyPy = platform.python_implementation() == "PyPy"
5553

5654
INSTALL_REQUIRES = []
57-
DEPENDENCY_LINKS = ['http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics_Scanner-1.0.0.dev']
55+
DEPENDENCY_LINKS = [
56+
"http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics_Scanner-1.0.0.dev"
57+
]
5858

5959
try:
6060
if is_PyPy:
@@ -90,8 +90,8 @@ def read(*rnames):
9090
"llvmlite",
9191
"requests",
9292
"scikit-image",
93-
"wordcloud", # Used in builtin/image.py by WordCloud()
94-
"PyYAML", # Used in mathics.core.characters
93+
"wordcloud", # Used in builtin/image.py by WordCloud()
94+
"PyYAML", # Used in mathics.core.characters
9595
]
9696

9797

@@ -100,38 +100,6 @@ def subdirs(root, file="*.*", depth=10):
100100
yield root + "*/" * k + file
101101

102102

103-
class test(Command):
104-
"""
105-
Run the unittests
106-
"""
107-
108-
description = "run the unittests"
109-
user_options = []
110-
111-
def __init__(self, *args):
112-
self.args = args[0] # so we can pass it to other classes
113-
Command.__init__(self, *args)
114-
115-
def initialize_options(self): # distutils wants this
116-
pass
117-
118-
def finalize_options(self): # this too
119-
pass
120-
121-
def run(self):
122-
import unittest
123-
124-
test_loader = unittest.defaultTestLoader
125-
test_runner = unittest.TextTestRunner(verbosity=3)
126-
test_suite = test_loader.discover("test/")
127-
test_result = test_runner.run(test_suite)
128-
129-
if not test_result.wasSuccessful():
130-
sys.exit(1)
131-
132-
133-
CMDCLASS["test"] = test
134-
135103
mathjax_files = list(subdirs("media/js/mathjax/"))
136104

137105
setup(
@@ -175,10 +143,6 @@ def run(self):
175143
"mathics = mathics.main:main",
176144
],
177145
},
178-
scripts = [
179-
"script/dmathicsserver",
180-
"script/dmathicsscript",
181-
],
182146
long_description=long_description,
183147
long_description_content_type="text/x-rst",
184148
# don't pack Mathics in egg because of media files, etc.

0 commit comments

Comments
 (0)