From 3b4309d1e09ddf6ea9b22cf0daade7587b076577 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Fri, 7 Nov 2025 11:32:47 -0800 Subject: [PATCH 1/9] add pre-commit-config --- TEKDB/TEKDB/.pre-commit-config.yaml | 6 ++++++ TEKDB/requirements.txt | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 TEKDB/TEKDB/.pre-commit-config.yaml diff --git a/TEKDB/TEKDB/.pre-commit-config.yaml b/TEKDB/TEKDB/.pre-commit-config.yaml new file mode 100644 index 00000000..2f13fa14 --- /dev/null +++ b/TEKDB/TEKDB/.pre-commit-config.yaml @@ -0,0 +1,6 @@ +repos: +- repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.14.4 + hooks: + - id: ruff-check + - id: ruff-format \ No newline at end of file diff --git a/TEKDB/requirements.txt b/TEKDB/requirements.txt index f3768a1a..b2bdfbb9 100644 --- a/TEKDB/requirements.txt +++ b/TEKDB/requirements.txt @@ -30,4 +30,6 @@ urllib3>=1.26.5 ipdb ipython # FORMATTING AND LINTING -ruff \ No newline at end of file +ruff +#pre-commit +pre-commit \ No newline at end of file From dab42dfc60d9e9e21d63fb76985443308c117607 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Fri, 7 Nov 2025 11:34:18 -0800 Subject: [PATCH 2/9] test commit --- TEKDB/TEKDB/tests/test_views.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TEKDB/TEKDB/tests/test_views.py b/TEKDB/TEKDB/tests/test_views.py index 25a63112..58e669a1 100644 --- a/TEKDB/TEKDB/tests/test_views.py +++ b/TEKDB/TEKDB/tests/test_views.py @@ -271,13 +271,14 @@ def test_get_related_records(self): def test_get_related_places(self): from TEKDB.views import get_related - + related_request = create_get_related_request( self, "places", self.first_place.placeid ) related_request.user = Users.objects.get(username="admin") response = get_related(related_request, "places", self.first_place.placeid) self.assertEqual(response.status_code, 200) + print(response.status_code) data = json.loads(response.content) self.assertTrue(isinstance(data, list)) From f41646ebcb35def9f87a0c7a753b216666c6ea95 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Fri, 7 Nov 2025 11:42:33 -0800 Subject: [PATCH 3/9] move .pre-commit-config to root --- TEKDB/TEKDB/.pre-commit-config.yaml => .pre-commit-config.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename TEKDB/TEKDB/.pre-commit-config.yaml => .pre-commit-config.yaml (100%) diff --git a/TEKDB/TEKDB/.pre-commit-config.yaml b/.pre-commit-config.yaml similarity index 100% rename from TEKDB/TEKDB/.pre-commit-config.yaml rename to .pre-commit-config.yaml From 0d8e4e60bc0b89ae4d0ff705cad2899edc66412d Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Fri, 7 Nov 2025 12:45:14 -0800 Subject: [PATCH 4/9] ruff format --- TEKDB/TEKDB/tests/test_views.py | 3 +-- TEKDB/docker/local_settings.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/TEKDB/TEKDB/tests/test_views.py b/TEKDB/TEKDB/tests/test_views.py index 58e669a1..25a63112 100644 --- a/TEKDB/TEKDB/tests/test_views.py +++ b/TEKDB/TEKDB/tests/test_views.py @@ -271,14 +271,13 @@ def test_get_related_records(self): def test_get_related_places(self): from TEKDB.views import get_related - + related_request = create_get_related_request( self, "places", self.first_place.placeid ) related_request.user = Users.objects.get(username="admin") response = get_related(related_request, "places", self.first_place.placeid) self.assertEqual(response.status_code, 200) - print(response.status_code) data = json.loads(response.content) self.assertTrue(isinstance(data, list)) diff --git a/TEKDB/docker/local_settings.py b/TEKDB/docker/local_settings.py index 0056ff9f..6b20eb39 100644 --- a/TEKDB/docker/local_settings.py +++ b/TEKDB/docker/local_settings.py @@ -1,17 +1,17 @@ -TIME_ZONE = 'America/Los_Angeles' # To see all Timezone options, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List +TIME_ZONE = "America/Los_Angeles" # To see all Timezone options, see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List REGISTRATION_OPEN = False DATABASE_GEOGRAPHY = { ###EPSG:4326### # 'default_lon': -124.325, # 'default_lat': 42.065, ###EPSG:3857### - 'default_lon': -13839795.69, - 'default_lat': 5171448.926, - 'default_zoom': 8, - 'map_template': 'gis/admin/ol2osm.html', - 'map_extent': [-24000000, 1450000, -6200000, 13000000], #US Territories - 'min_zoom': 2, - 'max_zoom': 19, + "default_lon": -13839795.69, + "default_lat": 5171448.926, + "default_zoom": 8, + "map_template": "gis/admin/ol2osm.html", + "map_extent": [-24000000, 1450000, -6200000, 13000000], # US Territories + "min_zoom": 2, + "max_zoom": 19, } -STATIC_ROOT = '/vol/web/static' -MEDIA_ROOT = '/vol/web/media' +STATIC_ROOT = "/vol/web/static" +MEDIA_ROOT = "/vol/web/media" From e5eab79e5845dca9265131219d43afc058e3ecce Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Tue, 10 Mar 2026 16:48:47 -0700 Subject: [PATCH 5/9] test commit --- TEKDB/TEKDB/wsgi.py | 1 + 1 file changed, 1 insertion(+) diff --git a/TEKDB/TEKDB/wsgi.py b/TEKDB/TEKDB/wsgi.py index f7aa360d..54463160 100644 --- a/TEKDB/TEKDB/wsgi.py +++ b/TEKDB/TEKDB/wsgi.py @@ -15,4 +15,5 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TEKDB.settings") application = get_wsgi_application() +print("test") # application = DjangoWhiteNoise(application) From ea62d24730fe84cab9f2166aa21fae36f61519f8 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Tue, 10 Mar 2026 16:50:11 -0700 Subject: [PATCH 6/9] another test --- TEKDB/TEKDB/wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TEKDB/TEKDB/wsgi.py b/TEKDB/TEKDB/wsgi.py index 54463160..e433de46 100644 --- a/TEKDB/TEKDB/wsgi.py +++ b/TEKDB/TEKDB/wsgi.py @@ -15,5 +15,5 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TEKDB.settings") application = get_wsgi_application() -print("test") +print('test') # application = DjangoWhiteNoise(application) From 2d239fe194018dd8a5588ce3f46795f482d77959 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Tue, 10 Mar 2026 16:57:12 -0700 Subject: [PATCH 7/9] try again --- .pre-commit-config.yaml | 3 ++- TEKDB/TEKDB/wsgi.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f13fa14..961ddd2d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,7 @@ repos: - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.14.4 + rev: v0.15.5 hooks: - id: ruff-check + # Run the formatter. - id: ruff-format \ No newline at end of file diff --git a/TEKDB/TEKDB/wsgi.py b/TEKDB/TEKDB/wsgi.py index e433de46..1301d8d8 100644 --- a/TEKDB/TEKDB/wsgi.py +++ b/TEKDB/TEKDB/wsgi.py @@ -15,5 +15,5 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TEKDB.settings") application = get_wsgi_application() -print('test') +print('test again') # application = DjangoWhiteNoise(application) From 9d10da773519bf535d06d638c96551b021aa21a2 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Tue, 10 Mar 2026 17:00:22 -0700 Subject: [PATCH 8/9] test again again --- .pre-commit-config.yaml | 1 + TEKDB/TEKDB/wsgi.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 961ddd2d..16540c45 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,5 +3,6 @@ repos: rev: v0.15.5 hooks: - id: ruff-check + args: [ --fix ] # Run the formatter. - id: ruff-format \ No newline at end of file diff --git a/TEKDB/TEKDB/wsgi.py b/TEKDB/TEKDB/wsgi.py index 1301d8d8..77d9310f 100644 --- a/TEKDB/TEKDB/wsgi.py +++ b/TEKDB/TEKDB/wsgi.py @@ -15,5 +15,5 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TEKDB.settings") application = get_wsgi_application() -print('test again') +print("test again again") # application = DjangoWhiteNoise(application) From a890d527ce4f694853fe6223747f4ddde7e47025 Mon Sep 17 00:00:00 2001 From: Paige Williams Date: Tue, 10 Mar 2026 17:01:59 -0700 Subject: [PATCH 9/9] remove test print statement --- TEKDB/TEKDB/wsgi.py | 1 - 1 file changed, 1 deletion(-) diff --git a/TEKDB/TEKDB/wsgi.py b/TEKDB/TEKDB/wsgi.py index 77d9310f..f7aa360d 100644 --- a/TEKDB/TEKDB/wsgi.py +++ b/TEKDB/TEKDB/wsgi.py @@ -15,5 +15,4 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "TEKDB.settings") application = get_wsgi_application() -print("test again again") # application = DjangoWhiteNoise(application)