Skip to content

Commit

Permalink
Linting
Browse files Browse the repository at this point in the history
  • Loading branch information
rhugonnet committed Sep 4, 2023
1 parent 7716fa8 commit a0ff3bd
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 38 deletions.
15 changes: 4 additions & 11 deletions .github/scripts/generate_pip_deps_from_conda.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ def conda_package_to_pip(package: str):
return package


def generate_pip_from_conda(
conda_path: pathlib.Path, pip_path: pathlib.Path, compare: bool = False
) -> bool:
def generate_pip_from_conda(conda_path: pathlib.Path, pip_path: pathlib.Path, compare: bool = False) -> bool:
"""
Generate the pip dependencies file from the conda file, or compare that
they are synchronized (``compare=True``).
Expand Down Expand Up @@ -128,9 +126,7 @@ def generate_pip_from_conda(


if __name__ == "__main__":
argparser = argparse.ArgumentParser(
description="convert (or compare) conda file to pip"
)
argparser = argparse.ArgumentParser(description="convert (or compare) conda file to pip")
argparser.add_argument(
"--compare",
action="store_true",
Expand All @@ -147,9 +143,6 @@ def generate_pip_from_conda(
compare=args.compare,
)
if res:
msg = (
f"`{pip_fname}` has to be generated with `{__file__}` after "
f"`{conda_fname}` is modified.\n"
)
msg = f"`{pip_fname}` has to be generated with `{__file__}` after " f"`{conda_fname}` is modified.\n"
sys.stderr.write(msg)
sys.exit(res)
sys.exit(res)
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,4 +120,4 @@ repos:
entry: .github/scripts/generate_pip_deps_from_conda.py
files: ^(environment.yml|requirements.txt)$
pass_filenames: false
additional_dependencies: [tomli, pyyaml]
additional_dependencies: [tomli, pyyaml]
20 changes: 0 additions & 20 deletions dev-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion examples/advanced/plot_slope_methods.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def plot_attribute(attribute, cmap, label=None, vlim=None):
attribute.squeeze(),
cmap=cmap,
extent=[dem.bounds.left, dem.bounds.right, dem.bounds.bottom, dem.bounds.top],
**vlims
**vlims,
)
if label is not None:
cbar = plt.colorbar()
Expand Down
3 changes: 0 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,12 @@ shapely
numba
numpy
matplotlib
opencv
openh264
pyproj>=3.4
rasterio>=1.3
scipy
tqdm
scikit-image
scikit-gstat>=1.0
pytransform3d
geoutils==0.0.13
pip
setuptools
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ dev =
%(doc)s
%(test)s
all =
%(dev)s
%(dev)s
2 changes: 1 addition & 1 deletion xdem/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.0.13'
__version__ = "0.0.13"

0 comments on commit a0ff3bd

Please sign in to comment.