Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-pyth…
Browse files Browse the repository at this point in the history
…on-5
  • Loading branch information
Zeitsperre authored May 14, 2024
2 parents 8d1a29b + 33f2e8c commit bf5fec4
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
name: Build Docker image
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: docker/setup-buildx-action@v2
- uses: actions/checkout@v4
- uses: docker/setup-buildx-action@v3
- uses: docker/build-push-action@v4
with:
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.11"
Expand All @@ -44,7 +44,7 @@ jobs:
- os: macos-latest
python-version: "3.10"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
uses: mamba-org/setup-micromamba@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
# inherit without having to test which work which do not.
autodoc_mock_imports = [
"affine",
"anyascii",
"bottleneck",
"cairo",
"cartopy",
Expand Down Expand Up @@ -102,7 +103,6 @@
"sklearn",
"spotpy",
"statsmodels",
"unidecode",
"xarray",
"xclim",
"zlib",
Expand Down
5 changes: 1 addition & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies:
- python >=3.8,<3.12
- pywps ==4.5.1
- affine
- anyascii
- cartopy
- click
- fiona >=1.9
Expand All @@ -19,8 +20,6 @@ dependencies:
- numpy
- owslib
- pandas
- pandoc
- poppler
- psutil
- psycopg2
- pymetalink
Expand All @@ -31,8 +30,6 @@ dependencies:
- requests
- rioxarray
- shapely
- tbb
- unidecode
- urlpath
- xarray >=0.18
- xclim >=0.31.0
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ classifiers = [
]
dynamic = ["description", "version"]
dependencies = [
"anyascii",
"click",
"jinja2",
"matplotlib",
Expand Down Expand Up @@ -66,8 +67,7 @@ dependencies = [
# Docs and other utilities
"fsspec",
"psycopg2", # to use postgres to log pywps requests like in Prod
"pymetalink",
"unidecode"
"pymetalink"
]

[project.optional-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions raven/processes/base_xclim.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

import requests
import xarray as xr
from anyascii import anyascii
from pywps import FORMATS, ComplexInput, ComplexOutput, LiteralInput, Process
from pywps.app.Common import Metadata
from unidecode import unidecode

LOGGER = logging.getLogger("PYWPS")

Expand Down Expand Up @@ -68,8 +68,8 @@ def __init__(self):
self._handler,
identifier=identifier,
version="0.1",
title=unidecode(attrs["long_name"]),
abstract=unidecode(attrs["abstract"]),
title=anyascii(attrs["long_name"]),
abstract=anyascii(attrs["abstract"]),
inputs=self.load_inputs(eval(attrs["parameters"])),
outputs=outputs,
status_supported=True,
Expand Down

0 comments on commit bf5fec4

Please sign in to comment.