Skip to content

Commit

Permalink
Merge pull request #1469 from dicaearchus/pep8_for_bare_except
Browse files Browse the repository at this point in the history
pep8 compliancy for import statements. Thanks for fixing @dicaearchus!
  • Loading branch information
erikvansebille authored Nov 24, 2023
2 parents 67d3931 + 5f1adce commit 21410dc
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Installation for developers

If you would prefer to have a development installation of Parcels (i.e., where the code can be actively edited), you can do so by cloning the Parcels repo, installing dependencies using the environment file, and then installing Parcels in an editable mode such that changes to the cloned code can be tested during development.

**Step 1:** Install `micromamba <https://mamba.readthedocs.io/en/latest/index.html>`_, a lightweight version of conda, following the instructions `here <https://mamba.readthedocs.io/en/latest/micromamba-installation.html#umamba-install>`_.
**Step 1:** Install `micromamba <https://mamba.readthedocs.io/en/latest/index.html>`_, a lightweight version of conda, following the instructions `here <https://mamba.readthedocs.io/en/latest/installation/micromamba-installation.html>`_.

.. note::

Expand Down
2 changes: 1 addition & 1 deletion parcels/compilation/codecompiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None


Expand Down
2 changes: 1 addition & 1 deletion parcels/fieldset.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None


Expand Down
2 changes: 1 addition & 1 deletion parcels/interaction/interactionkernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None

from parcels.field import NestedField, VectorField
Expand Down
2 changes: 1 addition & 1 deletion parcels/kernel.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None

import parcels.rng as ParcelsRandom # noqa
Expand Down
2 changes: 1 addition & 1 deletion parcels/particledata.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None
if MPI:
try:
Expand Down
4 changes: 2 additions & 2 deletions parcels/particlefile.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None
try:
from parcels._version import version as parcels_version
except:
except ModuleNotFoundError:
raise OSError('Parcels version can not be retrieved. Have you run ''python setup.py install''?')


Expand Down
4 changes: 2 additions & 2 deletions parcels/particleset.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None

try:
from pykdtree.kdtree import KDTree
except:
except ModuleNotFoundError:
KDTree = None

from parcels.application_kernels.advection import AdvectionRK4
Expand Down
2 changes: 1 addition & 1 deletion parcels/tools/timer.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

try:
from mpi4py import MPI
except:
except ModuleNotFoundError:
MPI = None


Expand Down

0 comments on commit 21410dc

Please sign in to comment.