Skip to content

Commit f788f68

Browse files
more github actions
1 parent 9ac636e commit f788f68

29 files changed

+117
-6535
lines changed

.gitattributes

-1
This file was deleted.

AUTHORS.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Authors
22
=======
33

4-
Billinge Group and community contibutors.
4+
Billinge Group and community contributors.
55

66
Contributors
77
------------

CHANGELOG.rst

-17
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,3 @@ Release Notes
33
=============
44

55
.. current developments
6-
7-
0.1.1
8-
=====
9-
10-
11-
12-
0.1.1
13-
=====
14-
15-
16-
17-
0.1.0
18-
=====
19-
20-
21-
22-
Initial release of labPDFproc. Please see README and documentation for details

CONTRIBUTING.rst

-103
This file was deleted.

LICENSE

-29
This file was deleted.

MANIFEST.in

+12-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
include AUTHORS.rst
2-
include LICENSE
3-
include README.rst
4-
include requirements.txt
5-
include doc/examples/*
6-
7-
recursive-include src/diffpy/labpdfproc/data *
8-
recursive-exclude * __pycache__
9-
recursive-exclude * *.py[co]
10-
11-
recursive-include docs *.rst conf.py Makefile make.bat
12-
13-
14-
include diffpy.labpdfproc/version.py
15-
16-
# If including data files in the package, add them like:
17-
# include path/to/data_file
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

+5-51
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
.. |Black| image:: https://img.shields.io/badge/code_style-black-black
1616
:target: https://github.com/psf/black
1717

18-
.. |CI| image:: https://github.com/diffpy/diffpy.labpdfproc/actions/workflows/main.yml/badge.svg
19-
:target: https://github.com/diffpy/diffpy.labpdfproc/actions/workflows/main.yml
18+
.. |CI| image:: https://github.com/diffpy/diffpy.labpdfproc/actions/workflows/matrix-and-codecov-on-merge-to-main.yml/badge.svg
19+
:target: https://github.com/diffpy/diffpy.labpdfproc/actions/workflows/matrix-and-codecov-on-merge-to-main.yml
2020

2121
.. |Codecov| image:: https://codecov.io/gh/diffpy/diffpy.labpdfproc/branch/main/graph/badge.svg
2222
:target: https://codecov.io/gh/diffpy/diffpy.labpdfproc
@@ -37,28 +37,7 @@
3737

3838
Tools for processing x-ray powder diffraction data from laboratory sources.
3939

40-
PDFgetX3 has revolutionized how PDF methods can be applied to solve nanostructure problems.
41-
However, the program was designed for use with Rapid Acquisition PDF (RAPDF) data from synchrotron sources.
42-
A key approximation inherent in the use of PDFgetX3 for RAPDF data is that absorption effects are negligible.
43-
This is typically not the case for laboratory x-ray diffractometers, where absorption effects can be significant.
44-
45-
This app is designed to preprocess data from laboratory x-ray diffractometers before using PDFgetX3 to obtain PDFs.
46-
The app currently carries out an absorption correction assuming a parallel beam capillary geometry
47-
which is the most common geometry for lab PDF measurements.
48-
49-
The theory is described in the following paper:
50-
51-
An ad hoc Absorption Correction for Reliable
52-
Pair-Distribution Functions from Low Energy x-ray Sources
53-
Yucong Chen, Till Schertenleib, Andrew Yang, Pascal Schouwink,
54-
Wendy L. Queen and Simon J. L. Billinge, in preparation.
55-
56-
The related experimental data acquisition protocols are described in the following paper:
57-
58-
Protocols for Obtaining Reliable PDFs from Laboratory
59-
x-ray Sources Using PDFgetX3,
60-
Till Schertenleib, Daniel Schmuckler, Yucong Chen, Geng Bang Jin,
61-
Wendy L. Queen and Simon J. L. Billinge, in preparation.
40+
* LONGER DESCRIPTION HERE
6241

6342
For more information about the diffpy.labpdfproc library, please consult our `online documentation <https://diffpy.github.io/diffpy.labpdfproc>`_.
6443

@@ -92,11 +71,7 @@ Then, to fully install ``diffpy.labpdfproc`` in our active environment, run ::
9271

9372
Another option is to use ``pip`` to download and install the latest release from
9473
`Python Package Index <https://pypi.python.org>`_.
95-
To install using ``pip`` into your ``diffpy.labpdfproc_env`` environment, we will also have to install dependencies ::
96-
97-
pip install -r https://raw.githubusercontent.com/diffpy/diffpy.labpdfproc/main/requirements/run.txt
98-
99-
and then install the package ::
74+
To install using ``pip`` into your ``diffpy.labpdfproc_env`` environment, type ::
10075

10176
pip install diffpy.labpdfproc
10277

@@ -106,27 +81,6 @@ and run the following ::
10681

10782
pip install .
10883

109-
Example
110-
-------
111-
112-
Navigate to the directory that contains 1D diffraction patterns that you would like to process.
113-
Activate the conda environment (`conda activate diffpy.labpdfproc_env`) that contains the package and run the following command ::
114-
115-
labpdfproc <muD> <path/to/inputfile.txt>
116-
117-
Here replace <muD> with the value of muD for your sample
118-
and <path/to/inputfile.txt> with the path and filename of your input file.
119-
For example, if the uncorrected data case is called zro2_mo.xy and is in the current directory
120-
and it has a muD of 2.5 then the command would be ::
121-
122-
labpdfproc 2.5 zro2_mo.xy
123-
124-
Please type ::
125-
126-
labpdfproc --help
127-
128-
for more information on the available options.
129-
13084
Support and Contribute
13185
----------------------
13286

@@ -155,7 +109,7 @@ trying to commit again.
155109

156110
Improvements and fixes are always appreciated.
157111

158-
Before contributing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.labpdfproc/blob/main/CODE_OF_CONDUCT.rst>`_.
112+
Before contribuing, please read our `Code of Conduct <https://github.com/diffpy/diffpy.labpdfproc/blob/main/CODE_OF_CONDUCT.rst>`_.
159113

160114
Contact
161115
-------

doc/_static/.placeholder

Whitespace-only changes.

0 commit comments

Comments
 (0)