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.

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

Add license files #109

Merged
merged 9 commits into from
Sep 17, 2024
Merged

Add license files #109

merged 9 commits into from
Sep 17, 2024

Conversation

bobleesj
Copy link
Contributor

No description provided.

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

Will need to update toml as well. One moment.

Copy link
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

pyproject.toml Outdated
@@ -20,7 +20,7 @@ classifiers = [
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Other/Proprietary License',
Copy link
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
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
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
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
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.

LICENSE.txt Outdated
@@ -0,0 +1,137 @@
OPEN SOURCE LICENSE AGREEMENT
Copy link
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
Contributor Author

Choose a reason for hiding this comment

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

done

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

Copyright (c) 2009-2011, University of Tennessee
Copy link
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
Contributor Author

Choose a reason for hiding this comment

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

done

LICENSE_DANSE.txt Show resolved Hide resolved
pyproject.toml Outdated
@@ -20,7 +20,7 @@ classifiers = [
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Other/Proprietary License',
Copy link
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
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

LICENSE.rst Show resolved Hide resolved
@@ -20,7 +20,7 @@ classifiers = [
'Environment :: Console',
'Intended Audience :: Developers',
'Intended Audience :: Science/Research',
'License :: OSI Approved :: BSD License',
'License :: Free To Use But Restricted',
Copy link
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
3 checks passed
@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