Skip to content

skpkg: migrate documentation and rst files #137

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

Closed
wants to merge 10 commits into from

Conversation

cadenmyers13
Copy link
Contributor

I added autodoc_mock_imports = ["diffpy.pdffit2.pdffit2",] to conf.py due to a circular import error in src/pdffit2/__init__.py and src/pdffit2/pdffit.py. Without this, the package API does not render. This could be fixed with a "lazy import" in pdffit.py, but that seems way more involved and i dont want to break anything.

@@ -65,7 +65,7 @@ Release Notes
* No notable functional changes from 1.4.1

1.4.4rc0
=====
========
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Needed to be extended to docs could render properly

Copy link

codecov bot commented Jun 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.97%. Comparing base (74add76) to head (6915dc8).
Report is 3 commits behind head on migration.

Additional details and impacted files
@@            Coverage Diff             @@
##           migration     #137   +/-   ##
==========================================
  Coverage      98.97%   98.97%           
==========================================
  Files              6        6           
  Lines           1267     1267           
==========================================
  Hits            1254     1254           
  Misses            13       13           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cadenmyers13
Copy link
Contributor Author

@sbillinge ready for review

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. Please could you harvest anything that needs to be put into anothee issue too? Thx

License
#######

BSD 3-Clause License
Copy link
Contributor

Choose a reason for hiding this comment

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

pretty sure it is not BSD-3 but please check. I need you to be a bit more careful here. The license is a legal thing and we don't want to get it wrong, so please pay close attention.

city of New York. (Copyright holder indicated in each source file).

For more information please visit the project web-page:
http://www.diffpy.org/
or email Prof. Simon Billinge at [email protected]

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Copy link
Contributor

Choose a reason for hiding this comment

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

also a bit nervous about unilaterally changing the license here. It looks as if it is only a change from bullet list to enumerated list, but still. This is another argument for package update public, that it doesn't create a new license file.

@@ -5,6 +5,9 @@
License
#######

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.

same here....no changes to licenses...

@cadenmyers13
Copy link
Contributor Author

@sbillinge license is BSD License as per the pyproject.toml. Is this different that BSD-3?

from pyproject.toml:

        'License :: OSI Approved :: BSD License',

@cadenmyers13
Copy link
Contributor Author

@sbillinge chatGPT thinks the license on main is a BSD-3 license (I tried not to bias it in the query):

it said this:

This license is a variant of the BSD 3-Clause License (permissive open-source). It allows redistribution and modification, with standard conditions:

  • Must retain copyright.
  • Must include the license text in binaries.
  • Cannot use author/institution names to promote derived works without permission.

It also includes a non-binding request to cite a specific paper in scientific publications. The software is distributed as-is, without warranty.

This is a permissive license compatible with open-source and commercial use. ✅

@sbillinge
Copy link
Contributor

yes, it is a variant of BSD-3, i.e., not BSD-3

@cadenmyers13
Copy link
Contributor Author

closing this to redo

@cadenmyers13 cadenmyers13 deleted the rst-migration branch June 13, 2025 14:52
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