Merge pull request #991 from PCMDI/lee1043-patch-1

Update .pre-commit-config.yaml

Author: lee1043

.github/workflows/build_workflow.yml

@@ -9,6 +9,10 @@ on:
 
   workflow_dispatch:
 
+env:
+    CANCEL_OTHERS: true
+    PATHS_IGNORE: '["**/README.rst", "**/docs/**", "**/ISSUE_TEMPLATE/**", "**/pull_request_template.md", "**/.vscode/**"]'
+
 jobs:
   check-jobs-to-skip:
     runs-on: ubuntu-latest
@@ -27,25 +31,16 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
       - name: Checkout Code Repository
         uses: actions/checkout@v3
-        with:
-          node-version: '16'
+        
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          node-version: '16'
           python-version: '3.10'
-      # Run all pre-commit hooks on all the files.
-      # Getting only staged files can be tricky in case a new PR is opened
-      # since the action is run on a branch in detached head state
+
       - name: Install and Run Pre-commit
         uses: pre-commit/action@v3.0.0
-        with:
-          node-version: '16'
 
   build:
     needs: check-jobs-to-skip
@@ -56,9 +51,6 @@ jobs:
         shell: bash -l {0}
     timeout-minutes: 10
     steps:
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
       - uses: actions/checkout@v3
 
       - name: Set up Conda Environment
@@ -82,7 +74,6 @@ jobs:
       - name: Cache Conda
         uses: actions/cache@v3
         with:
-          node-version: '16'
           path: ${{ env.CONDA }}/envs
           key:
             conda-${{ runner.os }}--${{ runner.arch }}--${{

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 # Configuration file for `pre-commit` tool.
 # Source: https://pre-commit.com/#pre-commit-configyaml---top-level
-exclude: "docs|node_modules|migrations|.git|.tox|.md|sample_setups/(external-setups|jsons)|tests/deprecated"
+exclude: "docs|node_modules|migrations|.git|.tox|README.md|sample_setups/(external-setups|jsons)|tests/deprecated"
 default_stages: [commit]
 fail_fast: true
 
@@ -20,16 +20,15 @@ repos:
     # Python code formatters
     # =======================
     - repo: https://github.com/psf/black
-      rev: 23.1.0
+      rev: 23.3.0
       hooks:
           - id: black
 
-    - repo: https://github.com/PyCQA/isort
+    - repo: https://github.com/timothycrosley/isort
       rev: 5.12.0
       hooks:
           - id: isort
 
-
     # =======================
     # Python linting
     # =======================

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-target-version = ['py36']
+target-version = ['py39']
 include = '\.pyi?$'
 exclude = '''
 (
@@ -21,3 +21,18 @@ exclude = '''
   )/
 )
 '''
+
+[tool.isort]
+# Docs: https://pycqa.github.io/isort/docs/configuration/options.html#example-pyprojecttoml_4
+multi_line_output = 3
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+line_length = 88
+
+[tool.pytest.ini_options]
+# Docs: https://docs.pytest.org/en/7.2.x/reference/customize.html#configuration
+junit_family = "xunit2"
+addopts = "--cov=pcmdi_metrics --cov-report term --cov-report html:tests_coverage_reports/htmlcov --cov-report xml:tests_coverage_reports/coverage.xml -s --ignore tests/deprecated"
+python_files = ["tests.py", "test_*.py"]
+

setup.cfg

@@ -1,5 +1,6 @@
 [flake8]
 # https://pep8.readthedocs.io/en/latest/intro.html#error-codes
+# flake8 dooes not support pyproject.toml yet: https://github.com/PyCQA/flake8/issues/234
 ignore =
     # whitespace before ‘:’
     E203
@@ -31,31 +32,7 @@ exclude =
     *json
     *md
 
-[isort]
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-use_parentheses=True
-line_length=88
 
-[pycodestyle]
-max-line-length = 119
-exclude =
-    .tox
-    .git
-    */migrations/*
-    */static/CACHE/*
-    docs
-    node_modules
-    .idea
-    .mypy_cache
-    .pytest_cache
-    *__init__.py
-    venv
-
-[aliases]
-# Define setup.py command aliases here
-test = pytest
 
 [tool:pytest]
 junit_family = xunit2