Skip to content

Commit e1b2018

Browse files
authored
Merge pull request #15 from dabeycorn/doc
skpkg: migrate documentation, README, and public static files
2 parents 9a2c35f + 7c8e5e9 commit e1b2018

File tree

17 files changed

+881
-25
lines changed

17 files changed

+881
-25
lines changed

.github/workflows/build-wheel-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,4 +227,4 @@ jobs:
227227
needs: [test-wheels]
228228
uses: ./.github/workflows/release-github.yml
229229
secrets:
230-
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}
230+
PAT_TOKEN: ${{ secrets.PAT_TOKEN }}

.github/workflows/release-github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,4 +160,4 @@ jobs:
160160
curl --silent --fail --data-binary @"$FILE" \
161161
-H "Content-Type: application/zip" \
162162
-H "Authorization: Bearer $PAT_TOKEN" \
163-
"${{ steps.create_release.outputs.upload_url }}?name=$(basename "$FILE")"
163+
"${{ steps.create_release.outputs.upload_url }}?name=$(basename "$FILE")"

AUTHORS.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Authors
2+
=======
3+
4+
Xiaohao Yang and Billinge Group members
5+
6+
Contributors
7+
------------
8+
9+
For a list of contributors, visit
10+
https://github.com/diffpy/diffpy.distanceprinter/graphs/contributors

AUTHORS.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
=============
2+
Release notes
3+
=============
4+
5+
.. current developments

CODE-OF-CONDUCT.rst

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
=====================================
2+
Contributor Covenant Code of Conduct
3+
=====================================
4+
5+
Our Pledge
6+
----------
7+
8+
We as members, contributors, and leaders pledge to make participation in our
9+
community a harassment-free experience for everyone, regardless of age, body
10+
size, visible or invisible disability, ethnicity, sex characteristics, gender
11+
identity and expression, level of experience, education, socioeconomic status,
12+
nationality, personal appearance, race, caste, color, religion, or sexual
13+
identity and orientation.
14+
15+
We pledge to act and interact in ways that contribute to an open, welcoming,
16+
diverse, inclusive, and healthy community.
17+
18+
Our Standards
19+
-------------
20+
21+
Examples of behavior that contributes to a positive environment for our
22+
community include:
23+
24+
* Demonstrating empathy and kindness toward other people
25+
* Being respectful of differing opinions, viewpoints, and experiences
26+
* Giving and gracefully accepting constructive feedback
27+
* Accepting responsibility and apologizing to those affected by our mistakes,
28+
and learning from the experience
29+
* Focusing on what is best not just for us as individuals, but for the overall
30+
community
31+
32+
Examples of unacceptable behavior include:
33+
34+
* The use of sexualized language or imagery, and sexual attention or advances of
35+
any kind
36+
* Trolling, insulting or derogatory comments, and personal or political attacks
37+
* Public or private harassment
38+
* Publishing others' private information, such as a physical or email address,
39+
without their explicit permission
40+
* Other conduct which could reasonably be considered inappropriate in a
41+
professional setting
42+
43+
Enforcement Responsibilities
44+
----------------------------
45+
46+
Community leaders are responsible for clarifying and enforcing our standards of
47+
acceptable behavior and will take appropriate and fair corrective action in
48+
response to any behavior that they deem inappropriate, threatening, offensive,
49+
or harmful.
50+
51+
Community leaders have the right and responsibility to remove, edit, or reject
52+
comments, commits, code, wiki edits, issues, and other contributions that are
53+
not aligned to this Code of Conduct, and will communicate reasons for moderation
54+
decisions when appropriate.
55+
56+
Scope
57+
-----
58+
59+
This Code of Conduct applies within all community spaces, and also applies when
60+
an individual is officially representing the community in public spaces.
61+
Examples of representing our community include using an official email address,
62+
posting via an official social media account, or acting as an appointed
63+
representative at an online or offline event.
64+
65+
Enforcement
66+
-----------
67+
68+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
69+
reported to the community leaders responsible for enforcement at
70+
sb2896@columbia.edu. All complaints will be reviewed and investigated promptly and fairly.
71+
72+
All community leaders are obligated to respect the privacy and security of the
73+
reporter of any incident.
74+
75+
Enforcement Guidelines
76+
----------------------
77+
78+
Community leaders will follow these Community Impact Guidelines in determining
79+
the consequences for any action they deem in violation of this Code of Conduct:
80+
81+
1. Correction
82+
****************
83+
84+
**Community Impact**: Use of inappropriate language or other behavior deemed
85+
unprofessional or unwelcome in the community.
86+
87+
**Consequence**: A private, written warning from community leaders, providing
88+
clarity around the nature of the violation and an explanation of why the
89+
behavior was inappropriate. A public apology may be requested.
90+
91+
2. Warning
92+
*************
93+
94+
**Community Impact**: A violation through a single incident or series of
95+
actions.
96+
97+
**Consequence**: A warning with consequences for continued behavior. No
98+
interaction with the people involved, including unsolicited interaction with
99+
those enforcing the Code of Conduct, for a specified period of time. This
100+
includes avoiding interactions in community spaces as well as external channels
101+
like social media. Violating these terms may lead to a temporary or permanent
102+
ban.
103+
104+
3. Temporary Ban
105+
******************
106+
107+
**Community Impact**: A serious violation of community standards, including
108+
sustained inappropriate behavior.
109+
110+
**Consequence**: A temporary ban from any sort of interaction or public
111+
communication with the community for a specified period of time. No public or
112+
private interaction with the people involved, including unsolicited interaction
113+
with those enforcing the Code of Conduct, is allowed during this period.
114+
Violating these terms may lead to a permanent ban.
115+
116+
4. Permanent Ban
117+
******************
118+
119+
**Community Impact**: Demonstrating a pattern of violation of community
120+
standards, including sustained inappropriate behavior, harassment of an
121+
individual, or aggression toward or disparagement of classes of individuals.
122+
123+
**Consequence**: A permanent ban from any sort of public interaction within the
124+
community.
125+
126+
Attribution
127+
-----------
128+
129+
This Code of Conduct is adapted from the `Contributor Covenant <https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>`_.
130+
131+
Community Impact Guidelines were inspired by `Mozilla's code of conduct enforcement ladder <https://github.com/mozilla/inclusion>`_.
132+
133+
For answers to common questions about this code of conduct, see the `FAQ <https://www.contributor-covenant.org/faq>`_. `Translations are available <https://www.contributor-covenant.org/translations>`_

LICENSENOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ prohibited. If you don’t know whether or not your anticipated use is under
55
a license, you must contact Prof. Simon Billinge at sb2896@columbia.edu.
66
Use of this software without a license is prohibited.
77

8-
Copyright 2009-2014, Trustees of Columbia University in the City of New York.
8+
Copyright 2009-2025, Trustees of Columbia University in the City of New York.
99

1010
For more information please email Prof. Simon Billinge at sb2896@columbia.edu

README.rst

Lines changed: 89 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,102 @@
1-
DistancePrinter
2-
========================================================================
1+
|Icon| |title|_
2+
===============
33

4-
Software for calculating inter-atomic distance for given structure
4+
.. |title| replace:: diffpy.distanceprinter
5+
.. _title: https://diffpy.github.io/diffpy.distanceprinter
56

7+
.. |Icon| image:: https://avatars.githubusercontent.com/diffpy
8+
:target: https://diffpy.github.io/diffpy.distanceprinter
9+
:height: 100px
610

7-
REQUIREMENTS
8-
------------------------------------------------------------------------
11+
|PythonVersion| |PR|
912

10-
The DistancePrinter requires Python 2.7 and the following software:
13+
|Black| |Tracking|
1114

12-
* ``diffpy.pdffit``
15+
.. |Black| image:: https://img.shields.io/badge/code_style-black-black
16+
:target: https://github.com/psf/black
1317

14-
INSTALLATION
15-
------------------------------------------------------------------------
18+
.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff
19+
:target: https://github.com/diffpy/diffpy.distanceprinter/pulls
1620

17-
To install the DistancePrinter package:
21+
.. |PythonVersion| image:: https://img.shields.io/badge/python-3.11%20|%203.12%20|%203.13-blue
22+
:target: https://pypi.org/project/diffpy.distanceprinter/
1823

19-
python setup.py install
24+
.. |Tracking| image:: https://img.shields.io/badge/issue_tracking-github-blue
25+
:target: https://github.com/diffpy/diffpy.distanceprinter/issues
2026

21-
By default the files are installed in the system directories, which are
22-
usually only writeable by the root. See the usage info "./setup.py install
23-
--help" for options to install as a normal user under a different location.
24-
Note that installation to non-standard directories you may require adjustments
25-
to the PATH and PYTHONPATH environment variables.
27+
Distance Printer, calculate the inter atomic distances. Part of xPDFsuite
2628

27-
CONTACTS
28-
------------------------------------------------------------------------
29+
Citation
30+
--------
2931

30-
For more information on diffpy.Structure please visit the project web-page
32+
If you use diffpy.distanceprinter in a scientific publication, we would like you to cite this package as
3133

32-
http://www.diffpy.org/
34+
Xiaohao Yang, Pavol Juhas, Christopher L. Farrow and Simon J. L. Billinge, xPDFsuite: an end-to-end
35+
software solution for high throughput pair distribution function transformation, visualization and
36+
analysis, arXiv 1402.3163 (2025)
3337

34-
or email Prof. Simon Billinge at sb2896@columbia.edu.
38+
Installation
39+
------------
40+
``diffpy.distanceprinter`` is normally installed as part of the ``xpdfsuite`` software, so please refer to the
41+
installation instructions detailed in the ``README.rst`` file of ``xpdfsuite`` `here <https://github.com/diffpy/diffpy.xpdfsuite/blob/main/README.rst>`_.
42+
43+
Independent Installation
44+
------------------------
45+
You can also install ``diffpy.distanceprinter`` independently for yourself.
46+
47+
Assuming you have a wheel file in the current working directory, in an active conda environment please type
48+
49+
pip install ./diffpy.distanceprinter-VERSION.whl
50+
51+
where you replace VERSION with the actual version you have so the command matches the filename of the
52+
wheel file you have.
53+
54+
The commands to create and activate the conda environment with name "distanceprinter-env" is
55+
56+
conda create -n distanceprinter-env python=3.13
57+
conda activate distanceprinter-env
58+
59+
If you don't have conda installed, we recomment you install `miniconda
60+
<https://docs.conda.io/projects/miniconda/en/latest/miniconda-install.html>`_
61+
To install this software from a Python wheel distribution format execute
62+
63+
pip install ./diffpy.distanceprinter-VERSION.whl
64+
65+
If you are a developer, you can also install this package from sources. First, obtain the source archive
66+
from `GitHub <https://github.com/diffpy/diffpy.distanceprinter/>`_.
67+
Install the packages in ``./requirements/conda.txt`` and ``./requirements/tests.txt``
68+
using the `--file`` command:
69+
70+
conda activate distanceprinter-env
71+
conda install --file ./requirements/conda.txt
72+
conda install --file ./requirements/tests.txt
73+
pip install -e . # assuming you are in the top level directory of the package
74+
75+
After installing the dependencies, ``cd`` into your ``diffpy.distanceprinter`` directory
76+
and run the following ::
77+
78+
pip install .
79+
80+
This package also provides command-line utilities. To check the software has been installed correctly, type ::
81+
82+
diffpy.distanceprinter --version
83+
84+
You can also type the following command to verify the installation. ::
85+
86+
python -c "import diffpy.distanceprinter; print(diffpy.distanceprinter.__version__)"
87+
88+
89+
To view the basic usage and available commands, type ::
90+
91+
diffpy.distanceprinter -h
92+
93+
94+
Contact
95+
-------
96+
97+
For more information on diffpy.distanceprinter please visit the project `web-page <https://www.diffpy.org>`_ or email Simon J.L. Billinge Group at sb2896@columbia.edu.
98+
99+
Acknowledgements
100+
----------------
101+
102+
``diffpy.distanceprinter`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_.

0 commit comments

Comments
 (0)