flake8 fix and if logic

Author: Sparks29032

.github/workflows/pre-commit.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   pre-commit:
     # pull requests are a duplicate of a branch push if within the same repo.
-    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
+    if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository }}
 
     runs-on: ubuntu-latest
     steps:

src/diffpy/pdfmorph/morph_helpers/transformpdftordf.py

@@ -18,8 +18,7 @@
 """
 
 
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR, LABEL_RR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR, LABEL_RR
 
 
 class TransformXtalPDFtoRDF(Morph):

src/diffpy/pdfmorph/morph_helpers/transformrdftopdf.py

@@ -19,8 +19,7 @@
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR, LABEL_RR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR, LABEL_RR
 
 
 class TransformXtalRDFtoPDF(Morph):

src/diffpy/pdfmorph/morphs/morphishape.py

@@ -20,8 +20,7 @@ class MorphISpheroid -- apply inverse spheroidal shape function
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR
 from diffpy.pdfmorph.morphs.morphshape import _sphericalCF, _spheroidalCF
 
 

src/diffpy/pdfmorph/morphs/morphresolution.py

@@ -19,8 +19,7 @@
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_RR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_RR
 
 
 class MorphResolutionDamping(Morph):

src/diffpy/pdfmorph/morphs/morphrgrid.py

@@ -19,8 +19,7 @@
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR
 
 
 # roundoff tolerance for selecting bounds on arrays.

src/diffpy/pdfmorph/morphs/morphscale.py

@@ -18,8 +18,7 @@
 """
 
 
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR
 
 
 class MorphScale(Morph):

src/diffpy/pdfmorph/morphs/morphshape.py

@@ -23,8 +23,7 @@ class MorphSpheroid -- apply a spheroidal shape function to the morph
 from numpy import arctan as atan
 from numpy import arctanh as atanh
 from numpy import sqrt
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR
 
 
 class MorphSphere(Morph):

src/diffpy/pdfmorph/morphs/morphshift.py

@@ -19,8 +19,7 @@
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_GR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_GR
 
 
 class MorphShift(Morph):

src/diffpy/pdfmorph/morphs/morphsmear.py

@@ -19,8 +19,7 @@
 
 
 import numpy
-from diffpy.pdfmorph.morphs.morph import Morph
-from diffpy.pdfmorph.morphs.morph import LABEL_RA, LABEL_RR
+from diffpy.pdfmorph.morphs.morph import Morph, LABEL_RA, LABEL_RR
 
 
 class MorphSmear(Morph):