Merge pull request #91 from bobleesj/cookie-recut

Cookiecut (first time)

Author: sbillinge

.codecov.yml

@@ -10,7 +10,7 @@ coverage:
   status:
     patch:
       default:
-        target: '80'
+        target: '70'
         if_no_uploads: error
         if_not_found: success
         if_ci_failed: failure
@@ -20,12 +20,13 @@ coverage:
         target: auto
         if_no_uploads: error
         if_not_found: success
-        if_ci_failed: failure
+        if_ci_failed: error
         paths: '!*/tests/.*'
 
       tests:
         target: 97.9%
         paths: '*/tests/.*'
+        if_not_found: success
 
 flags:
   tests:

.coveragerc

@@ -1,22 +1,13 @@
-# Configuration of the coverage.py tool for reporting test coverage.
-
-[report]
-# 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()
-    if __name__ == .__main__.:
-
-
 [run]
+source =
+    diffpy.srfit
+[report]
 omit =
-    ## exclude debug.py from codecov report
-    */tests/debug.py
+    */python?.?/*
+    */site-packages/nose/*
+    # ignore _version.py and versioneer.py
+    .*version.*
+    *_version.py
+
+exclude_lines =
+    if __name__ == '__main__':

.flake8

@@ -4,13 +4,8 @@ exclude =
     __pycache__,
     build,
     dist,
-    doc/source/conf.py,
-    */doc/source/conf.py,
-    hooks/post_gen_project.py,
-    */__init__.py,
-    */debug.py
-builtins = cookiecutter
+    doc/source/conf.py
 max-line-length = 115
-# Ignore some style 'errors' produced while formatting by 'black' (see link below)
+# Ignore some style 'errors' produced while formatting by 'black'
 # https://black.readthedocs.io/en/stable/guides/using_black_with_other_tools.html#labels-why-pycodestyle-warnings
 extend-ignore = E203

.gitarchive.cfg

@@ -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.srfit

.gitattributes

@@ -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.srfit
+      c_extension: false
+      headless: false
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

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

@@ -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.srfit
+      c_extension: false

.github/workflows/matrix-and-codecov-on-merge-to-main.yml

@@ -1,44 +1,99 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
+*$py.class
 
 # C extensions
 *.so
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-temp
-develop-eggs
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+venv/
+*.egg-info/
 .installed.cfg
-lib
-lib64
-tags
+*.egg
+bin/
+temp/
+tags/
 errors.err
 
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 MANIFEST
 
 # Unit test / coverage reports
+htmlcov/
+.tox/
 .coverage
-.tox
+.coverage.*
+.cache
 nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
 
 # Translations
 *.mo
+*.pot
 
 # Mr Developer
 .mr.developer.cfg
 .project
 .pydevproject
-.settings
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/build/
+docs/source/generated/
+
+# pytest
+.pytest_cache/
+
+# PyBuilder
+target/
+
+# Editor files
+# mac
+.DS_Store
+*~
+
+# vim
+*.swp
+*.swo
+
+# pycharm
+.idea/
+
+# VSCode
+.vscode/
+
+# Ipython Notebook
+.ipynb_checkpoints
 
 # version information
 setup.cfg
 /src/diffpy/*/version.cfg
+
+# Rever
+rever/

.github/workflows/publish-docs-on-release.yml

@@ -0,0 +1,4 @@
+[settings]
+line_length = 115
+multi_line_output = 3
+include_trailing_comma = True

.gitignore

@@ -1,28 +1,29 @@
 default_language_version:
-  python: python3
+    python: python3
 ci:
-  autofix_commit_msg: |
-    [pre-commit.ci] auto fixes from pre-commit hooks
-  autofix_prs: true
-  autoupdate_branch: 'pre-commit-autoupdate'
-  autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
-  autoupdate_schedule: monthly
-  skip: [no-commit-to-branch]
-  submodules: false
+    autofix_commit_msg: |
+        [pre-commit.ci] auto fixes from pre-commit hooks
+    autofix_prs: true
+    autoupdate_branch: 'pre-commit-autoupdate'
+    autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
+    autoupdate_schedule: monthly
+    skip: [no-commit-to-branch]
+    submodules: false
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.6.0
     hooks:
       - id: check-yaml
-        exclude: 'environment.yml'
       - id: end-of-file-fixer
       - id: trailing-whitespace
-        exclude: '\.(rst|txt)$'
+      - id: check-case-conflict
+      - id: check-merge-conflict
+      - id: check-toml
+      - id: check-added-large-files
   - repo: https://github.com/psf/black
     rev: 24.4.2
     hooks:
       - id: black
-        exclude: '.*\.py'
   - repo: https://github.com/pycqa/flake8
     rev: 7.0.0
     hooks: