Skip to content

Commit 2fd5097

Browse files
authored
Merge pull request #27 from stevenhua0320/doc
2 parents 93dc9db + 5c5a993 commit 2fd5097

File tree

14 files changed

+752
-32
lines changed

14 files changed

+752
-32
lines changed

AUTHORS.rst

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

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>`_

LICENSE.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Copyright (c) 2009-2025, The Trustees of Columbia University in the City of New York.
2+
All rights reserved.
3+
4+
Use of this software is subject to and permitted only under a separate,
5+
written Use License granted by Columbia University. If you or your employer
6+
is not a party to such an agreement, then your use of this software is
7+
prohibited. If you don’t know whether or not your anticipated use is under
8+
a license, you must contact Prof. Simon Billinge at sb2896@columbia.edu.
9+
Use of this software without a license is prohibited.
10+
11+
For more information please email Prof. Simon Billinge at sb2896@columbia.edu

MANIFEST.in

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
recursive-include dpx *
2-
prune doc
3-
exclude MANIFEST.in
1+
graft src
2+
graft tests
3+
graft requirements
4+
5+
include AUTHORS.rst LICENSE*.rst README.rst
6+
7+
# Exclude all bytecode files and __pycache__ directories
8+
global-exclude *.py[cod] # Exclude all .pyc, .pyo, and .pyd files.
9+
global-exclude .DS_Store # Exclude Mac filesystem artifacts.
10+
global-exclude __pycache__ # Exclude Python cache directories.
11+
global-exclude .git* # Exclude git files and directories.
12+
global-exclude .idea # Exclude PyCharm project settings.

README.rst

Lines changed: 81 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,97 @@
1-
dpx.srxplanargui
2-
========================================================================
1+
|Icon| |title|_
2+
===============
3+
4+
.. |title| replace:: diffpy.srxplanargui
5+
.. _title: https://diffpy.github.io/diffpy.srxplanargui
6+
7+
.. |Icon| image:: https://avatars.githubusercontent.com/diffpy
8+
:target: https://diffpy.github.io/diffpy.srxplanargui
9+
:height: 100px
10+
11+
|PythonVersion| |PR|
12+
13+
|Black| |Tracking|
14+
15+
.. |Black| image:: https://img.shields.io/badge/code_style-black-black
16+
:target: https://github.com/psf/black
17+
18+
.. |Codecov| image:: https://codecov.io/gh/diffpy/diffpy.srxplanargui/branch/main/graph/badge.svg
19+
:target: https://codecov.io/gh/diffpy/diffpy.srxplanargui
20+
21+
.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff
22+
:target: https://github.com/diffpy/diffpy.srxplanargui/pulls
23+
24+
.. |PyPI| image:: https://img.shields.io/pypi/v/diffpy.srxplanargui
25+
:target: https://pypi.org/project/diffpy.srxplanargui/
26+
27+
.. |PythonVersion| image:: https://img.shields.io/badge/python-3.11%20|%203.12%20|%203.13-blue
28+
29+
.. |Tracking| image:: https://img.shields.io/badge/issue_tracking-github-blue
30+
:target: https://github.com/diffpy/diffpy.srxplanargui/issues
31+
32+
xPDFsuite, a software for PDF transformation and visualization.
333

434
GUI for diffpy.srxplanar
535

6-
REQUIREMENTS
7-
------------------------------------------------------------------------
36+
Citation
37+
--------
38+
39+
If you use diffpy.srxplanargui in a scientific publication, we would like you to cite this package as
40+
41+
Yang, X., Juhas, P., Farrow, C. L., & Billinge, S. J. (2014).
42+
xPDFsuite: an end-to-end software solution for high throughput pair distribution function transformation,
43+
visualization and analysis. arXiv preprint arXiv:1402.3163.
44+
45+
Installation
46+
------------
47+
48+
The preferred method is to be installed with `xpdfsuite` package or the wheel file.
49+
50+
This package also provides command-line utilities. To check the software has been installed correctly, type ::
51+
52+
diffpy.srxplanargui --version
53+
54+
You can also type the following command to verify the installation. ::
55+
56+
python -c "import diffpy.srxplanargui; print(diffpy.srxplanargui.__version__)"
57+
58+
59+
To view the basic usage and available commands, type ::
60+
61+
diffpy.srxplanargui -h
862

9-
The dpx.srxplanargui requires Python 2.7 and the following software:
63+
Support
64+
----------------------
1065

11-
* ``diffpy.srxplanar``
12-
* ``dpx.confutils``
13-
* ``numpy``
14-
* ``scipy``
15-
* ``traits``
16-
* ``traitsui``
17-
* ``chaco``
66+
If you see a bug or want to request a feature, please `report it as an issue <https://github.com/diffpy/diffpy.srxplanargui/issues>`_ and/or `submit a fix as a PR <https://github.com/diffpy/diffpy.srxplanargui/pulls>`_.
1867

19-
The image integration (diffpy.srxplanargui) requires
68+
Feel free to fork the project. To install diffpy.srxplanargui
69+
in a development mode, with its sources being directly used by Python
70+
rather than copied to a package directory, use the following in the root
71+
directory ::
2072

21-
* ``fabio``
22-
* ``pyfai``
23-
* ``matplotlib``
73+
pip install -e .
2474

25-
INSTALLATION
26-
------------------------------------------------------------------------
75+
To ensure code quality and to prevent accidental commits into the default branch, please set up the use of our pre-commit
76+
hooks.
2777

28-
We are going to release conda package for all platform. For general user
29-
please use the installation file and install software. For developor,
30-
you can install dpx.srxplanargui using
78+
1. Install pre-commit in your working environment by running ``conda install pre-commit``.
3179

32-
python setup.py install
80+
2. Initialize pre-commit (one time only) ``pre-commit install``.
3381

34-
Note: the dependency is not specified in the setup.py. You need to install
35-
them yourself. You can use Anaconda or other python enviroment.
82+
Thereafter your code will be linted by black and isort and checked against flake8 before you can commit.
83+
If it fails by black or isort, just rerun and it should pass (black and isort will modify the files so should
84+
pass after they are modified). If the flake8 test fails please see the error messages and fix them manually before
85+
trying to commit again.
3686

87+
Improvements and fixes are always appreciated.
3788

38-
CONTACTS
39-
------------------------------------------------------------------------
89+
Contact
90+
-------
4091

41-
For more information on diffpy.Structure please visit the project web-page
92+
For more information on diffpy.srxplanargui please visit the project `web-page <https://diffpy.github.io/>`_ or email Simon Billinge at sb2896@columbia.edu.
4293

43-
http://www.diffpy.org/
94+
Acknowledgements
95+
----------------
4496

45-
or email Prof. Simon Billinge at sb2896@columbia.edu.
97+
``diffpy.srxplanargui`` is built and maintained with `scikit-package <https://scikit-package.github.io/scikit-package/>`_.

docs/source/_static/.placeholder

Whitespace-only changes.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
:tocdepth: -1
2+
3+
|title|
4+
=======
5+
6+
.. |title| replace:: diffpy.srxplanargui package
7+
8+
.. automodule:: diffpy.srxplanargui
9+
:members:
10+
:undoc-members:
11+
:show-inheritance:
12+
13+
Subpackages
14+
-----------
15+
16+
.. toctree::
17+
diffpy.srxplanargui.example_package
18+
19+
Submodules
20+
----------
21+
22+
|module|
23+
--------
24+
25+
.. |module| replace:: diffpy.srxplanargui.example_submodule module
26+
27+
.. automodule:: diffpy.srxplanargui.example_submodule
28+
:members:
29+
:undoc-members:
30+
:show-inheritance:

0 commit comments

Comments
 (0)