From 23e671312894d2201d2f092d0c4c5d9b9e8f3b4d Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Mon, 18 Nov 2024 11:17:54 -0500 Subject: [PATCH 1/7] update --- .flake8 | 3 +-- python/grass/pygrass/vector/__init__.py | 30 +++++++++++++++---------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.flake8 b/.flake8 index 0ea1b48ae68..4b37a85525f 100644 --- a/.flake8 +++ b/.flake8 @@ -55,9 +55,8 @@ per-file-ignores = python/grass/pydispatch/saferef.py: F821 # C wrappers call libgis.G_gisinit before importing other modules. # TODO: Is this really needed? - python/grass/pygrass/vector/__init__.py: E402 python/grass/pygrass/raster/__init__.py: E402 - python/grass/pygrass/vector/__init__.py: E402 + python/grass/pygrass/vector/__init__.py: E501 python/grass/pygrass/raster/category.py: E721 python/grass/pygrass/utils.py: E402 python/grass/temporal/abstract_space_time_dataset.py: E722 diff --git a/python/grass/pygrass/vector/__init__.py b/python/grass/pygrass/vector/__init__.py index 6723b2e44b3..dcaeda13176 100644 --- a/python/grass/pygrass/vector/__init__.py +++ b/python/grass/pygrass/vector/__init__.py @@ -1,21 +1,27 @@ from os.path import join, exists +import ctypes import grass.lib.gis as libgis -libgis.G_gisinit("") -import grass.lib.vector as libvect -import ctypes +def _init_imports(): + libgis.G_gisinit("") + global libvect, VTYPE, GrassError, must_be_open, Location, _GEOOBJ, read_line, read_next_line, _Area, Info, Bbox, Cats, Ilist + + import grass.lib.vector as libvect + from grass.pygrass.vector.vector_type import VTYPE + from grass.pygrass.errors import GrassError, must_be_open + from grass.pygrass.gis import Location + from grass.pygrass.vector.geometry import ( + GEOOBJ as _GEOOBJ, + read_line, + read_next_line, + ) + from grass.pygrass.vector.geometry import Area as _Area + from grass.pygrass.vector.abstract import Info + from grass.pygrass.vector.basic import Bbox, Cats, Ilist -# import pygrass modules -from grass.pygrass.vector.vector_type import VTYPE -from grass.pygrass.errors import GrassError, must_be_open -from grass.pygrass.gis import Location -from grass.pygrass.vector.geometry import GEOOBJ as _GEOOBJ -from grass.pygrass.vector.geometry import read_line, read_next_line -from grass.pygrass.vector.geometry import Area as _Area -from grass.pygrass.vector.abstract import Info -from grass.pygrass.vector.basic import Bbox, Cats, Ilist +_init_imports() _NUMOF = { From 309f677ff8d44c6cb570a05dc886e929399bd964 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Mon, 18 Nov 2024 17:16:53 -0500 Subject: [PATCH 2/7] update --- python/grass/pygrass/vector/.webui_secret_key | 1 + python/grass/pygrass/vector/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 python/grass/pygrass/vector/.webui_secret_key diff --git a/python/grass/pygrass/vector/.webui_secret_key b/python/grass/pygrass/vector/.webui_secret_key new file mode 100644 index 00000000000..59851bc6da4 --- /dev/null +++ b/python/grass/pygrass/vector/.webui_secret_key @@ -0,0 +1 @@ +k9D+1ABOS5BfcMNm diff --git a/python/grass/pygrass/vector/__init__.py b/python/grass/pygrass/vector/__init__.py index dcaeda13176..44e7dcb3df8 100644 --- a/python/grass/pygrass/vector/__init__.py +++ b/python/grass/pygrass/vector/__init__.py @@ -1,12 +1,12 @@ from os.path import join, exists -import ctypes import grass.lib.gis as libgis def _init_imports(): libgis.G_gisinit("") - global libvect, VTYPE, GrassError, must_be_open, Location, _GEOOBJ, read_line, read_next_line, _Area, Info, Bbox, Cats, Ilist + import ctypes + global ctypes, libvect, VTYPE, GrassError, must_be_open, Location, _GEOOBJ, read_line, read_next_line, _Area, Info, Bbox, Cats, Ilist import grass.lib.vector as libvect from grass.pygrass.vector.vector_type import VTYPE from grass.pygrass.errors import GrassError, must_be_open From 956013cc92f63889cac1238c2e48f408876d152d Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Mon, 18 Nov 2024 17:18:33 -0500 Subject: [PATCH 3/7] update --- python/grass/pygrass/vector/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python/grass/pygrass/vector/__init__.py b/python/grass/pygrass/vector/__init__.py index 44e7dcb3df8..2fc97cca42c 100644 --- a/python/grass/pygrass/vector/__init__.py +++ b/python/grass/pygrass/vector/__init__.py @@ -4,9 +4,8 @@ def _init_imports(): libgis.G_gisinit("") - import ctypes - global ctypes, libvect, VTYPE, GrassError, must_be_open, Location, _GEOOBJ, read_line, read_next_line, _Area, Info, Bbox, Cats, Ilist + import ctypes import grass.lib.vector as libvect from grass.pygrass.vector.vector_type import VTYPE from grass.pygrass.errors import GrassError, must_be_open From 23608d68f41ce5da761da6cdeccd3db37ccc8c1c Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 19 Nov 2024 14:22:46 -0500 Subject: [PATCH 4/7] update --- python/grass/pygrass/vector/.webui_secret_key | 1 - python/grass/pygrass/vector/__init__.py | 37 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 python/grass/pygrass/vector/.webui_secret_key diff --git a/python/grass/pygrass/vector/.webui_secret_key b/python/grass/pygrass/vector/.webui_secret_key deleted file mode 100644 index 59851bc6da4..00000000000 --- a/python/grass/pygrass/vector/.webui_secret_key +++ /dev/null @@ -1 +0,0 @@ -k9D+1ABOS5BfcMNm diff --git a/python/grass/pygrass/vector/__init__.py b/python/grass/pygrass/vector/__init__.py index 2fc97cca42c..b23698e78c8 100644 --- a/python/grass/pygrass/vector/__init__.py +++ b/python/grass/pygrass/vector/__init__.py @@ -2,25 +2,24 @@ import grass.lib.gis as libgis -def _init_imports(): - libgis.G_gisinit("") - global ctypes, libvect, VTYPE, GrassError, must_be_open, Location, _GEOOBJ, read_line, read_next_line, _Area, Info, Bbox, Cats, Ilist - import ctypes - import grass.lib.vector as libvect - from grass.pygrass.vector.vector_type import VTYPE - from grass.pygrass.errors import GrassError, must_be_open - from grass.pygrass.gis import Location - from grass.pygrass.vector.geometry import ( - GEOOBJ as _GEOOBJ, - read_line, - read_next_line, - ) - from grass.pygrass.vector.geometry import Area as _Area - from grass.pygrass.vector.abstract import Info - from grass.pygrass.vector.basic import Bbox, Cats, Ilist - - -_init_imports() +# flake8: noqa: E402 +libgis.G_gisinit("") + +import ctypes +import grass.lib.vector as libvect +from grass.pygrass.vector.vector_type import VTYPE +from grass.pygrass.errors import GrassError, must_be_open +from grass.pygrass.gis import Location +from grass.pygrass.vector.geometry import ( + GEOOBJ as _GEOOBJ, + read_line, + read_next_line, +) +from grass.pygrass.vector.geometry import Area as _Area +from grass.pygrass.vector.abstract import Info +from grass.pygrass.vector.basic import Bbox, Cats, Ilist + +# flake8: qa _NUMOF = { From cb2158785291620f13115ceb8177b94a0aa5a224 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Tue, 19 Nov 2024 14:24:56 -0500 Subject: [PATCH 5/7] update --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index 4b37a85525f..c31c8ea1ef4 100644 --- a/.flake8 +++ b/.flake8 @@ -56,7 +56,6 @@ per-file-ignores = # C wrappers call libgis.G_gisinit before importing other modules. # TODO: Is this really needed? python/grass/pygrass/raster/__init__.py: E402 - python/grass/pygrass/vector/__init__.py: E501 python/grass/pygrass/raster/category.py: E721 python/grass/pygrass/utils.py: E402 python/grass/temporal/abstract_space_time_dataset.py: E722 From dc2593c273617221e1b08ae9a47ebad1ae674289 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Mon, 25 Nov 2024 12:06:44 -0500 Subject: [PATCH 6/7] update --- python/grass/pygrass/vector/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/grass/pygrass/vector/__init__.py b/python/grass/pygrass/vector/__init__.py index b23698e78c8..7313af1fd34 100644 --- a/python/grass/pygrass/vector/__init__.py +++ b/python/grass/pygrass/vector/__init__.py @@ -1,11 +1,11 @@ from os.path import join, exists import grass.lib.gis as libgis +import ctypes # flake8: noqa: E402 libgis.G_gisinit("") -import ctypes import grass.lib.vector as libvect from grass.pygrass.vector.vector_type import VTYPE from grass.pygrass.errors import GrassError, must_be_open @@ -14,8 +14,8 @@ GEOOBJ as _GEOOBJ, read_line, read_next_line, + Area as _Area, ) -from grass.pygrass.vector.geometry import Area as _Area from grass.pygrass.vector.abstract import Info from grass.pygrass.vector.basic import Bbox, Cats, Ilist From 6c9e7fcec5661d26e5653c0e0f8dc85404d25ed9 Mon Sep 17 00:00:00 2001 From: Arohan Ajit Date: Thu, 19 Dec 2024 15:46:35 -0500 Subject: [PATCH 7/7] update --- .flake8 | 1 - 1 file changed, 1 deletion(-) diff --git a/.flake8 b/.flake8 index fa12f18c318..e650938d299 100644 --- a/.flake8 +++ b/.flake8 @@ -46,7 +46,6 @@ per-file-ignores = # C wrappers call libgis.G_gisinit before importing other modules. # TODO: Is this really needed? python/grass/pygrass/vector/__init__.py: E402 - python/grass/pygrass/vector/__init__.py: E402 python/grass/temporal/datetime_math.py: E722 python/grass/temporal/spatial_topology_dataset_connector.py: E722 python/grass/temporal/temporal_algebra.py: E722