Bump Mathics-Scanner version. Clean up for release

Author: rocky

.github/workflows/windows.yml

@@ -31,7 +31,7 @@ jobs:
         python setup.py install
     - name: Test Mathics
       run: |
-        pip install -r requirements-extra.txt
+        pip install -e .[full]
         pip install -r requirements-dev.txt
         set PYTEST_WORKERS="-n3"
         make check

Makefile

@@ -39,8 +39,7 @@ develop:
 
 #: Set up to run from the source tree with full dependencies
 develop-full:
-	$(PIP) install -e .
-	$(PIP) install -r requirements-extra.txt
+	$(PIP) install -e .[full]
 
 
 #: Make distirbution: wheels, eggs, tarball
@@ -59,7 +58,8 @@ clean:
 	rm mathics/*/*.so; \
 	for dir in mathics/doc ; do \
 	   ($(MAKE) -C "$$dir" clean); \
-	done;
+	done; \
+	rm -f factorials || true
 
 #: Run py.test tests. Use environment variable "o" for pytest options
 pytest:

admin-tools/check-versions.sh

@@ -1,5 +1,5 @@
 # Optional packages which add functionality or speed things up
-psutil #
+psutil # SystemMemory and MemoryAvailable
 scikit-image # FindMinimum can use this
 lxml  # for HTML parsing used in builtin/fileformats/html
 wordcloud # Used in builtin/image.py by WordCloud()

requirements-extra.txt requirements-full.txtrequirements-extra.txt renamed to requirements-full.txt

@@ -46,27 +46,27 @@ def read(*rnames):
 # stores __version__ in the current namespace
 exec(compile(open("mathics/version.py").read(), "mathics/version.py", "exec"))
 
-# Get/set VERSION and long_description from files
 long_description = read("README.rst") + "\n"
 
 
 is_PyPy = platform.python_implementation() == "PyPy"
 
-INSTALL_REQUIRES = []
+INSTALL_REQUIRES = ["Mathics-Scanner >= 1.2.1,<1.3.0"]
+
 # stores __version__ in the current namespace
 exec(compile(open("mathics/version.py").read(), "mathics/version.py", "exec"))
 
 extras_require = []
-for line in open("requirements-extra.txt").read().split("\n"):
+for line in open("requirements-full.txt").read().split("\n"):
     if line and not line.startswith("#"):
         requires = re.sub(r"([^#]+)(\s*#.*$)?", r"\1", line)
         extras_require.append(requires)
 
 EXTRAS_REQUIRE = {"full": extras_require}
 
-DEPENDENCY_LINKS = [
-    "http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics_Scanner-1.0.0.dev"
-]
+DEPENDENCY_LINKS = []
+#     "http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics_Scanner-1.0.0.dev"
+# ]
 
 try:
     if is_PyPy:
@@ -102,19 +102,15 @@ def read(*rnames):
 
 # General Requirements
 INSTALL_REQUIRES += [
-    "Mathics_Scanner>=1.2.0,<1.3.0",
+    "Mathics_Scanner>=1.2.1,<1.3.0",
     "sympy>=1.8, <= 1.9dev",
     "mpmath>=1.2.0",
     "numpy",
     "palettable",
     "pint",
     "python-dateutil",
-    # "psutil",  # for $SystemMemory
     "llvmlite",
     "requests",
-    # lxml is an optional dependency for HTML parsing used in builtin/fileformats/html
-    # "scikit-image", optional
-    # "wordcloud",  # Used in builtin/image.py by WordCloud()
 ]
 
 
@@ -123,8 +119,6 @@ def subdirs(root, file="*.*", depth=10):
         yield root + "*/" * k + file
 
 
-mathjax_files = list(subdirs("media/js/mathjax/"))
-
 setup(
     name="Mathics3",
     cmdclass=CMDCLASS,