Applies automatic fixes from the default ruff ruleset

conftest.py

@@ -15,7 +15,6 @@
 """
 from __future__ import print_function
 
-import os.path
 import inspect
 
 import pytest

doc/_extensions/numfig.py

@@ -1,4 +1,4 @@
-from docutils.nodes import figure, caption, Text, reference, raw, SkipNode, Element
+from docutils.nodes import figure, caption, Text, reference, raw, SkipNode
 from sphinx.roles import XRefRole
 
 

doc/conf.py

@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the

doc/gentoc.py

@@ -12,8 +12,6 @@
     from typing import Optional, BinaryIO, List, Dict
 except ImportError:
     pass
-else:
-    from sasmodels.modelinfo import ModelInfo
 
 TEMPLATE = """\
 ..

example/cylinder_eval.py

@@ -2,7 +2,7 @@
 Minimal example of calling a kernel for a specific set of q values.
 """
 
-from numpy import logspace, sqrt
+from numpy import logspace
 from matplotlib import pyplot as plt
 from sasmodels.core import load_model
 from sasmodels.direct_model import call_kernel, call_Fq

example/model.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-import sys
 from bumps.names import *
 from sasmodels.core import load_model
 from sasmodels.bumps_model import Model, Experiment

example/model_ellipsoid_hayter_msa.py

@@ -1,12 +1,11 @@
 import sys
 #sys.path.append('path_to_sasmodels')
 
-import numpy as np
 
 from bumps.names import *
 from sasmodels.core import load_model
 from sasmodels.bumps_model import Model, Experiment
-from sasmodels.data import load_data, plot_data
+from sasmodels.data import load_data
 
 # IMPORT THE DATA USED
 data = load_data(sys.argv[1])

example/multiscatfit.py

@@ -27,11 +27,10 @@
     sasview.exe bumps.cli multiscatfit.py --store=t1
 """
 
-import sys
 from bumps.names import *
 from sasmodels.core import load_model
 from sasmodels.bumps_model import Model, Experiment
-from sasmodels.data import load_data, set_beam_stop, set_top
+from sasmodels.data import load_data
 
 from sasmodels.multiscat import MultipleScattering
 

example/sesansfit.py

@@ -1,7 +1,7 @@
 import logging
 
 from bumps.names import *
-from sasmodels import core, bumps_model, sesans
+from sasmodels import core, bumps_model
 from sasdata.dataloader.loader import Loader
 
 def get_bumps_model(model_name):

example/simul_fit.py

@@ -1,7 +1,7 @@
 from bumps.names import *
 from sasmodels.core import load_model
 from sasmodels.bumps_model import Model, Experiment
-from sasmodels.data import load_data, plot_data
+from sasmodels.data import load_data
 
 # latex data, same sample usans and sans
 # particles radius ~2300, uniform dispersity

example/weights/cyclic_gaussian.py

@@ -1,5 +1,5 @@
 import numpy as np
-from numpy import exp, sin, cos, pi, radians, degrees
+from numpy import exp, sin, pi, radians, degrees
 
 from sasmodels.weights import Dispersion as BaseDispersion
 

example/weights/laplace.py

@@ -1,4 +1,3 @@
-import numpy as np
 from scipy.stats import laplace
 
 from sasmodels import weights

example/weights/maier_saupe_eq.py

@@ -1,5 +1,5 @@
 import numpy as np
-from numpy import exp, sin, degrees, radians, pi, sqrt
+from numpy import exp, sin, degrees, pi, sqrt
 
 from sasmodels.weights import Dispersion as BaseDispersion
 

explore/angular_pd.py

@@ -2,13 +2,11 @@
 Application to explore the difference between sasview 3.x orientation
 dispersity and possible replacement algorithms.
 """
-import mpl_toolkits.mplot3d   # Adds projection='3d' option to subplot
 import matplotlib.pyplot as plt
 from matplotlib.widgets import Slider, CheckButtons
-from matplotlib import cm
 
 import numpy as np
-from numpy import pi, cos, sin, sqrt, exp, degrees, radians
+from numpy import cos, sin, exp, radians
 
 def draw_sphere(ax, radius=10., steps=100):
     u = np.linspace(0, 2 * np.pi, steps)

explore/asymint.py

@@ -24,13 +24,14 @@
 
 from __future__ import print_function, division
 
-import os, sys
+import os
+import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 import warnings
 
 import numpy as np
 import mpmath as mp
-from numpy import pi, sin, cos, sqrt, exp, expm1, degrees, log10, arccos
+from numpy import pi, sin, cos, degrees, log10, arccos
 from numpy.polynomial.legendre import leggauss
 from scipy.integrate import dblquad, simps, romb, romberg
 import pylab

explore/beta/sasfit_compare.py

@@ -1,6 +1,7 @@
 from __future__ import division, print_function
 # Make sasmodels available on the path
-import sys, os
+import sys
+import os
 BETA_DIR = os.path.dirname(os.path.realpath(__file__))
 SASMODELS_DIR = os.path.dirname(os.path.dirname(BETA_DIR))
 sys.path.insert(0, SASMODELS_DIR)

explore/beta/sasfit_compare_new.py

@@ -1,6 +1,7 @@
 from __future__ import division, print_function
 # Make sasmodels available on the path
-import sys, os
+import sys
+import os
 BETA_DIR = os.path.dirname(os.path.realpath(__file__))
 SASMODELS_DIR = os.path.dirname(os.path.dirname(BETA_DIR))
 sys.path.insert(0, SASMODELS_DIR)

explore/check1d.py

@@ -11,7 +11,8 @@
 
 from __future__ import print_function, division
 
-import sys, os
+import sys
+import os
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
 
 import numpy as np

explore/realspace.py

@@ -1,13 +1,11 @@
 from __future__ import division, print_function
 
 import cmath
-import time
 from copy import copy
 import os
 import argparse
 from collections import OrderedDict
 from timeit import default_timer as timer
-from typing import Tuple
 from inspect import getfullargspec
 
 import numpy as np
@@ -941,7 +939,6 @@ def plot_calc_2d(qx, qy, Iqxy, theory=None, title=None):
         plt.title('max rel. err=%g' % np.max(abs(rel)))
 
 def plot_points(rho, points):
-    import mpl_toolkits.mplot3d
     import matplotlib.pyplot as plt
 
     ax = plt.axes(projection='3d')
@@ -1525,6 +1522,6 @@ def main():
         import sasmodels
     except ImportError:
         import sys
-        from os.path import realpath, dirname, join as joinpath
+        from os.path import realpath, dirname
         sys.path.insert(0, dirname(dirname(realpath(__file__))))
     main()

explore/rpa.py

@@ -179,11 +179,11 @@ def demo():
         raise ValueError("Case %d not implmented"%case_num)
 
     pars = build_pars(case_num, [B, C, D], **K)
-    print "eval sasmodels"
+    print("eval sasmodels")
     Iq_sasmodels = sasmodels_rpa(q, pars)
-    print "eval sasview"
+    print("eval sasview")
     Iq_sasview = sasview_rpa(q, pars)
-    print 1./Iq[0], 1./Iq_sasmodels[0], 1./Iq_sasview[0]
+    print(1./Iq[0], 1./Iq_sasmodels[0], 1./Iq_sasview[0])
 
     #return
     import pylab

explore/symint.py

@@ -4,19 +4,16 @@
 
 from __future__ import print_function, division
 
-import os, sys
+import os
+import sys
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
 import numpy as np
-from numpy import pi, sin, cos, sqrt, exp, expm1, degrees, log10
+from numpy import pi, sin, cos, sqrt, degrees
 from numpy.polynomial.legendre import leggauss
-from scipy.integrate import dblquad, simps, romb, romberg
+from scipy.integrate import simps, romb, romberg
 import pylab
 
-from sasmodels.special import square
-from sasmodels.special import Gauss20Wt, Gauss20Z
-from sasmodels.special import Gauss76Wt, Gauss76Z
-from sasmodels.special import Gauss150Wt, Gauss150Z
 from sasmodels.special import sas_2J1x_x, sas_sinx_x, sas_3j1x_x
 
 SLD = 3.0

explore/transform_angles.py

@@ -10,7 +10,7 @@
 import sys
 
 import numpy as np
-from numpy import pi, cos, sin, sqrt, exp, degrees, radians
+from numpy import cos, sin, radians
 from scipy.optimize import fmin
 
 # Definition of rotation matrices comes from wikipedia: