-
Notifications
You must be signed in to change notification settings - Fork 3
skpkg: add cookiecutter.json, fix rendering issues in readme, add index.rst, add conftest.py, update requirements folder, update manifest.in #22
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
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
46ff20f
skpkg: add cookiecutter.json
zmx27 c1e94a1
docs: add index.rst to allow docs to build, fix rendering issues in r…
zmx27 5c9a781
chore: change license to .rst
zmx27 bd69552
chore: add news file
zmx27 2ee37a8
skpkg: add pip.txt to requirements folder
zmx27 04b8365
skpkg: update MANIFEST.in
zmx27 0186c51
skpkg: add conftest.py, add cli utility from skpkg
zmx27 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
This file contains hidden or 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,3 +1,12 @@ | ||
| recursive-include DistancePrinter * | ||
| prune doc | ||
| exclude MANIFEST.in | ||
| graft src | ||
| graft tests | ||
| graft requirements | ||
|
|
||
| include AUTHORS.rst LICENSE*.rst README.rst | ||
|
|
||
| # Exclude all bytecode files and __pycache__ directories | ||
| global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files. | ||
| global-exclude .DS_Store # Exclude Mac filesystem artifacts. | ||
| global-exclude __pycache__ # Exclude Python cache directories. | ||
| global-exclude .git* # Exclude git files and directories. | ||
| global-exclude .idea # Exclude PyCharm project settings. |
This file contains hidden or 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 contains hidden or 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,18 @@ | ||
| { | ||
| "maintainer_name": "Simon Billinge", | ||
| "maintainer_email": "sb2896@columbia.edu", | ||
| "maintainer_github_username": "sbillinge", | ||
| "contributors": "Xiaohao Yang and Billinge Group members", | ||
| "license_holders": "The Trustees of Columbia University in the City of New York", | ||
| "project_name": "diffpy.distanceprinter", | ||
| "github_username_or_orgname": "diffpy", | ||
| "github_repo_name": "diffpy.distanceprinter", | ||
| "conda_pypi_package_dist_name": "diffpy.distanceprinter", | ||
| "package_dir_name": "diffpy.distanceprinter", | ||
| "project_short_description": "Distance Printer, calculate the inter atomic distances. Part of xPDFsuite.", | ||
| "project_keywords": "diffpy, pdf, data-interpretation", | ||
| "minimum_supported_python_version": "3.11", | ||
| "maximum_supported_python_version": "3.13", | ||
| "project_needs_c_code_compiled": "No", | ||
| "project_has_gui_tests": "No" | ||
| } |
This file contains hidden or 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,57 @@ | ||
| ####### | ||
| |title| | ||
| ####### | ||
|
|
||
| .. |title| replace:: diffpy.distanceprinter documentation | ||
|
|
||
| ``diffpy.distanceprinter`` - Distance Printer, calculate the inter atomic distances. Part of xPDFsuite. | ||
|
|
||
| | Software version |release| | ||
| | Last updated |today|. | ||
|
|
||
| =============== | ||
| Getting started | ||
| =============== | ||
|
|
||
| Welcome to the ``diffpy.distanceprinter`` documentation! | ||
|
|
||
| This package is not designed to be installed independently. To get started, please visit | ||
| https://www.diffpy.org/products/xPDFsuite.html for more information about the xpdfsuite package and | ||
| download the package together with ``diffpy.xpdfsuite``. | ||
|
|
||
| ======= | ||
| Authors | ||
| ======= | ||
|
|
||
| ``diffpy.distanceprinter`` is developed by Xiaohao Yang and Billinge Group members. The maintainer for this project is Simon Billinge. For a detailed list of contributors see | ||
| https://github.com/diffpy/diffpy.distanceprinter/graphs/contributors. | ||
|
|
||
| ============ | ||
| Installation | ||
| ============ | ||
|
|
||
| See the `README <https://github.com/diffpy/diffpy.distanceprinter#installation>`_ | ||
| file included with the distribution. | ||
|
|
||
| ================ | ||
| Acknowledgements | ||
| ================ | ||
|
|
||
| ``diffpy.distanceprinter`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_. | ||
|
|
||
| ================= | ||
| Table of contents | ||
| ================= | ||
| .. toctree:: | ||
| :maxdepth: 2 | ||
|
|
||
| Package API <api/diffpy.distanceprinter> | ||
| release | ||
| license | ||
|
|
||
| ======= | ||
| Indices | ||
| ======= | ||
|
|
||
| * :ref:`genindex` | ||
| * :ref:`search` |
This file contains hidden or 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,23 @@ | ||
| **Added:** | ||
|
|
||
| * No news added: Fix documentation errors | ||
|
|
||
| **Changed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Deprecated:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Removed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Fixed:** | ||
|
|
||
| * <news item> | ||
|
|
||
| **Security:** | ||
|
|
||
| * <news item> |
This file contains hidden or 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 contains hidden or 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,3 @@ | ||
| numpy | ||
| diffpy.pdffit2 | ||
| diffpy.structure |
This file contains hidden or 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,33 @@ | ||
| import argparse | ||
|
Collaborator
Author
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. CLI utility provided by skpkg. Got this from |
||
|
|
||
| from diffpy.distanceprinter.version import __version__ # noqa | ||
|
|
||
|
|
||
| def main(): | ||
| parser = argparse.ArgumentParser( | ||
| prog="diffpy.distanceprinter", | ||
| description=( | ||
| "Distance Printer, calculate the inter atomic distances. Part of xPDFsuite.\n\n" | ||
| "For more information, visit: " | ||
| "https://github.com/diffpy/diffpy.distanceprinter/" | ||
| ), | ||
| formatter_class=argparse.RawDescriptionHelpFormatter, | ||
| ) | ||
|
|
||
| parser.add_argument( | ||
| "--version", | ||
| action="store_true", | ||
| help="Show the program's version number and exit", | ||
| ) | ||
|
|
||
| args = parser.parse_args() | ||
|
|
||
| if args.version: | ||
| print(f"diffpy.distanceprinter {__version__}") | ||
| else: | ||
| # Default behavior when no arguments are given | ||
| parser.print_help() | ||
|
|
||
|
|
||
| if __name__ == "__main__": | ||
| main() | ||
This file contains hidden or 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,19 @@ | ||
| import json | ||
| from pathlib import Path | ||
|
|
||
| import pytest | ||
|
|
||
|
|
||
| @pytest.fixture | ||
| def user_filesystem(tmp_path): | ||
| base_dir = Path(tmp_path) | ||
| home_dir = base_dir / "home_dir" | ||
| home_dir.mkdir(parents=True, exist_ok=True) | ||
| cwd_dir = base_dir / "cwd_dir" | ||
| cwd_dir.mkdir(parents=True, exist_ok=True) | ||
|
|
||
| home_config_data = {"username": "home_username", "email": "home@email.com"} | ||
| with open(home_dir / "diffpyconfig.json", "w") as f: | ||
| json.dump(home_config_data, f) | ||
|
|
||
| yield tmp_path |
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.
Points to the file
src/diffpy/distanceprinter/distanceprinter_app.py