Merge pull request #55 from cadenmyers13/pre-commit-auto

skpkg: pre-commit auto fixes

Author: sbillinge

.flake8

@@ -7,7 +7,7 @@ exclude =
     build,
     dist,
     doc/source/conf.py
-max-line-length = 115
+max-line-length = 79
 # 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

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

@@ -14,7 +14,7 @@ jobs:
       run:
         shell: bash -l {0}
 
-    runs-on: ubuntu-latest
+    runs-on: macos-14
     steps:
       - name: Check out diffpy.srreal
         uses: actions/checkout@v4

.isort.cfg

@@ -1,5 +1,5 @@
 [settings]
 # Keep import statement below line_length character limit
-line_length = 115
+line_length = 79
 multi_line_output = 3
 include_trailing_comma = True

.pre-commit-config.yaml

@@ -14,7 +14,6 @@ repos:
     rev: v4.6.0
     hooks:
       - id: check-yaml
-        exclude: ^conda-recipe/meta\.yaml$
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: check-case-conflict

news/pre-commit-auto.rst

@@ -0,0 +1,23 @@
+**Added:**
+
+* Update linelength to sk-package standard of 79 characters.
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

src/diffpy/srreal/bondcalculator.py

@@ -19,7 +19,10 @@
 __all__ = ["BondCalculator"]
 
 from diffpy.srreal.srreal_ext import BondCalculator
-from diffpy.srreal.wraputils import propertyFromExtDoubleAttr, setattrFromKeywordArguments
+from diffpy.srreal.wraputils import (
+    propertyFromExtDoubleAttr,
+    setattrFromKeywordArguments,
+)
 
 # property wrappers to C++ double attributes
 

src/diffpy/srreal/bvscalculator.py

@@ -19,7 +19,10 @@
 __all__ = ["BVSCalculator"]
 
 from diffpy.srreal.srreal_ext import BVSCalculator
-from diffpy.srreal.wraputils import propertyFromExtDoubleAttr, setattrFromKeywordArguments
+from diffpy.srreal.wraputils import (
+    propertyFromExtDoubleAttr,
+    setattrFromKeywordArguments,
+)
 
 # Property wrappers to C++ double attributes
 

src/diffpy/srreal/overlapcalculator.py

@@ -19,7 +19,10 @@
 __all__ = ["OverlapCalculator"]
 
 from diffpy.srreal.srreal_ext import OverlapCalculator
-from diffpy.srreal.wraputils import propertyFromExtDoubleAttr, setattrFromKeywordArguments
+from diffpy.srreal.wraputils import (
+    propertyFromExtDoubleAttr,
+    setattrFromKeywordArguments,
+)
 
 # property wrappers to C++ double attributes
 

src/diffpy/srreal/pdfcalculator.py

@@ -18,8 +18,16 @@
     PDFCalculator      -- calculate PDF by peak summation in real space
 """
 
-from diffpy.srreal.srreal_ext import DebyePDFCalculator, PDFCalculator, fftftog, fftgtof
-from diffpy.srreal.wraputils import propertyFromExtDoubleAttr, setattrFromKeywordArguments
+from diffpy.srreal.srreal_ext import (
+    DebyePDFCalculator,
+    PDFCalculator,
+    fftftog,
+    fftgtof,
+)
+from diffpy.srreal.wraputils import (
+    propertyFromExtDoubleAttr,
+    setattrFromKeywordArguments,
+)
 
 # exported items
 __all__ = """
@@ -28,7 +36,12 @@
     """.split()
 
 # imports for backward compatibility
-from diffpy.srreal.pdfbaseline import LinearBaseline, PDFBaseline, ZeroBaseline, makePDFBaseline
+from diffpy.srreal.pdfbaseline import (
+    LinearBaseline,
+    PDFBaseline,
+    ZeroBaseline,
+    makePDFBaseline,
+)
 from diffpy.srreal.pdfenvelope import (
     PDFEnvelope,
     QResolutionEnvelope,
@@ -38,7 +51,12 @@
     makePDFEnvelope,
 )
 from diffpy.srreal.peakprofile import PeakProfile
-from diffpy.srreal.peakwidthmodel import ConstantPeakWidth, DebyeWallerPeakWidth, JeongPeakWidth, PeakWidthModel
+from diffpy.srreal.peakwidthmodel import (
+    ConstantPeakWidth,
+    DebyeWallerPeakWidth,
+    JeongPeakWidth,
+    PeakWidthModel,
+)
 
 # silence the pyflakes syntax checker
 assert all((fftftog, fftgtof))

src/diffpy/srreal/peakprofile.py

@@ -23,7 +23,11 @@
 __all__ = ["PeakProfile", "GaussianProfile", "CroppedGaussianProfile"]
 
 from diffpy.srreal import _final_imports
-from diffpy.srreal.srreal_ext import CroppedGaussianProfile, GaussianProfile, PeakProfile
+from diffpy.srreal.srreal_ext import (
+    CroppedGaussianProfile,
+    GaussianProfile,
+    PeakProfile,
+)
 from diffpy.srreal.wraputils import propertyFromExtDoubleAttr
 
 # class PeakProfile ----------------------------------------------------------