diff --git a/.dockerignore b/.dockerignore index c3a745027..aa4fc3281 100644 --- a/.dockerignore +++ b/.dockerignore @@ -13,6 +13,7 @@ venv # Node node_modules +package.json package-lock.json # Makefile diff --git a/.gitignore b/.gitignore index 1b1ce7e64..4d189a647 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ share # Node node_modules +package.json package-lock.json # Makefile diff --git a/docs/_static/custom.css b/docs/_static/custom.css index 382bf2e52..48f152333 100644 --- a/docs/_static/custom.css +++ b/docs/_static/custom.css @@ -59,22 +59,18 @@ div.bordered-content { div.parent-list-numbers ol { counter-reset: item; } + div.parent-list-numbers ol li { counter-increment: item; } -/*div.parent-list-numbers > li:before { - content: counters(item, ".") " "; - counter-increment: item -}*/ + div.parent-list-numbers ol ol > li::before { - content: counters(item, ".")")"; + content: counters(item, ".") ")"; margin-left: -3em; } -div.parent-list-numbers ol li { - counter-increment: item; -} + div.parent-list-numbers > ol > li > ol > li { - list-style: None; + list-style: none; display: inline-flex; display: -webkit-box; } diff --git a/magpie/services.py b/magpie/services.py index f8c3ce635..35338a5af 100644 --- a/magpie/services.py +++ b/magpie/services.py @@ -937,7 +937,7 @@ def resource_scoped(cls): @classproperty @abc.abstractmethod - def resource_multi(cls): # noqa + def resource_multi(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> bool """ Indicates if the :term:`Service` supports multiple simultaneous :term:`Resource` references. @@ -954,7 +954,7 @@ def resource_multi(cls): # noqa @classproperty @abc.abstractmethod - def resource_param(cls): # noqa + def resource_param(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> Union[Str, List[Str]] """ Name of the request query parameter(s) to access requested leaf children resource. @@ -973,7 +973,7 @@ def resource_param(cls): # noqa @classproperty @abc.abstractmethod - def resource_types_permissions(cls): # noqa + def resource_types_permissions(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> ResourceTypePermissions """ Explicit permissions provided for resources for a given :term:`OWS` implementation. @@ -981,7 +981,7 @@ def resource_types_permissions(cls): # noqa raise NotImplementedError @classproperty - def params_expected(cls): # noqa + def params_expected(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> List[Str] """ Specify typical `Geoserver` request query parameters expected for any sub-service implementation. @@ -1472,7 +1472,7 @@ class ServiceGeoserver(ServiceGeoserverBase): } @classproperty - def service_ows_supported(cls): # noqa + def service_ows_supported(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> Set[Type[ServiceOWS]] return set(cls.service_map.values()) @@ -1517,7 +1517,7 @@ def get_config(self): return self._config @classproperty - def params_expected(cls): # noqa + def params_expected(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> List[Str] params = set() for svc in cls.service_ows_supported: @@ -1528,7 +1528,7 @@ def params_expected(cls): # noqa return list(params) @classproperty - def permissions(cls): # noqa + def permissions(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> List[Permission] perms = set() for svc in cls.service_ows_supported: @@ -1539,7 +1539,7 @@ def permissions(cls): # noqa return list(perms) @classproperty - def resource_types_permissions(cls): # noqa + def resource_types_permissions(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> ResourceTypePermissions perms = {} # type: ResourceTypePermissions for svc in cls.service_ows_supported: @@ -1578,7 +1578,7 @@ def service_requested(self): # since all OWS services are accessed using '/geoserver/?request=...' # attempt to match using applicable path fragment svc_path = self.request.path.rsplit("/", 1)[-1].lower() - for svc_ows in type(self).service_ows_supported: + for svc_ows in type(self).service_ows_supported: # pylint: disable=E1133,not-an-iterable if svc_path == svc_ows.service_base: svc = svc_ows.service_base break @@ -1590,19 +1590,19 @@ def service_requested(self): return self._service_requested @classproperty - def resource_scoped(cls): # noqa + def resource_scoped(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> bool svc = cls.service_requested() return svc.resource_scoped if svc else False @classproperty - def resource_multi(cls): # noqa + def resource_multi(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> bool svc = cls.service_requested() return svc.resource_multi if svc else False @classproperty - def resource_param(cls): # noqa + def resource_param(cls): # noqa # pylint: disable=E0213,no-self-argument # type: () -> Union[Str, List[Str]] svc = cls.service_requested() return cls.resource_param if svc else [] diff --git a/magpie/utils.py b/magpie/utils.py index 5f946f645..7dc9e8c76 100644 --- a/magpie/utils.py +++ b/magpie/utils.py @@ -999,7 +999,7 @@ def __call__(cls, *args, **kwargs): return cls._instances[cls] -class classproperty(property): +class classproperty(property): # pylint: disable=C0103,invalid-name """ Mimics :class:`property` decorator, but applied onto ``classmethod`` in backward compatible way.