Skip to content

Commit 24e4f72

Browse files
sbillingesbillinge
authored
Merge pull request #84 from cadenmyers13/cookierelease
Running cookiecutter on labpdfproc
2 parents 8a47874 + a94d59e commit 24e4f72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1105
-400
lines changed

‎.codecov.yml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
1-
# show coverage in CI status, not as a comment.
2-
comment: off
1+
# codecov can find this file anywhere in the repo, so we don't need to clutter
2+
# the root folder.
3+
#comment: false
4+
5+
codecov:
6+
notify:
7+
require_ci_to_pass: no
8+
39
coverage:
410
status:
5-
project:
6-
default:
7-
target: auto
811
patch:
912
default:
13+
target: '70'
14+
if_no_uploads: error
15+
if_not_found: success
16+
if_ci_failed: failure
17+
project:
18+
default: false
19+
library:
1020
target: auto
21+
if_no_uploads: error
22+
if_not_found: success
23+
if_ci_failed: error
24+
paths: '!*/tests/.*'
25+
26+
tests:
27+
target: 97.9%
28+
paths: '*/tests/.*'
29+
if_not_found: success
30+
31+
flags:
32+
tests:
33+
paths:
34+
- tests/

‎.coveragerc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[run]
22
source =
3-
src
4-
3+
diffpy.labpdfproc
54
[report]
65
omit =
76
*/python?.?/*

‎.flake8

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ exclude =
44
__pycache__,
55
build,
66
dist,
7-
versioneer.py,
8-
labpdfproc/_version.py,
9-
doc/manual/source/conf.py
7+
doc/source/conf.py
108
max-line-length = 115
119
# Ignore some style 'errors' produced while formatting by 'black'
12-
ignore = E203, W503
10+
# https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
11+
extend-ignore = E203

‎.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
labpdfproc/_version.py export-subst
1+
diffpy.labpdfproc/_version.py export-subst

‎.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
run: python -m pip install . --no-deps
3535

3636
- name: build documents
37-
run: make -C doc/manual html
37+
run: make -C doc html
3838

3939
- name: Deploy
4040
uses: peaceiris/actions-gh-pages@v3
4141
with:
4242
github_token: ${{ secrets.GITHUB_TOKEN }}
43-
publish_dir: ./doc/manual/build/html
43+
publish_dir: ./doc/build/html

‎.github/workflows/testing.yml renamed to ‎.github/workflows/main.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ jobs:
4242
conda config --set always_yes yes --set changeps1 no
4343
conda config --add channels conda-forge
4444
conda activate test
45-
conda install --file requirements/requirements.txt
46-
conda install --file requirements/requirements-dev.txt
45+
conda install --file requirements/run.txt
46+
conda install --file requirements/test.txt
4747
pip install .
48-
4948
- name: Validate diffpy.labpdfproc
5049
shell: bash -l {0}
5150
run: |
5251
conda activate test
53-
coverage run -m pytest -s
52+
coverage run -m pytest -vv -s
5453
coverage report -m
5554
codecov

‎.github/workflows/pre-commit.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616
- uses: actions/setup-python@v4
17-
- name: Make prevent_commit_to_main.sh executable
18-
run: chmod +x ./prevent_commit_to_main.sh
1917
- uses: pre-commit/[email protected]
2018
with:
2119
extra_args: --all-files

‎.gitignore

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ venv/
2424
*.egg-info/
2525
.installed.cfg
2626
*.egg
27+
bin/
28+
temp/
29+
tags/
30+
errors.err
2731

2832
# PyInstaller
2933
# Usually these files are written by a python script from a template
@@ -34,6 +38,7 @@ venv/
3438
# Installer logs
3539
pip-log.txt
3640
pip-delete-this-directory.txt
41+
MANIFEST
3742

3843
# Unit test / coverage reports
3944
htmlcov/
@@ -50,6 +55,11 @@ coverage.xml
5055
*.mo
5156
*.pot
5257

58+
# Mr Developer
59+
.mr.developer.cfg
60+
.project
61+
.pydevproject
62+
5363
# Django stuff:
5464
*.log
5565

@@ -80,3 +90,10 @@ target/
8090

8191
# Ipython Notebook
8292
.ipynb_checkpoints
93+
94+
# version information
95+
setup.cfg
96+
/src/diffpy/*/version.cfg
97+
98+
# Rever
99+
rever/

‎AUTHORS.rst

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
Authors
12
=======
2-
Credits
3-
=======
4-
5-
Maintainer
6-
----------
73

8-
* diffpy <[email protected]>
4+
Billinge Group and community contibutors.
95

106
Contributors
117
------------
128

13-
None yet. Why not be the first? See: CONTRIBUTING.rst
9+
For a list of contributors, visit
10+
https://github.com/diffpy/diffpy.labpdfproc/graphs/contributors

‎CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
=============
2+
Release Notes
3+
=============
4+
5+
.. current developments
6+
7+
Initial release of labPDFproc. Please see README and documentation for details

0 commit comments

Comments
 (0)