Changes in setup.py [952ea1f:c16172d] in sasview

File:

• setup.py (modified) (6 diffs)

setup.py

@@ -12 +12 @@
 import shutil
 import sys
+from distutils.command.build_ext import build_ext
+from distutils.core import Command
 
 import numpy as np
-
 from setuptools import Extension, setup
-from setuptools import Command
-from setuptools.command.build_ext import build_ext
 
 try:
@@ -23 +22 @@
 except ImportError:
     pass
-
-# Convert "test" argument to "pytest" so 'python setup.py test' works
-sys.argv = [("pytest" if s == "test" else s) for s in sys.argv]
 
 # Manage version number ######################################
@@ -250 +246 @@
 # sas.sascalc.calculator
 gen_dir = os.path.join("src", "sas", "sascalc", "calculator", "c_extensions")
+package_dir["sas.sascalc.calculator.core"] = gen_dir
 package_dir["sas.sascalc.calculator"] = os.path.join(
     "src", "sas", "sascalc", "calculator")
-packages.append("sas.sascalc.calculator")
-ext_modules.append(Extension("sas.sascalc.calculator._sld2i",
+packages.extend(["sas.sascalc.calculator", "sas.sascalc.calculator.core"])
+ext_modules.append(Extension("sas.sascalc.calculator.core.sld2i",
                              sources=[
                                  os.path.join(gen_dir, "sld2i_module.c"),
@@ -261 +258 @@
                              ],
                              include_dirs=[gen_dir],
-                             ))
+                             )
+                   )
 
 # sas.sascalc.pr
 srcdir = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
+package_dir["sas.sascalc.pr.core"] = srcdir
 package_dir["sas.sascalc.pr"] = os.path.join("src", "sas", "sascalc", "pr")
-packages.append("sas.sascalc.pr")
-ext_modules.append(Extension("sas.sascalc.pr._pr_inversion",
+packages.extend(["sas.sascalc.pr", "sas.sascalc.pr.core"])
+ext_modules.append(Extension("sas.sascalc.pr.core.pr_inversion",
                              sources=[os.path.join(srcdir, "Cinvertor.c"),
                                       os.path.join(srcdir, "invertor.c"),
@@ -277 +276 @@
 # sas.sascalc.file_converter
 mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
+package_dir["sas.sascalc.file_converter.core"] = mydir
 package_dir["sas.sascalc.file_converter"] = os.path.join(
     "src", "sas", "sascalc", "file_converter")
-packages.append("sas.sascalc.file_converter")
-ext_modules.append(Extension("sas.sascalc.file_converter._bsl_loader",
+packages.extend(["sas.sascalc.file_converter",
+                 "sas.sascalc.file_converter.core"])
+ext_modules.append(Extension("sas.sascalc.file_converter.core.bsl_loader",
                              sources=[os.path.join(mydir, "bsl_loader.c")],
                              include_dirs=[np.get_include()],
@@ -442 +443 @@
     cmdclass={'build_ext': build_ext_subclass,
               'docs': BuildSphinxCommand,
-              'disable_openmp': DisableOpenMPCommand},
-    setup_requires=['pytest-runner'] if 'pytest' in sys.argv else [],
-    tests_require=['pytest'],
+              'disable_openmp': DisableOpenMPCommand}
 )