-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
PR: House cleaning #7785
Merged
Merged
PR: House cleaning #7785
Changes from 45 commits
Commits
Show all changes
47 commits
Select commit
Hold shift + click to select a range
b6aa16e
Remove unnessesary vitables and pythonxy icons
CAM-Gerlach 55bbcdf
Remove no longer used PyDev and SciPy icons
CAM-Gerlach 60a83c8
Removed no-longer-needed Qt external tools icons
CAM-Gerlach c386485
Remove no longer used filetype icons after considerable testing
CAM-Gerlach 076eb49
Replace loading sprites with unclear license with homemade ones
CAM-Gerlach ad9b6ca
Remove alternate Python logo
CAM-Gerlach 440365f
Remove use of Github logo
CAM-Gerlach 41a65b6
Move and expand addtional license info from LICENSE to NOTICES.txt
CAM-Gerlach fb08938
Add LICENSE.txt file in root of images directory
CAM-Gerlach 490f144
Remove outline and py PNGs from img_src that are no longer used
CAM-Gerlach 1edcdd9
Minor reorganization and additional clarification in NOTICES.txt
CAM-Gerlach dd5931d
Add Font Awesome information to NOTICES.txt and SIL OFL 1.1 text
CAM-Gerlach f331332
Add SVG sources for Oxygen assets and accompyning text
CAM-Gerlach c41f349
Add MathJax license and information to NOTICES.txt and subdirectory
CAM-Gerlach 518e98e
Add jQuery and Sizzle, along with GPLv2 and BSD-3 to NOTICES.txt
CAM-Gerlach 847ed23
Fix headers/docstrings for QCrash and Githubpy and add to NOTICES
CAM-Gerlach 868be7b
Move QCrash Github tests into more appropriate directory
CAM-Gerlach 5fee34f
Add Sphinxify and related information to NOTICES.txt
CAM-Gerlach ef505a4
Add IPython and Jupyter QtConsole to headers and NOTICES.txt
CAM-Gerlach b82016f
Add BinaryOrNot headers and to NOTICES.txt, and version numbers
CAM-Gerlach 2a6bdcb
Add LICENSE.txt and README.rst to externals dir and info to __init__
CAM-Gerlach fcbf413
Add Twisted copyright to headers and NOTICE.txt
CAM-Gerlach d79df69
Add LICENSE.txt and __init__ headers in Help utils directory
CAM-Gerlach 6005290
Add collapse sections from Sphinx Cloud theme headers and NOTICE.txt
CAM-Gerlach 565e4fa
Add headers and NOTICE.txt info for copybutton from PSF docs theme
CAM-Gerlach 394d60c
Tweak headers for WaitingSpinner and add to NOTICE.txt
CAM-Gerlach c9a665c
Update dataframeeditor header and NOTICE.txt information
CAM-Gerlach 2fe7ed7
Update missing/placeholder copyright statements in gettext files
CAM-Gerlach 47b95a7
Update About dialog w/ copyright info etc and fix links not working
CAM-Gerlach 0a42a04
Add specific legal details to README where required or requested
CAM-Gerlach 72b3b0b
Merge latest changes from 3.x to fix Travis tests
CAM-Gerlach ef3f7f3
Update .ciocopyright with updated copyright headers
CAM-Gerlach 687c9a5
Harmonize LICENSE and MANIFEST.in to LF EOLs
CAM-Gerlach a613360
Move NOTICES.txt to NOTICE.txt and update references
CAM-Gerlach b2837ee
Moves AUTHORS and LICENSE to .txt, update refs and reorg MANIFEST.in
CAM-Gerlach 1b60100
Add additional authorship information and links to AUTHORS.txt
CAM-Gerlach 73bc2f3
Clean up LICENSE and init docstr for reliable machine-readibility
CAM-Gerlach efecf03
Add instructions and template in NOTICE.txt
CAM-Gerlach 049f0d0
Add instructions in CONTRIBUTING guide for third party projects
CAM-Gerlach 0cd850a
Add legal affirmation to pull request template
CAM-Gerlach fd4e00a
Merge from 3.x to fix tests on CircleCI
CAM-Gerlach 7c14181
Rename Oxygen Icon set directory in img_src to lower case
CAM-Gerlach 5ce0d24
Minor text tweaks in README and LICENSE for clarity
CAM-Gerlach 8c39472
Revert LF harmonization and re-organization in MANIFEST and fix bug
CAM-Gerlach d80242a
Revert About dialog change to non-modal
CAM-Gerlach f0bba41
Remove some non-vital blank lines in the NOTICE.txt file
CAM-Gerlach 3f6cfc5
Merge with 3.x to fix remaining test failure
CAM-Gerlach File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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,6 @@ | ||
# ----------------------------------------------------------------------------- | ||
# Copyright (c) Spyder Project Contributors | ||
# Copyright (c) 2009- Spyder Project Contributors | ||
# | ||
# Licensed under the terms of the MIT License | ||
# Distributed under the terms of the MIT License | ||
# (see spyder/__init__.py for details) | ||
# ----------------------------------------------------------------------------- | ||
# ----------------------------------------------------------------------------- |
This file contains 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 was deleted.
Oops, something went wrong.
This file contains 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,25 @@ | ||
The Spyder Project Contributors is composed of: | ||
|
||
* Pierre Raybaut <pierre.raybaut@gmail.com> (Main Spyder author) | ||
* Carlos Cordoba <ccordoba12@gmail.com> (Current maintainer) | ||
* All other developers that have contributed to the spyder repository: | ||
<https://github.com/spyder-ide/spyder/graphs/contributors> | ||
|
||
Additionally, some assets and code were originally sourced from third-party | ||
authors or projects, including: | ||
|
||
* The icons for the Spyder 3 theme are derived from Font Awesome, by | ||
David Gandy <https://fontawesome.com/> | ||
* Most Spyder 2 theme icons are sourced from the Crystal Project icon set, by | ||
Everaldo Coelho <https://www.everaldo.com> | ||
* Other Spyder 2 icons are from Yusuke Kamiyamane's icon sets, by | ||
Yusuke Kamiyamane <http://p.yusukekamiyamane.com/> | ||
* As well as the FamFamFam Silk icon set, by | ||
Mark James <http://www.famfamfam.com/lab/icons/silk/> | ||
* And the KDE Oxygen icons, by | ||
The KDE Artists <https://www.kde.org/> | ||
|
||
For information about the sources and authors of other third-party code | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I agree with leaving this paragraph. |
||
and other resources used, please see the NOTICE.txt file, located in the | ||
root of the spyder repository or online at: | ||
<https://github.com/spyder-ide/spyder/blob/master/NOTICE.txt> |
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These are not authors of the project, at least in the way we mean here. So I think all this text should be removed.
Developers of the several projects we have taken code from (like QCrash or gtabview) are more authors of the Spyder source code than Icon developers (I know that's debatable, but this addition doesn't make any sense to me).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, I would normally agree with that, and not include this section. However, there is a very specific reason this is here—the licenses of at least half (2/4) the external icon sources (CC-BY) require an attribution credit wherever other authors of the covered work are normally listed, and additionally both authors if I recall explicitly requested it (that's also why I added it them to the README and kept them in the About screen, where they were already listed); the LGPL (which the other half of the icons are under) also contains a somewhat less clear clause that implies something similar. Even if some didn't require it (IANAL, after all), it would be rather odd and inconsistent to only list certain icon authors and not others so I listed all of them, as we already did in our About dialog in the application itself.
However, if you have a better idea that would still meet the legal and ethical requirements, I'm certainly open to hearing it, since this isn't an ideal solution as you mention.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't find anything for that in my search of
3.x
for third-party material, and searching for that right now reveals no hits, unlike inmaster
where I can see it is clearly marked. Is the code in3.x
also and someone was delinquent about adding the appropriate copyright notices, disclaimer and license to that branch, or is it only inmaster
and I'll need to do it after this is merged there?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps it is just the word "authors" that is the issue here, and we should call them "designers" or "artists".
Generally, I think we should be generous in giving credit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Correct me if I'm wrong, but if I understand @ccordoba12 's point correctly, its really that we mention the icon authors there, but not those of the external source code we've used, which may arguably be seen as even more central to Spyder. I agree that its inconsistent, but including the icon authors is motivated by the requirements of the licenses and their specific requests (and they are also the ones listed in the About dialog already), while if we were to include all the authors of the code as well, it would be much longer and rather duplicative of the NOTICE.txt file. However, on the other hand, it could be seen as a convenient summary of the 4000-line latter, so if that's what's agreed on then I can do that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, they are the authors of their icons but not the authors of Spyder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Anyway, this is just ugly, but if we have to do it to comply to the license, then there's no point in keep arguing about it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Authors of the Spyder code, no. But they are as much authors of the combined end product, which includes their icons, as anyone else who contributes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't want to keep arguing about this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right, sorry.