Skip to content

Commit 0722b55

Browse files
authored
Merge pull request #101 from sbillinge/recut
Redo the cookie cutter
2 parents b5be453 + b8d458b commit 0722b55

34 files changed

+527
-495
lines changed

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ coverage:
2020
target: auto
2121
if_no_uploads: error
2222
if_not_found: success
23-
if_ci_failed: failure
23+
if_ci_failed: error
2424
paths: '!*/tests/.*'
2525

2626
tests:

.coveragerc

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,13 @@
1-
# Configuration of the coverage.py tool for reporting test coverage.
2-
1+
[run]
2+
source =
3+
diffpy.utils
34
[report]
4-
# RE patterns for lines to be excluded from consideration.
5-
exclude_lines =
6-
## Have to re-enable the standard pragma
7-
pragma: no cover
8-
## Don't complain if tests don't hit defensive assertion code:
9-
raise AssertionError
10-
raise NotImplementedError
11-
^[ ]*assert False
12-
13-
## Don't complain if non-runnable code isn't run:
14-
^[ ]*@unittest.skip\b
15-
^[ ]{4}unittest.main()
16-
if __name__ == .__main__.:
175
omit =
186
*/python?.?/*
197
*/site-packages/nose/*
208
# ignore _version.py and versioneer.py
219
.*version.*
2210
*_version.py
23-
# ignore wx directory
24-
*/wx/*
2511

26-
27-
[run]
28-
source =
29-
src/diffpy/utils/
30-
omit =
31-
## exclude debug.py from codecov report
32-
*/tests/debug.py
12+
exclude_lines =
13+
if __name__ == '__main__':

.flake8

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

.github/workflows/check-news-item.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Check for News
2+
3+
on:
4+
pull_request_target:
5+
branches:
6+
- main
7+
8+
jobs:
9+
check-news-item:
10+
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
11+
with:
12+
project: diffpy.utils

.github/workflows/codecov.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.github/workflows/main.yml

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Codecov and matrix
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
release:
8+
types:
9+
- prereleased
10+
- published
11+
workflow_dispatch:
12+
13+
jobs:
14+
coverage-and-matrix:
15+
uses: Billingegroup/release-scripts/.github/workflows/_coverage-and-matrix.yml@v0
16+
with:
17+
project: diffpy.utils
18+
c_extension: false
19+
headless: false
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Build and Deploy Docs
2+
3+
on:
4+
release:
5+
types:
6+
- published
7+
workflow_dispatch:
8+
9+
jobs:
10+
publish-docs-on-release:
11+
uses: Billingegroup/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
12+
with:
13+
project: diffpy.utils
14+
c_extension: false

.github/workflows/tests-on-pr.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Tests on PR
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
workflow_dispatch:
9+
10+
jobs:
11+
tests-on-pr:
12+
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
13+
with:
14+
project: diffpy.utils
15+
c_extension: false
16+
headless: false

.gitignore

Lines changed: 69 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,99 @@
1+
# Byte-compiled / optimized / DLL files
2+
__pycache__/
13
*.py[cod]
4+
*$py.class
25

36
# C extensions
47
*.so
58

6-
# Packages
7-
*.egg
8-
*.egg-info
9-
dist
10-
build
11-
eggs
12-
parts
13-
bin
14-
var
15-
sdist
16-
temp
17-
develop-eggs
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
venv/
24+
*.egg-info/
1825
.installed.cfg
19-
lib
20-
lib64
21-
tags
26+
*.egg
27+
bin/
28+
temp/
29+
tags/
2230
errors.err
2331

32+
# PyInstaller
33+
# Usually these files are written by a python script from a template
34+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
35+
*.manifest
36+
*.spec
37+
2438
# Installer logs
2539
pip-log.txt
40+
pip-delete-this-directory.txt
2641
MANIFEST
2742

2843
# Unit test / coverage reports
44+
htmlcov/
45+
.tox/
2946
.coverage
30-
.tox
47+
.coverage.*
48+
.cache
3149
nosetests.xml
50+
coverage.xml
51+
*,cover
52+
.hypothesis/
3253

3354
# Translations
3455
*.mo
56+
*.pot
3557

3658
# Mr Developer
3759
.mr.developer.cfg
3860
.project
3961
.pydevproject
4062

63+
# Django stuff:
64+
*.log
65+
66+
# Sphinx documentation
67+
docs/build/
68+
docs/source/generated/
69+
70+
# pytest
71+
.pytest_cache/
72+
73+
# PyBuilder
74+
target/
75+
76+
# Editor files
77+
# mac
78+
.DS_Store
79+
*~
80+
81+
# vim
82+
*.swp
83+
*.swo
84+
85+
# pycharm
86+
.idea/
87+
88+
# VSCode
89+
.vscode/
90+
91+
# Ipython Notebook
92+
.ipynb_checkpoints
93+
4194
# version information
4295
setup.cfg
4396
/src/diffpy/*/version.cfg
4497

4598
# Rever
4699
rever/
47-
48-
# PyCharm
49-
.idea/

0 commit comments

Comments
 (0)