Skip to content

Commit 4d86135

Browse files
authored
Merge pull request #15 from zmx27/migrate-readme
skpkg: migrate README.rst
2 parents b756ca8 + 0270954 commit 4d86135

File tree

1 file changed

+88
-21
lines changed

1 file changed

+88
-21
lines changed

README.rst

Lines changed: 88 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,103 @@
1-
dpx.confutils
2-
========================================================================
1+
|Icon| |title|_
2+
===============
33

4-
Package for processing configurations
4+
.. |title| replace:: diffpy.srxconfutils
5+
.. _title: https://diffpy.github.io/diffpy.srxconfutils
56

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

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

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

12-
* ``numpy``
13-
* ``traits``
15+
.. |Black| image:: https://img.shields.io/badge/code_style-black-black
16+
:target: https://github.com/psf/black
1417

18+
.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff
19+
:target: https://github.com/diffpy/diffpy.srxconfutils/pulls
1520

16-
INSTALLATION
17-
------------------------------------------------------------------------
21+
.. |PythonVersion| image:: https://img.shields.io/badge/python-3.11%20|%203.12%20|%203.13-blue
1822

19-
We are going to release conda package for all platform. For general user
20-
please use the installation file and install software. For developor,
21-
you can install dpx.confutils using
23+
.. |Tracking| image:: https://img.shields.io/badge/issue_tracking-github-blue
24+
:target: https://github.com/diffpy/diffpy.srxconfutils/issues
2225

23-
python setup.py install
26+
Configuration utilities for diffpy project. Part of xPDFsuite.
2427

25-
Note: the dependency is not specified in the setup.py. You need to install
26-
them yourself. You can use Anaconda or other python environment.
28+
For more information about the diffpy.srxconfutils library, please consult our `online documentation <https://diffpy.github.io/diffpy.srxconfutils>`_.
2729

30+
Citation
31+
--------
2832

29-
CONTACTS
30-
------------------------------------------------------------------------
33+
If you use diffpy.srxconfutils in a scientific publication, we would like you to cite this package as
3134

32-
For more information on diffpy.Structure please visit the project web-page
35+
Xiaohao Yang, Pavol Juhas, Christopher L. Farrow and Simon J. L. Billinge, xPDFsuite: an end-to-end
36+
software solution for high throughput pair distribution function transformation, visualization and
37+
analysis, arXiv 1402.3163 (2014)
3338

34-
http://www.diffpy.org/
39+
Installation
40+
------------
41+
``diffpy.srxconfutils`` is normally installed as part of the ``xpdfsuite`` software, so please refer to the
42+
installation instructions detailed in the ``README.rst`` file of ``xpdfsuite`` `here <https://github.com/diffpy/diffpy.xpdfsuite/blob/main/README.rst>`_.
3543

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

0 commit comments

Comments
 (0)