Skip to content

Commit 3d87783

Browse files
authored
Merge pull request #150 from stevenhua0320/scikit-update-2
skpkg: add CHAGELOG.rst, README.rst, license, update pyproject.toml
2 parents 36c2e74 + f795440 commit 3d87783

File tree

3 files changed

+34
-34
lines changed

3 files changed

+34
-34
lines changed

README.rst

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
:target: https://anaconda.org/conda-forge/diffpy.pdffit2
2626

2727
.. |PR| image:: https://img.shields.io/badge/PR-Welcome-29ab47ff
28+
:target: https://github.com/diffpy/diffpy.pdffit2/pulls
2829

2930
.. |PyPI| image:: https://img.shields.io/pypi/v/diffpy.pdffit2
3031
:target: https://pypi.org/project/diffpy.pdffit2/
@@ -116,16 +117,18 @@ Install pdffit2 using ``pip`` to download and install the latest version from `P
116117

117118
pip install diffpy.pdffit2
118119

119-
To confirm that the installation was successful, type ::
120-
121-
python -c "import diffpy.pdffit2; print(diffpy.pdffit2.__version__)"
122-
123120
If you prefer to install from sources, after installing the dependencies, obtain the source archive from
124121
`GitHub <https://github.com/diffpy/diffpy.pdffit2/>`_. Once installed, ``cd`` into your ``diffpy.pdffit2`` directory
125122
and run the following ::
126123

127124
pip install .
128125

126+
127+
You can type the following command to verify the installation is successful. ::
128+
129+
python -c "import diffpy.pdffit2; print(diffpy.pdffit2.__version__)"
130+
131+
129132
Getting Started
130133
---------------
131134

@@ -170,7 +173,7 @@ trying to commit again.
170173

171174
Improvements and fixes are always appreciated.
172175

173-
Before contributing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.pdffit2/blob/main/CODE_OF_CONDUCT.rst>`_.
176+
Before contributing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.pdffit2/blob/main/CODE-OF-CONDUCT.rst>`_.
174177

175178
Contact
176179
-------

docs/source/license.rst

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,26 @@ For more information please visit the project web-page:
2525
or email Prof. Simon Billinge at sb2896@columbia.edu
2626

2727
Redistribution and use in source and binary forms, with or without
28-
modification, are permitted provided that the following conditions
29-
are met:
30-
31-
* Redistributions of source code must retain the above copyright
32-
notice, this list of conditions and the following disclaimer.
33-
34-
* Redistributions in binary form must reproduce the above copyright
35-
notice, this list of conditions and the following disclaimer in the
36-
documentation and/or other materials provided with the distribution.
37-
38-
* Neither the name of the copyright holder nor the names of its
39-
contributors may be used to endorse or promote products derived from
40-
this software without specific prior written permission.
41-
42-
THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER "AS IS". COPYRIGHT HOLDER
43-
EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EITHER
44-
EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
45-
WARRANTIES OF MERCHANTABILITY, TITLE, FITNESS, ADEQUACY OR SUITABILITY
46-
FOR A PARTICULAR PURPOSE, AND ANY WARRANTIES OF FREEDOM FROM
47-
INFRINGEMENT OF ANY DOMESTIC OR FOREIGN PATENT, COPYRIGHTS, TRADE
48-
SECRETS OR OTHER PROPRIETARY RIGHTS OF ANY PARTY. IN NO EVENT SHALL
49-
COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR ANY DIRECT, INDIRECT,
50-
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
51-
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
52-
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
53-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
54-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
55-
THIS SOFTWARE OR RELATING TO THIS AGREEMENT, EVEN IF ADVISED OF THE
56-
POSSIBILITY OF SUCH DAMAGE.
28+
modification, are permitted provided that the following conditions are met:
29+
30+
1. Redistributions of source code must retain the above copyright notice, this
31+
list of conditions and the following disclaimer.
32+
33+
2. Redistributions in binary form must reproduce the above copyright notice,
34+
this list of conditions and the following disclaimer in the documentation
35+
and/or other materials provided with the distribution.
36+
37+
3. Neither the name of the copyright holder nor the names of its
38+
contributors may be used to endorse or promote products derived from
39+
this software without specific prior written permission.
40+
41+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
42+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
44+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
45+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
47+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
48+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
49+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
50+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ include = ["*"] # package names should match these glob patterns (["*"] by defa
4848
exclude = [] # exclude packages matching these glob patterns (empty by default)
4949
namespaces = false # to disable scanning PEP 420 namespaces (true by default)
5050

51+
[project.scripts]
52+
diffpy-pdffit2 = "diffpy.pdffit2_app:main"
53+
5154
[tool.setuptools.dynamic]
5255
dependencies = {file = ["requirements/pip.txt"]}
5356

0 commit comments

Comments
 (0)