Skip to content

Add license files#109

Merged
sbillinge merged 9 commits into
diffpy:mainfrom
bobleesj:patch-2
Sep 17, 2024
Merged

Add license files#109
sbillinge merged 9 commits into
diffpy:mainfrom
bobleesj:patch-2

Conversation

@bobleesj
Copy link
Copy Markdown
Contributor

No description provided.

@bobleesj bobleesj marked this pull request as ready for review September 17, 2024 22:33
@bobleesj
Copy link
Copy Markdown
Contributor Author

Will need to update toml as well. One moment.

Copy link
Copy Markdown
Contributor Author

@bobleesj bobleesj left a comment

Choose a reason for hiding this comment

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

Ready for review @sbillinge

Comment thread pyproject.toml Outdated
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Other/Proprietary License',
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

https://pypi.org/classifiers/

Using the convention from above.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is not proprietary. Is there one that says something like free for use with restrictions or sthg that actually matches what hte license says?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

License :: Free To Use But Restricted

How about this?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Please see the new update.

License :: Free To Use But Restricted is used.

Copy link
Copy Markdown
Contributor

@sbillinge sbillinge left a comment

Choose a reason for hiding this comment

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

please see comments.

Comment thread LICENSE.txt Outdated
@@ -0,0 +1,137 @@
OPEN SOURCE LICENSE AGREEMENT
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We would like this to be LICENSE.rst, but rst format but with the text from LICENSE.txt

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

Comment thread LICENSE.txt Outdated
OPEN SOURCE LICENSE AGREEMENT
=============================

Copyright (c) 2009-2011, University of Tennessee
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we need to update the copyright so that 2019-2024 is columbia again.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

done

Comment thread LICENSE_DANSE.txt
Comment thread pyproject.toml Outdated
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Other/Proprietary License',
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this is not proprietary. Is there one that says something like free for use with restrictions or sthg that actually matches what hte license says?

@bobleesj
Copy link
Copy Markdown
Contributor Author

bobleesj commented Sep 17, 2024

Addressed

  • License classifier on pytoml
  • Added year to copyrights in LICNESE.rst
  • changed LICENSE.txt to LICENSE.rst

Ready for review

Comment thread LICENSE.rst
Comment thread pyproject.toml
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Free To Use But Restricted',
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Available!

@sbillinge sbillinge merged commit 688669a into diffpy:main Sep 17, 2024
@bobleesj bobleesj deleted the patch-2 branch September 17, 2024 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants