Merge branch 'drop-py35'

Author: amorison

.travis.yml

@@ -1,12 +1,10 @@
 language: python
 os: linux
-dist: xenial
+dist: focal
 
 jobs:
     fast_finish: true
     include:
-        - python: 3.5
-          env: TOXENV=py35
         - python: 3.6
           env: TOXENV=py36
         - python: 3.7

docs/sources/install.rst

@@ -1,7 +1,7 @@
 Installation
 ============
 
-You will need Python 3.5 or higher to use StagPy. StagPy is available on
+You will need Python 3.6 or higher to use StagPy. StagPy is available on
 the Python Package Index, via ``pip``.
 
 If Python3 is not installed on your system or you don't have sufficient
@@ -35,7 +35,7 @@ Make sure that the directory where ``pip`` install package entry-points
 (usually ``~/.local/bin``) is in your ``PATH`` environment variable.
 You can run ``python3 -m pip show stagpy`` to obtain some hint about this
 location (this command will show you were the compiled sources are installed,
-e.g. ``~/.local/lib/python3.5/site-packages``, from which you can deduce the
+e.g. ``~/.local/lib/python3.8/site-packages``, from which you can deduce the
 entry-point location, e.g. ``~/.local/bin``).
 
 See the `Some setup`_ subsection to enable autocompletion and create your

setup.py

@@ -7,15 +7,15 @@
 
 DEPENDENCIES = [
     'loam>=0.3.1',
-    'f90nml>=1.0.2',
-    'setuptools_scm>=1.15',
+    'f90nml>=1.2',
+    'setuptools_scm>=4.1',
 ]
 HEAVY = [
-    'numpy>=1.12',
-    'scipy>=1.0',
-    'pandas>=0.22',
-    'h5py>=2.7.1',
-    'matplotlib>=3.0',
+    'numpy>=1.19',
+    'scipy>=1.5',
+    'pandas>=1.1',
+    'h5py>=2.10',
+    'matplotlib>=3.3',
 ]
 
 ON_RTD = os.environ.get('READTHEDOCS', None) == 'True'
@@ -41,13 +41,12 @@
         'Intended Audience :: Science/Research',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
     ],
 
-    python_requires='>=3.5',
+    python_requires='>=3.6',
     packages=['stagpy'],
     entry_points={
         'console_scripts': ['stagpy = stagpy.__main__:main']

stagpy/__init__.py

@@ -86,8 +86,7 @@ def load_mplstyle():
             try:
                 plt.style.use(style)
             except OSError:
-                print('Cannot import style {}.'.format(style),
-                      file=sys.stderr)
+                print(f'Cannot import style {style}.', file=sys.stderr)
                 conf.plot.mplstyle = ''
     if conf.plot.xkcd:
         plt.xkcd()

stagpy/_step.py

@@ -229,8 +229,8 @@ def __getitem__(self, name):
         else:
             raise error.UnknownFieldVarError(name)
         if parsed_data is None:
-            raise error.MissingDataError('Missing field {} in step {}'
-                                         .format(name, self.step.istep))
+            raise error.MissingDataError(
+                f'Missing field {name} in step {self.step.istep}')
         header, fields = parsed_data
         self._header = header
         for fld_name, fld in zip(fld_names, fields):
@@ -405,8 +405,8 @@ def _rprofs(self):
             step = self.step
             self._data = step.sdat._rprof_and_times[0].get(step.istep)
             if self._data is None:
-                raise error.MissingDataError('No rprof data in step {} of {}'
-                                             .format(step.istep, step.sdat))
+                raise error.MissingDataError(
+                    f'No rprof data in step {step.istep} of {step.sdat}')
         return self._data
 
     def __getitem__(self, name):

stagpy/commands.py

@@ -25,7 +25,7 @@ def info_cmd():
     sdat = stagyydata.StagyyData()
     lsnap = sdat.snaps[-1]
     lstep = sdat.steps[-1]
-    print('StagYY run in {}'.format(sdat.path))
+    print(f'StagYY run in {sdat.path}')
     if lsnap.geom.threed:
         dimension = '{} x {} x {}'.format(lsnap.geom.nxtot,
                                           lsnap.geom.nytot,
@@ -45,9 +45,9 @@ def info_cmd():
     print()
     for step in sdat.walk:
         is_snap = step.isnap is not None
-        print('Step {}/{}'.format(step.istep, lstep.istep), end='')
+        print(f'Step {step.istep}/{lstep.istep}', end='')
         if is_snap:
-            print(', snapshot {}/{}'.format(step.isnap, lsnap.isnap))
+            print(f', snapshot {step.isnap}/{lsnap.isnap}')
         else:
             print()
         series = step.timeinfo.loc[varlist]
@@ -95,7 +95,7 @@ def _pretty_print(key_val, sep=': ', min_col_width=39, text_width=None):
             wrapper.subsequent_indent = ' '
         else:
             wrapper.subsequent_indent = ' ' * (len(key) + len(sep))
-        lines.extend(wrapper.wrap('{}{}{}'.format(key, sep, val)))
+        lines.extend(wrapper.wrap(f'{key}{sep}{val}'))
 
     chunks = []
     for rem_col in range(ncols, 1, -1):
@@ -107,7 +107,7 @@ def _pretty_print(key_val, sep=': ', min_col_width=39, text_width=None):
     chunks.append(lines)
     lines = zip_longest(*chunks, fillvalue='')
 
-    fmt = '|'.join(['{{:{}}}'.format(colw)] * (ncols - 1))
+    fmt = '|'.join([f'{{:{colw}}}'] * (ncols - 1))
     fmt += '|{}' if ncols > 1 else '{}'
     print(*(fmt.format(*line) for line in lines), sep='\n')
 
@@ -157,7 +157,7 @@ def version_cmd():
 
     Use :data:`stagpy.__version__` to obtain the version in a script.
     """
-    print('stagpy version: {}'.format(__version__))
+    print(f'stagpy version: {__version__}')
 
 
 def report_parsing_problems(parsing_out):
@@ -191,7 +191,7 @@ def config_pp(subs):
                 opt += ' (c)' if meta.cmd_arg else ' (f)'
             hlp_lst.append((opt, meta.help))
         if hlp_lst:
-            print('{}:'.format(sub))
+            print(f'{sub}:')
             _pretty_print(hlp_lst, sep=' -- ',
                           text_width=min(get_terminal_size().columns, 100))
             print()

stagpy/config.py

@@ -16,7 +16,7 @@ def _actual_index(arg):
     if ':' in arg:
         idxs = arg.split(':')
         if len(idxs) > 3:
-            raise ValueError('{} is an invalid slice'.format(arg))
+            raise ValueError(f'{arg} is an invalid slice')
         idxs[0] = int(idxs[0]) if idxs[0] else None
         idxs[1] = int(idxs[1]) if idxs[1] else None
         if len(idxs) == 3:

stagpy/error.py

@@ -27,7 +27,7 @@ class NoSnapshotError(StagpyError):
 
     def __init__(self, sdat):
         self.sdat = sdat
-        super().__init__('no snapshot found for {}'.format(sdat))
+        super().__init__(f'no snapshot found for {sdat}')
 
 
 class NoParFileError(StagpyError):
@@ -43,7 +43,7 @@ class NoParFileError(StagpyError):
 
     def __init__(self, parfile):
         self.parfile = parfile
-        super().__init__('{} file not found'.format(parfile))
+        super().__init__(f'{parfile} file not found')
 
 
 class NotAvailableError(StagpyError):
@@ -130,8 +130,7 @@ class InvalidTimeFractionError(StagpyError):
 
     def __init__(self, fraction):
         self.fraction = fraction
-        super().__init__('Fraction should be in (0,1] (received {})'
-                         .format(fraction))
+        super().__init__(f'Fraction should be in (0,1] (received {fraction})')
 
 
 class InvalidNfieldsError(StagpyError):
@@ -146,8 +145,7 @@ class InvalidNfieldsError(StagpyError):
 
     def __init__(self, nfields):
         self.nfields = nfields
-        super().__init__('nfields_max should be >5 (received {})'
-                         .format(nfields))
+        super().__init__(f'nfields_max should be >5 (received {nfields})')
 
 
 class InvalidZoomError(StagpyError):
@@ -162,8 +160,7 @@ class InvalidZoomError(StagpyError):
 
     def __init__(self, zoom):
         self.zoom = zoom
-        super().__init__('Zoom angle should be in [0,360] (received {})'
-                         .format(zoom))
+        super().__init__(f'Zoom angle should be in [0,360] (received {zoom})')
 
 
 class StagnantLidError(StagpyError):
@@ -180,7 +177,7 @@ class StagnantLidError(StagpyError):
 
     def __init__(self, sdat):
         self.sdat = sdat
-        super().__init__('Stagnant lid regime for {}'.format(sdat))
+        super().__init__(f'Stagnant lid regime for {sdat}')
 
 
 class MissingDataError(StagpyError, KeyError):

stagpy/field.py

@@ -203,7 +203,7 @@ def plot_scalar(step, var, field=None, axis=None, **extra):
         cbar = plt.colorbar(surf, cax=cax)
         cbar.set_label(meta.description +
                        (' pert.' if conf.field.perturbation else '') +
-                       (' ({})'.format(unit) if unit else ''))
+                       (f' ({unit})' if unit else ''))
     if step.geom.spherical or conf.plot.ratio is None:
         axis.set_aspect('equal')
         axis.set_axis_off()
@@ -309,8 +309,7 @@ def cmd():
                                      figsize=(9 * len(vfig), 6))
             for axis, var in zip(axes[0], vfig):
                 if var[0] not in step.fields:
-                    print("'{}' field on snap {} not found".format(var[0],
-                                                                   step.isnap))
+                    print(f"{var[0]!r} field on snap {step.isnap} not found")
                     continue
                 opts = {}
                 if var[0] in minmax:
@@ -324,7 +323,7 @@ def cmd():
             if conf.field.timelabel:
                 time, unit = sdat.scale(step.timeinfo['t'], 's')
                 time = misc.scilabel(time)
-                axes[0, 0].text(0.02, 1.02, '$t={}$ {}'.format(time, unit),
+                axes[0, 0].text(0.02, 1.02, f'$t={time}$ {unit}',
                                 transform=axes[0, 0].transAxes)
             oname = '_'.join(chain.from_iterable(vfig))
             plt.tight_layout(w_pad=3)

stagpy/misc.py

@@ -45,10 +45,10 @@ def scilabel(value, precision=2):
     Returns:
         str: the scientific notation the specified value.
     """
-    fmt = '{{:.{}e}}'.format(precision)
+    fmt = f'{{:.{precision}e}}'
     man, exp = fmt.format(value).split('e')
     exp = int(exp)
-    return r'{}\times 10^{{{}}}'.format(man, exp)
+    return fr'{man}\times 10^{{{exp}}}'
 
 
 def saveplot(fig, *name_args, close=True, **name_kwargs):
@@ -64,7 +64,7 @@ def saveplot(fig, *name_args, close=True, **name_kwargs):
         name_kwargs: keyword arguments passed on to :func:`out_name`.
     """
     oname = out_name(*name_args, **name_kwargs)
-    fig.savefig('{}.{}'.format(oname, conf.plot.format),
+    fig.savefig(f'{oname}.{conf.plot.format}',
                 format=conf.plot.format, bbox_inches='tight')
     if close:
         plt.close(fig)
@@ -160,7 +160,7 @@ class InchoateFiles:
     """
 
     def __init__(self, nfiles=1, tmp_prefix=None):
-        self._fnames = ['inchoate{}'.format(i) for i in range(nfiles)]
+        self._fnames = [f'inchoate{i}' for i in range(nfiles)]
         self._tmpprefix = tmp_prefix
         self._fids = []