From 98602e25e37e0536d940438287babe91aad51d45 Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 30 Jun 2021 20:51:59 -0400 Subject: [PATCH] Add requirements-*.txt files to distribution --- CHANGES.rst | 14 ++++++++++++++ MANIFEST.in | 2 ++ requirements-dev.txt | 1 - setup.py | 16 +++++++++------- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d29ce1108c..8004c93164 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,6 +1,20 @@ CHANGES ======= +3.0.1 +----- + +New variables and builtins +++++++++++++++++++++++++++ + +* ``Cylinder`` (prelimnary) +* ``Arrow`` (prelimnary) + +Enhancements +------------ + +Large sections like "Strings and Characters" was sections both in the docs and in the code. + 3.0.0 ----- diff --git a/MANIFEST.in b/MANIFEST.in index c628ba3a39..4b7c44ead0 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,5 +4,7 @@ include ChangeLog include COPYING.txt include FUTURE.rst include Makefile +include requirements-dev.txt +include requirements-full.txt recursive-include mathics *.py recursive-include test *.py *.m diff --git a/requirements-dev.txt b/requirements-dev.txt index 63b622214c..bea1df8818 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,4 +1,3 @@ # Additional packages used in testing pytest -pytest-xdist pexpect diff --git a/setup.py b/setup.py index 5c0c80989f..a6db9590a7 100644 --- a/setup.py +++ b/setup.py @@ -56,13 +56,15 @@ def read(*rnames): # stores __version__ in the current namespace exec(compile(open("mathics/version.py").read(), "mathics/version.py", "exec")) -extras_require = [] -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} +EXTRAS_REQUIRE = {} +for kind in ("dev", "full"): + extras_require = [] + requirements_file = f"requirements-{kind}.txt" + for line in open(requirements_file).read().split("\n"): + if line and not line.startswith("#"): + requires = re.sub(r"([^#]+)(\s*#.*$)?", r"\1", line) + extras_require.append(requires) + EXTRAS_REQUIRE[kind] = extras_require DEPENDENCY_LINKS = [] # "http://github.com/Mathics3/mathics-scanner/tarball/master#egg=Mathics_Scanner-1.0.0.dev"