Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Added shore gpl warning in the readme #525

Merged
merged 2 commits into from
Dec 28, 2014
Merged

Added shore gpl warning in the readme #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9b010e
Added shore gpl warning
samuelstjean Dec 28, 2014
905b4b0
Update README.rst
samuelstjean Dec 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions README.rst
View file
Open in desktop
Expand Up @@ -34,5 +34,9 @@ You can find our sources and single-click downloads:
License
=======

Dipy is licensed under the terms of the BSD license. Some code included with
dipy is also licensed under the BSD license. Please see the LICENSE file in the dipy distribution.
Dipy is licensed under the terms of the BSD license.
Some code included with dipy is also licensed under the BSD license.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No this needs to be changed. Some code ???

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was there before this PR. I agree - looks weird.

On Sun, Dec 28, 2014 at 11:14 AM, Eleftherios Garyfallidis <
notifications@github.com> wrote:

In README.rst
#525 (diff):

@@ -34,5 +34,9 @@ You can find our sources and single-click downloads:
License

-Dipy is licensed under the terms of the BSD license. Some code included with
-dipy is also licensed under the BSD license. Please see the LICENSE file in the dipy distribution.
+Dipy is licensed under the terms of the BSD license.
+Some code included with dipy is also licensed under the BSD license.

No this needs to be changed. Some code ???

—
Reply to this email directly or view it on GitHub
https://github.com/nipy/dipy/pull/525/files#r22299531.

The SHORE implementation included with dipy depends on CVXOPT,
which is licensed under the GPL license :
you may be subject to this license when using SHORE.
Please see the LICENSE file in the dipy distribution.
2 changes: 1 addition & 1 deletion dipy/reconst/shore.py
View file
Open in desktop
Expand Up @@ -233,7 +233,7 @@ def fit(self, data):
'CVXOPT package needed to enforce constraints')
w_s = "The implementation of SHORE depends on CVXOPT "
w_s += " (http://cvxopt.org/). This software is licensed "
w_s += "under the GPL (see: http://cvxopt.org/copyright.html). "
w_s += "under the GPL (see: http://cvxopt.org/copyright.html) "
w_s += " and you may be subject to this license when using SHORE."
warn(w_s)
import cvxopt.solvers
Expand Down