Skip to content

skpkg: migrate documentation, README, and public static files #204

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

Merged
merged 12 commits into from
Jun 13, 2025

Conversation

zmx27
Copy link
Contributor

@zmx27 zmx27 commented Jun 12, 2025

No description provided.

Copy link

codecov bot commented Jun 12, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 97.23%. Comparing base (fc5bac1) to head (b397292).
Report is 14 commits behind head on migration.

Additional details and impacted files
@@            Coverage Diff             @@
##           migration     #204   +/-   ##
==========================================
  Coverage      97.23%   97.23%           
==========================================
  Files             20       20           
  Lines            903      903           
==========================================
  Hits             878      878           
  Misses            25       25           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@zmx27
Copy link
Contributor Author

zmx27 commented Jun 12, 2025

@sbillinge I said I would redo this in another branch but ended up not doing that because I realized that pulling from upstream in a new branch undid all of the changes that scikit-package made, which is not what we want. Here, I added back the folder, but omitted the following files because they were too large:

doc/manual/images/morph_ex1.png
doc/manual/images/nacl_example.agr
doc/manual/images/nacl_example.xcf
doc/manual/pdfmorph.pdf

How should I deal with these? Other than that, 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.

OK, so the example doc files need to be removed (this is why we would like package update public, so I don't have to write this review message!).

Also the index.rst needs to be properly merged from the original.

When you do those things I can merge this and we can work on the large files.

For any pdf or image files we might want to investigate why they are large and look for ways to compress them. It is not hte end of the world that they are big but it makes things harder for people with slow internet connections! I think there is an example dataset or two in there too. We could fight with making them smaller, but it is probably not worth it so we wlil just merge those. I can do that.

@zmx27
Copy link
Contributor Author

zmx27 commented Jun 12, 2025

@sbillinge this is ready for review after addressing your concerns. I will make another PR once this is merged with my best attempt at compressing the large files

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

README.rst Outdated

If the above does not work, you can use ``pip`` to download and install the latest release from
`Python Package Index <https://pypi.python.org>`_.
To install using ``pip`` into your ``diffpy.morph_env`` environment, we will also have to install dependencies ::
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we shouldn't remove this block. In general, we don't want to remove things coming from the old package, unless it is something that is modified/improved in the new package.

LICENSE.rst Outdated
@@ -1,7 +1,6 @@
BSD 3-Clause License

Copyright (c) 2024, The Trustees of Columbia University
in the City of New York.
Copyright (c) 2025, The Trustees of Columbia University in the City of New York.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think we need this to be 2024-2025

README.rst Outdated
pip install -r https://raw.githubusercontent.com/diffpy/diffpy.morph/main/requirements/pip.txt

and then install the package ::
To install using ``pip`` into your ``diffpy.morph_env`` environment, type ::
Copy link
Contributor

Choose a reason for hiding this comment

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

remove this if we keep the block before.

@@ -0,0 +1,79 @@
:tocdepth: -1
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 a template example file we want to remove it. Also the skpkg image below. This is one reason I want the package update public

@@ -1,10 +1,12 @@
#############################################
Copy link
Contributor

Choose a reason for hiding this comment

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

keep the old title

@@ -9,8 +9,7 @@ OPEN SOURCE LICENSE AGREEMENT
=============================
BSD 3-Clause License

Copyright (c) 2024, The Trustees of Columbia University in
the City of New York.
Copyright (c) 2025, The Trustees of Columbia University in the City of New York.
Copy link
Contributor

Choose a reason for hiding this comment

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

2024-2025

@zmx27
Copy link
Contributor Author

zmx27 commented Jun 12, 2025

@sbillinge ready for review

@sbillinge sbillinge merged commit 71e6fbb into diffpy:migration Jun 13, 2025
4 checks passed
@sbillinge
Copy link
Contributor

phew, that was a lot of work..... We just need the large files worked on.

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