Merge pull request #130 from mrakitin/fix-conda-recipe-and-pip-deps

FIX: fix conda recipe and pip dependencies - fixes #129, fixes #131

Author: prjemian

MANIFEST.in

@@ -1,5 +1,5 @@
 include README.md
 include CHANGES*
 include LICENSE.txt
-include versioneer.py
-include apstools/_version.py
+include versioneer.py
+include apstools/_version.py

apstools/__init__.py

@@ -1,4 +1,3 @@
-
 #-----------------------------------------------------------------------------
 # :author:    Pete R. Jemian
 # :email:     [email protected]
@@ -21,12 +20,16 @@
 __license__     += u" (see LICENSE.txt file for details)"
 __platforms__   = 'any'
 __zip_safe__    = False
+__exclude_project_dirs__ = "docs examples tests".split()
+__python_version_required__ = ">=3.5"
 
 __package_name__ = __project__
 __long_description__ = __description__
 
-__install_requires__ = ('databroker', 'pandas', 'xlrd')
-__install_requires__ = ()       # TODO: for conda build now
+from ._requirements import learn_requirements
+__install_requires__ = learn_requirements()
+del learn_requirements
+
 __classifiers__ = [
     'Development Status :: 5 - Production/Stable',
     'Environment :: Console',

apstools/_requirements.py

@@ -0,0 +1,38 @@
+#-----------------------------------------------------------------------------
+# :author:    Pete R. Jemian
+# :email:     [email protected]
+# :copyright: (c) 2017-2019, UChicago Argonne, LLC
+#
+# Distributed under the terms of the Creative Commons Attribution 4.0 International Public License.
+#
+# The full license is in the file LICENSE.txt, distributed with this software.
+#-----------------------------------------------------------------------------
+
+
+
+def learn_requirements():
+    """
+    list all installation requirements 
+    
+    ALL packages & version restrictions stated in requirements.txt
+    """
+    req_file = 'requirements.txt'
+    reqs = []
+
+    import os
+    path = os.path.dirname(__file__)
+    req_file = os.path.join(path, '..', req_file)
+    if not os.path.exists(req_file):
+        # not needed with installed package
+        return reqs
+
+    excludes = "versioneer coveralls coverage".split()
+    with open(req_file, 'r') as fp:
+        buf = fp.read().strip().splitlines()
+        for req in buf:
+            req = req.strip()
+            if req != "" \
+                    and not req.startswith('#') \
+                    and req not in excludes:
+                reqs.append(req)
+    return reqs

conda-recipe/meta.yaml

@@ -23,7 +23,7 @@ package:
   version: "{{ version }}"
 
 build:
-  script: python setup.py install
+  script: python -m pip install --no-deps --ignore-installed .
   noarch: python
   entry_points:
     - apstools_plan_catalog = apstools.examples:main
@@ -32,19 +32,14 @@ build:
 
 requirements:
   host:
-    - pip
     - python
-    - ophyd
-    - databroker
-    - bluesky
-    - pyRestTable
-    - pandas
-    - xlrd
+    - pip
   run:
     - python
     - ophyd
     - databroker
     - bluesky
+    - historydict
     - pyRestTable
     - pandas
     - xlrd

requirements.txt

@@ -1,6 +1,10 @@
 versioneer
 coverage
 coveralls
-pyRestTable
+bluesky
+databroker[all]
+historydict
+ophyd
 pandas
+pyRestTable
 xlrd

setup.py

@@ -35,11 +35,10 @@
     install_requires = package.__install_requires__,
     name             = package.__project__,
     #platforms        = package.__platforms__,
-    packages         = find_packages(exclude=['docs', 
-                                              'examples', 'tests']),
+    packages         = find_packages(exclude=package.__exclude_project_dirs__),
     url              = package.__url__,
     version          = versioneer.get_version(),
     cmdclass         = versioneer.get_cmdclass(),
     zip_safe         = package.__zip_safe__,
-    python_requires  = '>=3.5',
+    python_requires  = package.__python_version_required__,
  )