-
Notifications
You must be signed in to change notification settings - Fork 9
FIX: fix conda recipe and pip dependencies #130
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
prjemian
merged 4 commits into
BCDA-APS:master
from
mrakitin:fix-conda-recipe-and-pip-deps
May 7, 2019
Merged
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,10 @@ | ||
| versioneer | ||
| coverage | ||
| coveralls | ||
| pyRestTable | ||
| bluesky | ||
| databroker[all] | ||
| historydict | ||
| ophyd | ||
| pandas | ||
| pyRestTable | ||
| xlrd |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.