From 52b6977e69900afa05384bc5a44573dfd8b5f84e Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Wed, 30 Mar 2022 17:52:35 +0300 Subject: [PATCH 1/2] Update Black dependency to fix CI lint Closes #896. Black 22.3.0 fixes incompatibility with Click 8.1.0: https://github.com/psf/black/pull/2966 This currently causes the CI to fail, e.g. https://github.com/typeddjango/django-stubs/runs/5756075543 --- .pre-commit-config.yaml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index edc92263e..af185a3ea 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -28,7 +28,7 @@ repos: types: [pyi] args: ["--profile", "black"] - repo: https://github.com/psf/black - rev: 21.12b0 + rev: 22.3.0 hooks: - id: black - repo: https://gitlab.com/pycqa/flake8 diff --git a/requirements.txt b/requirements.txt index 061e4478a..0b32113f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -black==22.1.0 +black==22.3.0 requests==2.27.1 coreapi==2.3.3 gitpython==3.1.27 From b6d304ec2a8f38094ff701e4b62fee11c1ccaa4b Mon Sep 17 00:00:00 2001 From: Marti Raudsepp Date: Thu, 31 Mar 2022 10:28:42 +0300 Subject: [PATCH 2/2] Reformat with Black v22 --- django-stubs/contrib/gis/db/backends/oracle/models.pyi | 2 ++ django-stubs/contrib/gis/db/backends/postgis/models.pyi | 2 ++ django-stubs/contrib/gis/db/backends/spatialite/models.pyi | 2 ++ django-stubs/contrib/gis/forms/widgets.pyi | 1 + 4 files changed, 7 insertions(+) diff --git a/django-stubs/contrib/gis/db/backends/oracle/models.pyi b/django-stubs/contrib/gis/db/backends/oracle/models.pyi index d81db05ef..7d18ee3b1 100644 --- a/django-stubs/contrib/gis/db/backends/oracle/models.pyi +++ b/django-stubs/contrib/gis/db/backends/oracle/models.pyi @@ -7,6 +7,7 @@ class OracleGeometryColumns(models.Model): table_name: Any = ... column_name: Any = ... srid: Any = ... + class Meta: app_label: str = ... db_table: str = ... @@ -23,6 +24,7 @@ class OracleSpatialRefSys(models.Model, SpatialRefSysMixin): auth_name: Any = ... wktext: Any = ... cs_bounds: Any = ... + class Meta: app_label: str = ... db_table: str = ... diff --git a/django-stubs/contrib/gis/db/backends/postgis/models.pyi b/django-stubs/contrib/gis/db/backends/postgis/models.pyi index b124dfa0a..c6bdfc862 100644 --- a/django-stubs/contrib/gis/db/backends/postgis/models.pyi +++ b/django-stubs/contrib/gis/db/backends/postgis/models.pyi @@ -11,6 +11,7 @@ class PostGISGeometryColumns(models.Model): coord_dimension: Any = ... srid: Any = ... type: Any = ... + class Meta: app_label: str = ... db_table: str = ... @@ -26,6 +27,7 @@ class PostGISSpatialRefSys(models.Model, SpatialRefSysMixin): auth_srid: Any = ... srtext: Any = ... proj4text: Any = ... + class Meta: app_label: str = ... db_table: str = ... diff --git a/django-stubs/contrib/gis/db/backends/spatialite/models.pyi b/django-stubs/contrib/gis/db/backends/spatialite/models.pyi index dc4fd6083..1c0eacede 100644 --- a/django-stubs/contrib/gis/db/backends/spatialite/models.pyi +++ b/django-stubs/contrib/gis/db/backends/spatialite/models.pyi @@ -10,6 +10,7 @@ class SpatialiteGeometryColumns(models.Model): srid: Any = ... spatial_index_enabled: Any = ... type: Any = ... + class Meta: app_label: str = ... db_table: str = ... @@ -26,6 +27,7 @@ class SpatialiteSpatialRefSys(models.Model, SpatialRefSysMixin): ref_sys_name: Any = ... proj4text: Any = ... srtext: Any = ... + class Meta: app_label: str = ... db_table: str = ... diff --git a/django-stubs/contrib/gis/forms/widgets.pyi b/django-stubs/contrib/gis/forms/widgets.pyi index 710a2bd20..1f9a2f404 100644 --- a/django-stubs/contrib/gis/forms/widgets.pyi +++ b/django-stubs/contrib/gis/forms/widgets.pyi @@ -21,6 +21,7 @@ class BaseGeometryWidget(Widget): class OpenLayersWidget(BaseGeometryWidget): template_name: str = ... map_srid: int = ... + class Media: css: Any = ... js: Any = ...