Skip to content
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f89dcc0
Remove -e build
bobleesj Sep 22, 2024
2ae3fd6
Merge pull request #3 from bobleesj/tests-dir-import
bobleesj Sep 22, 2024
3a5bf39
Merge branch 'main' of https://github.com/diffpy/diffpy.pdffit2
bobleesj Sep 23, 2024
025af2b
Merge branch 'main' of https://github.com/diffpy/diffpy.pdffit2
bobleesj Sep 23, 2024
4492220
Add github workflows
bobleesj Sep 24, 2024
12d0c5a
Add .codecov, coverage, gitignore, remove gitattributes
bobleesj Sep 24, 2024
031809b
Add news
bobleesj Sep 24, 2024
f8827b8
Add version test
bobleesj Sep 24, 2024
f644142
Add pytest-cov test
bobleesj Sep 24, 2024
90658de
Add readme, doc, project.toml
bobleesj Sep 24, 2024
3987b18
meta.yml to meta.txt
bobleesj Sep 24, 2024
05b15ce
Apply precomit
bobleesj Sep 24, 2024
304f0d6
Ensure ordering of import in __init__.py
bobleesj Sep 24, 2024
43b31a5
Fix typo
bobleesj Sep 24, 2024
47fd5a7
rm mention of diffpy.structure, add c extensions
bobleesj Sep 24, 2024
226fef0
rm rogue dash
bobleesj Sep 24, 2024
3016fc5
Fix contributing typo
bobleesj Sep 24, 2024
b953041
remove rogue slash in citation
bobleesj Sep 24, 2024
1ba7042
Remove avoid flake8 in __init__ and add clear directions with isort tags
bobleesj Sep 24, 2024
1b091b5
Add pip source install step in readme
bobleesj Sep 24, 2024
a225c8b
Fix Ubuntu command for g++
bobleesj Sep 24, 2024
a9aa591
Add compiler download for pip install
bobleesj Sep 24, 2024
9fabfc4
Use conda to download dependencies
bobleesj Sep 24, 2024
693414d
add testing for version prompt
bobleesj Sep 24, 2024
3ba006e
Fix indention for conda install
bobleesj Sep 24, 2024
dd71f7f
you to your
bobleesj Sep 24, 2024
d0ea0b9
Add double quote for pre
bobleesj Sep 24, 2024
9d5fad5
Remove the next to env
bobleesj Sep 24, 2024
39be2ba
Improve instruction for conda install
bobleesj Sep 24, 2024
e040739
Add double quote for pre
bobleesj Sep 24, 2024
8eba008
Include Billinge's recommended instruction for pip source install
bobleesj Sep 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# the root folder.
#comment: false

fixes:
- ".*/site-packages/::src/"

codecov:
notify:
require_ci_to_pass: no
Expand Down
15 changes: 1 addition & 14 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
[run]
source =
diffpy.pdffit2
omit =
# exclude debug.py from codecov report
*/tests/debug.py
[report]
omit =
*/python?.?/*
*/site-packages/nose/*
# ignore _version.py and versioneer.py
.*version.*
*_version.py
# RE patterns for lines to be excluded from consideration.
exclude_lines =
# Have to re-enable the standard pragma
pragma: no cover
# Don't complain if tests don't hit defensive assertion code:
raise AssertionError
raise NotImplementedError
^[ ]*assert False

# Don't complain if non-runnable code isn't run:
^[ ]*@unittest.skip\b
^[ ]{4}unittest.main()
exclude_lines =
if __name__ == '__main__':
12 changes: 12 additions & 0 deletions .github/workflows/check-news-item.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: Check for News

on:
pull_request_target:
branches:
- main

jobs:
build:
uses: Billingegroup/release-scripts/.github/workflows/_check-news-item.yml@v0
with:
project: diffpy.pdffit2
54 changes: 0 additions & 54 deletions .github/workflows/codecov.yml

This file was deleted.

48 changes: 0 additions & 48 deletions .github/workflows/docs.yml

This file was deleted.

43 changes: 0 additions & 43 deletions .github/workflows/main.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/matrix-and-codecov-on-merge-to-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: CI

on:
push:
branches:
- main
release:
types:
- prereleased
- published
workflow_dispatch:

jobs:
coverage:
uses: Billingegroup/release-scripts/.github/workflows/_matrix-and-codecov-on-merge-to-main.yml@v0
with:
project: diffpy.pdffit2
c_extension: true
headless: false
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
48 changes: 0 additions & 48 deletions .github/workflows/matrix.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/publish-docs-on-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: Build and Deploy Docs

on:
release:
types:
- published
workflow_dispatch:

jobs:
docs:
uses: Billingegroup/release-scripts/.github/workflows/_publish-docs-on-release.yml@v0
with:
project: diffpy.pdffit2
c_extension: true
16 changes: 16 additions & 0 deletions .github/workflows/tests-on-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Tests on PR

on:
push:
branches:
- main
pull_request:
workflow_dispatch:

jobs:
validate:
uses: Billingegroup/release-scripts/.github/workflows/_tests-on-pr.yml@v0
with:
project: diffpy.pdffit2
c_extension: true
headless: false
Loading