Changeset 948b8c1 in sasmodels

Timestamp:

May 5, 2016 11:12:06 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

c2c51a2

Parents:

c4c426b

Message:

simplify setup; read version from package init

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -1 @@
-import os
-from setuptools import setup,find_packages
+from distutils.core import setup
 
-if os.name == 'nt':
-    # Create the model .so's on windows
-    os.system("python gen_so.py")
-
-packages = find_packages(exclude=['contrib', 'docs', 'tests*'])
-package_data = {
-    'sasmodels.models': ['*.c','lib/*.c'],
-    'sasmodels': ['*.c'],
-    'models': ['*.so'],
-}
-required = []
+def find_version(package):
+    """Read package version string from __init__.py"""
+    import os
+    with open(os.path.join(package, '__init__.py')) as fid:
+        for line in fid.readlines():
+            if line.startswith('__version__'):
+                line = line[:line.find('#')]  # strip comment, if any
+                version = line.split('=', 2)[1].strip()
+                if version[0] != version[-1] or version[0] not in "\"'":
+                    break
+                return version[1:-1]
+    raise RuntimeError("Could not read version from %s/__init__.py"%package)
 
 setup(
-    name="sasmodels",
-    version = "1.0.0a",
-    description = "sasmodels package",
+    name='sasmodels',
+    version=find_version('sasmodels'),
+    description="sasmodels package",
     long_description=open('README.md').read(),
-    author = "SasView Collaboration",
-    author_email = "management@sasview.org",
-    url = "http://www.sasview.org",
-    keywords = "small-angle x-ray and neutron scattering analysis",
-    download_url = "https://github.com/SasView/sasmodels",
+    author="SasView Collaboration",
+    author_email="management@sasview.org",
+    url="http://www.sasview.org",
+    keywords="small-angle x-ray and neutron scattering analysis",
+    download_url="https://github.com/SasView/sasmodels",
     classifiers=[
         'Development Status :: 4 - Beta',
@@ -31 +31 @@
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: C',
         'Topic :: Scientific/Engineering',
         'Topic :: Scientific/Engineering :: Chemistry',
         'Topic :: Scientific/Engineering :: Physics',
     ],
-    packages=packages,
-    package_data=package_data,
-    install_requires = required,
+    packages=[
+        'sasmodels',
+        'sasmodels.models',
+        'sasmodels.custom'
+    ],
+    package_data={
+        'sasmodels.models': ['*.c', 'lib/*.c'],
+        'sasmodels': ['*.c', '*.cl', 'convert.json'],
+    },
+    install_requires = [
+    ],
     extras_require = {
         'OpenCL': ["pyopencl"],
         'Bumps': ["bumps"],
-        }
-
-    )
+        'TinyCC': ["tinycc"],
+    },
+)