Most runtime files were added via MANIFEST.in

Author: alanjds

.gitignore

@@ -7,6 +7,8 @@ errors.err
 
 grumpy-tools-src/dist/
 grumpy-tools-src/*.egg-info
+grumpy-runtime-src/dist
+grumpy-runtime-src/*.egg-info
 
 # Cache
 .pytest_cache/

grumpy-runtime-src/AUTHORS.md

@@ -0,0 +1 @@
+../AUTHORS.md

grumpy-runtime-src/CONTRIBUTING.md

@@ -0,0 +1 @@
+../CONTRIBUTING.md

grumpy-runtime-src/LICENSE

@@ -0,0 +1 @@
+../LICENSE

grumpy-runtime-src/MANIFEST.in

@@ -0,0 +1,11 @@
+global-include *.py
+global-include *.go
+global-include *.mk
+global-include Makefile
+
+global-exclude *.egg-info/*
+global-exclude *_test.py
+
+recursive-exclude grumpy-tools-src *.go
+prune testing/
+prune third_party/stdlib/test/

grumpy-runtime-src/README.md

@@ -0,0 +1 @@
+../README.md

grumpy-runtime-src/setup.py

@@ -17,6 +17,7 @@
 
 """The setup script."""
 
+import sys
 from setuptools import setup, find_packages
 from setuptools.command.bdist_egg import bdist_egg as BdistEggCommand
 from distutils.command.build import build as BuildCommand
@@ -43,6 +44,10 @@
     # TODO: Put package test requirements here
 ]
 
+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+if needs_pytest:
+    setup_requirements += ['pytest-runner']
+
 COMMON_OPTIONS = dict(
     version='0.1.1',
     description="Grumpy Runtime & Transpiler",
@@ -70,23 +75,6 @@
 )
 
 
-GRUMPY_TOOLS_OPTIONS = dict(
-    name='grumpy-tools',
-    package_dir={'':'grumpy-tools-src'},
-    packages=find_packages(
-        'grumpy-tools-src',
-        exclude=["*.tests", "*.tests.*", "tests.*", "tests"],
-    ),
-    include_package_data=False,
-    entry_points={
-        'console_scripts': [
-            'grumpy=grumpy_tools.cli:main',
-        ],
-    },
-)
-GRUMPY_TOOLS_OPTIONS.update(COMMON_OPTIONS)
-
-
 def _run_make(self, *args, **kwargs):
         subprocess.check_call(["cd grumpy-runtime-src && make --debug"], shell=True)
 
@@ -106,9 +94,7 @@ def run(self, *args, **kwargs):
 GRUMPY_RUNTIME_OPTIONS = dict(
     name='grumpy-runtime',
     requires=['grumpy_tools'],
-    package_dir={'':'grumpy-runtime-src'},
     packages=find_packages(
-        'grumpy-runtime-src',
         exclude=["*.tests", "*.tests.*", "tests.*", "tests"],
     ),
     include_package_data=True,
@@ -120,9 +106,4 @@ def run(self, *args, **kwargs):
 )
 GRUMPY_RUNTIME_OPTIONS.update(COMMON_OPTIONS)
 
-
-## Just the "tools"
-setup(**GRUMPY_TOOLS_OPTIONS)
-
-# ## Just the "runtime"
 setup(**GRUMPY_RUNTIME_OPTIONS)