Changeset dcc51ee in sasmodels

Timestamp:

Oct 24, 2018 10:16:05 AM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

93fe8a1, 95f62aa

Parents:

353e899 (diff), 783e76f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Kienzle <pkienzle@…> (10/24/18 10:16:05)

git-committer:

GitHub <noreply@…> (10/24/18 10:16:05)

Message:

Merge pull request #89 from arm61/add_requirements

added a requirements.txt file for building from source

File:

• setup.py (modified) (2 diffs)

setup.py

@@ -29 +29 @@
                 return version[1:-1]
     raise RuntimeError("Could not read version from %s/__init__.py"%package)
+
+install_requires = ['numpy', 'scipy']
+
+if sys.platform=='win32' or sys.platform=='cygwin':
+    install_requires.append('tinycc')
 
 setup(
@@ -61 +66 @@
         'sasmodels': ['*.c', '*.cl'],
     },
-    install_requires=[
-    ],
+    install_requires=install_requires,
     extras_require={
+        'full': ['docutils', 'bumps', 'matplotlib'],
+        'server': ['bumps'],
         'OpenCL': ["pyopencl"],
-        'Bumps': ["bumps"],
-        'TinyCC': ["tinycc"],
     },
     build_requires=['setuptools'],