diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 394da8393e..368a5110aa 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 + rev: v5.0.0 hooks: - id: trailing-whitespace name: trim trailing whitespace @@ -65,7 +65,7 @@ repos: # Versioning: Commit messages & changelog - repo: https://github.com/commitizen-tools/commitizen - rev: v3.29.0 + rev: v4.6.1 hooks: - id: commitizen stages: [commit-msg] @@ -106,14 +106,14 @@ repos: # ] - repo: https://github.com/psf/black - rev: 23.12.1 + rev: 25.1.0 hooks: - id: black language_version: python3.10 - repo: https://github.com/PyCQA/flake8 - rev: "7.1.2" + rev: "7.2.0" hooks: - id: flake8 name: flake8 diff --git a/backend/api/tasks/actions.py b/backend/api/tasks/actions.py index c60c5438e7..ae9c5856b5 100644 --- a/backend/api/tasks/actions.py +++ b/backend/api/tasks/actions.py @@ -1143,10 +1143,10 @@ async def extend_duration( async def reset_by_user( request: Request, project_id: int, - username: str - | None = Query(None, description="Username to revert tasks for", example="test"), - action: str - | None = Query( + username: str | None = Query( + None, description="Username to revert tasks for", example="test" + ), + action: str | None = Query( None, description="Action to revert tasks for. Can be BADIMAGERY or VALIDATED", example="BADIMAGERY", diff --git a/backend/services/mapping_service.py b/backend/services/mapping_service.py index 1f7b660989..c0ad17a914 100644 --- a/backend/services/mapping_service.py +++ b/backend/services/mapping_service.py @@ -323,9 +323,9 @@ async def generate_gpx( # Create trk element trk = ET.Element("trk") root.append(trk) - ET.SubElement( - trk, "name" - ).text = f"Task for project {project_id}. Do not edit outside of this area!" + ET.SubElement(trk, "name").text = ( + f"Task for project {project_id}. Do not edit outside of this area!" + ) # Construct trkseg elements if task_ids_str is not None: diff --git a/migrations/versions/05e1ecf9953a_.py b/migrations/versions/05e1ecf9953a_.py index 119c13ec02..5699b1555b 100644 --- a/migrations/versions/05e1ecf9953a_.py +++ b/migrations/versions/05e1ecf9953a_.py @@ -5,6 +5,7 @@ Create Date: 2018-12-04 19:53:41.477085 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/05f1b650ddbc_.py b/migrations/versions/05f1b650ddbc_.py index 548fb80113..5c0ab9fb13 100644 --- a/migrations/versions/05f1b650ddbc_.py +++ b/migrations/versions/05f1b650ddbc_.py @@ -5,6 +5,7 @@ Create Date: 2022-08-17 15:58:37.118728 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/068674f06b0f_.py b/migrations/versions/068674f06b0f_.py index d31c569d41..f39b442186 100644 --- a/migrations/versions/068674f06b0f_.py +++ b/migrations/versions/068674f06b0f_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-02 08:45:00.553060 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/0a6b82b55983_.py b/migrations/versions/0a6b82b55983_.py index 2ebb218d2b..167127c2b1 100644 --- a/migrations/versions/0a6b82b55983_.py +++ b/migrations/versions/0a6b82b55983_.py @@ -5,6 +5,7 @@ Create Date: 2018-09-04 19:09:45.866336 """ + import re import sqlalchemy as sa diff --git a/migrations/versions/0aaac86a48dc_.py b/migrations/versions/0aaac86a48dc_.py index 129b093e72..7b2ec3ab62 100644 --- a/migrations/versions/0aaac86a48dc_.py +++ b/migrations/versions/0aaac86a48dc_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-01 14:04:16.188885 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/0d47c10c8a66_.py b/migrations/versions/0d47c10c8a66_.py index e54b517f8c..19bfae3411 100644 --- a/migrations/versions/0d47c10c8a66_.py +++ b/migrations/versions/0d47c10c8a66_.py @@ -5,6 +5,7 @@ Create Date: 2019-01-13 20:51:12.809062 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/0eeaa5aed53b_.py b/migrations/versions/0eeaa5aed53b_.py index 9c7c370070..b708b5ed19 100644 --- a/migrations/versions/0eeaa5aed53b_.py +++ b/migrations/versions/0eeaa5aed53b_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-26 17:31:17.238355 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/0eee8c1abd3a_.py b/migrations/versions/0eee8c1abd3a_.py index d3e9c0f090..2d825ede21 100644 --- a/migrations/versions/0eee8c1abd3a_.py +++ b/migrations/versions/0eee8c1abd3a_.py @@ -5,6 +5,7 @@ Create Date: 2019-05-24 23:05:45.512395 """ + import json import sys diff --git a/migrations/versions/14340f1e0d6b_.py b/migrations/versions/14340f1e0d6b_.py index dd528a3934..971663addf 100644 --- a/migrations/versions/14340f1e0d6b_.py +++ b/migrations/versions/14340f1e0d6b_.py @@ -5,6 +5,7 @@ Create Date: 2020-03-13 10:35:57.594664 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/14842761654b_.py b/migrations/versions/14842761654b_.py index 05079ad9e3..52537fe353 100644 --- a/migrations/versions/14842761654b_.py +++ b/migrations/versions/14842761654b_.py @@ -5,6 +5,7 @@ Create Date: 2020-11-11 07:18:58.675778 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/1579d24928e7_.py b/migrations/versions/1579d24928e7_.py index e8d7418add..1965391172 100644 --- a/migrations/versions/1579d24928e7_.py +++ b/migrations/versions/1579d24928e7_.py @@ -5,6 +5,7 @@ Create Date: 2020-05-29 09:55:16.565573 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/22e7d7e0fa02_.py b/migrations/versions/22e7d7e0fa02_.py index a6fcc2fade..f05007a0a7 100644 --- a/migrations/versions/22e7d7e0fa02_.py +++ b/migrations/versions/22e7d7e0fa02_.py @@ -5,6 +5,7 @@ Create Date: 2018-08-06 15:31:03.973448 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/22e9a0e9b254_.py b/migrations/versions/22e9a0e9b254_.py index 7b03c6aafa..8e0974cb56 100644 --- a/migrations/versions/22e9a0e9b254_.py +++ b/migrations/versions/22e9a0e9b254_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-21 04:20:16.572298 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/251a7638da78_.py b/migrations/versions/251a7638da78_.py index d920bb27db..59661babf8 100644 --- a/migrations/versions/251a7638da78_.py +++ b/migrations/versions/251a7638da78_.py @@ -5,6 +5,7 @@ Create Date: 2018-08-30 07:46:49.074078 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/29097876c7e6_.py b/migrations/versions/29097876c7e6_.py index b08064bafc..0fe380e646 100644 --- a/migrations/versions/29097876c7e6_.py +++ b/migrations/versions/29097876c7e6_.py @@ -5,6 +5,7 @@ Create Date: 2019-12-04 11:21:42.622908 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/2cfa981c70e7_.py b/migrations/versions/2cfa981c70e7_.py index 48d2d1307e..817c47b8c1 100644 --- a/migrations/versions/2cfa981c70e7_.py +++ b/migrations/versions/2cfa981c70e7_.py @@ -5,6 +5,7 @@ Create Date: 2020-07-16 10:30:59.885956 """ + import geoalchemy2 from alembic import op diff --git a/migrations/versions/2d6a7ad4e1eb_.py b/migrations/versions/2d6a7ad4e1eb_.py index d0884c4e74..24ff3d3186 100644 --- a/migrations/versions/2d6a7ad4e1eb_.py +++ b/migrations/versions/2d6a7ad4e1eb_.py @@ -5,6 +5,7 @@ Create Date: 2020-03-23 12:10:20.120500 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/2ee4bca188a9_.py b/migrations/versions/2ee4bca188a9_.py index af4f145d64..c0a1cd46b2 100644 --- a/migrations/versions/2ee4bca188a9_.py +++ b/migrations/versions/2ee4bca188a9_.py @@ -5,6 +5,7 @@ Create Date: 2021-03-12 09:42:54.198713 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/30b091260689_.py b/migrations/versions/30b091260689_.py index bb65dfa3fb..cd31d8dfcc 100644 --- a/migrations/versions/30b091260689_.py +++ b/migrations/versions/30b091260689_.py @@ -5,6 +5,7 @@ Create Date: 2018-07-30 12:52:52.845202 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/3b8b0956b217_.py b/migrations/versions/3b8b0956b217_.py index ebec6aa445..12828d5bda 100644 --- a/migrations/versions/3b8b0956b217_.py +++ b/migrations/versions/3b8b0956b217_.py @@ -5,6 +5,7 @@ Create Date: 2022-07-27 10:30:55.193989 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/3ee58dee57c9_.py b/migrations/versions/3ee58dee57c9_.py index 65002bbda4..c1b086e68a 100644 --- a/migrations/versions/3ee58dee57c9_.py +++ b/migrations/versions/3ee58dee57c9_.py @@ -5,6 +5,7 @@ Create Date: 2018-08-24 13:55:32.308278 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/42c45e74752b_.py b/migrations/versions/42c45e74752b_.py index b86311dc8b..c9190e7d1d 100644 --- a/migrations/versions/42c45e74752b_.py +++ b/migrations/versions/42c45e74752b_.py @@ -5,6 +5,7 @@ Create Date: 2023-03-29 09:07:55.771834 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/451f6bd05a19_.py b/migrations/versions/451f6bd05a19_.py index e2996e2d29..8c7f0d66ee 100644 --- a/migrations/versions/451f6bd05a19_.py +++ b/migrations/versions/451f6bd05a19_.py @@ -5,6 +5,7 @@ Create Date: 2019-07-02 17:03:55.567940 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/48c3aed123cf_.py b/migrations/versions/48c3aed123cf_.py index 9ec91d84b6..2ffe1cc89a 100644 --- a/migrations/versions/48c3aed123cf_.py +++ b/migrations/versions/48c3aed123cf_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-01 12:09:36.887823 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/4b9fb4d3f349_.py b/migrations/versions/4b9fb4d3f349_.py index 99863c0d64..e40fb24df1 100644 --- a/migrations/versions/4b9fb4d3f349_.py +++ b/migrations/versions/4b9fb4d3f349_.py @@ -5,6 +5,7 @@ Create Date: 2019-07-19 13:38:08.010157 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql diff --git a/migrations/versions/4ed992117718_.py b/migrations/versions/4ed992117718_.py index 1970cc1ffd..c62deb4954 100644 --- a/migrations/versions/4ed992117718_.py +++ b/migrations/versions/4ed992117718_.py @@ -5,6 +5,7 @@ Create Date: 2022-09-20 13:11:54.721669 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/51ccc46f1b8a_.py b/migrations/versions/51ccc46f1b8a_.py index 24194f046b..1148d3e84e 100644 --- a/migrations/versions/51ccc46f1b8a_.py +++ b/migrations/versions/51ccc46f1b8a_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-16 19:30:51.064696 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/55790eeec3bf_.py b/migrations/versions/55790eeec3bf_.py index 8235cd57c4..974531757f 100644 --- a/migrations/versions/55790eeec3bf_.py +++ b/migrations/versions/55790eeec3bf_.py @@ -5,6 +5,7 @@ Create Date: 2020-05-12 18:43:37.666725 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql diff --git a/migrations/versions/567b75e74955_.py b/migrations/versions/567b75e74955_.py index 312197d795..63a901916e 100644 --- a/migrations/versions/567b75e74955_.py +++ b/migrations/versions/567b75e74955_.py @@ -5,6 +5,7 @@ Create Date: 2017-06-02 17:18:52.374843 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/5952780a577e_.py b/migrations/versions/5952780a577e_.py index f0d89a4423..94ea305fb3 100644 --- a/migrations/versions/5952780a577e_.py +++ b/migrations/versions/5952780a577e_.py @@ -5,6 +5,7 @@ Create Date: 2020-06-11 16:58:45.700192 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/5eba4824505e_.py b/migrations/versions/5eba4824505e_.py index a28ac0b049..0df747709c 100644 --- a/migrations/versions/5eba4824505e_.py +++ b/migrations/versions/5eba4824505e_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-22 14:17:35.925047 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/64b682d53e23_.py b/migrations/versions/64b682d53e23_.py index f21c8ca910..d4ca62db30 100644 --- a/migrations/versions/64b682d53e23_.py +++ b/migrations/versions/64b682d53e23_.py @@ -5,6 +5,7 @@ Create Date: 2017-06-06 16:53:47.604019 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/6612e4d6524c_.py b/migrations/versions/6612e4d6524c_.py index 1cdb89d215..b3f9119972 100644 --- a/migrations/versions/6612e4d6524c_.py +++ b/migrations/versions/6612e4d6524c_.py @@ -5,6 +5,7 @@ Create Date: 2019-08-19 21:40:06.669352 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/7435b0a865e6_.py b/migrations/versions/7435b0a865e6_.py index c653f1cbd6..c3192d40c1 100644 --- a/migrations/versions/7435b0a865e6_.py +++ b/migrations/versions/7435b0a865e6_.py @@ -5,6 +5,7 @@ Create Date: 2019-08-20 08:54:12.215666 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/772aff899389_.py b/migrations/versions/772aff899389_.py index 12bfeebf8e..dcb369c559 100644 --- a/migrations/versions/772aff899389_.py +++ b/migrations/versions/772aff899389_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-08 19:09:46.152809 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/7937dae319b5_.py b/migrations/versions/7937dae319b5_.py index 7d60754403..60f5ad88d5 100644 --- a/migrations/versions/7937dae319b5_.py +++ b/migrations/versions/7937dae319b5_.py @@ -1,10 +1,11 @@ -""" Ensure Project's country names are in English +"""Ensure Project's country names are in English Revision ID: 7937dae319b5 Revises: 14842761654b Create Date: 2020-09-21 17:17:10.542429 """ + import requests import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/7991a7e1b88d_.py b/migrations/versions/7991a7e1b88d_.py index 10742deca6..5e01852cd0 100644 --- a/migrations/versions/7991a7e1b88d_.py +++ b/migrations/versions/7991a7e1b88d_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-30 17:19:55.061108 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/7bbc01082457_.py b/migrations/versions/7bbc01082457_.py index 6439b2393f..4ecad17e29 100644 --- a/migrations/versions/7bbc01082457_.py +++ b/migrations/versions/7bbc01082457_.py @@ -5,6 +5,7 @@ Create Date: 2020-01-29 11:19:20.113089 """ + import sys import sqlalchemy as sa diff --git a/migrations/versions/7d55a089b5bc_.py b/migrations/versions/7d55a089b5bc_.py index 9c9dcb0e08..90da83c70b 100644 --- a/migrations/versions/7d55a089b5bc_.py +++ b/migrations/versions/7d55a089b5bc_.py @@ -5,6 +5,7 @@ Create Date: 2017-06-26 17:22:12.828934 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/824268a7a675_.py b/migrations/versions/824268a7a675_.py index 0774d0243f..20b3d84766 100644 --- a/migrations/versions/824268a7a675_.py +++ b/migrations/versions/824268a7a675_.py @@ -5,6 +5,7 @@ Create Date: 2018-12-07 12:54:19.964101 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/83eb4cbb0abd_.py b/migrations/versions/83eb4cbb0abd_.py index bc2d87b42f..5ab191ffa2 100644 --- a/migrations/versions/83eb4cbb0abd_.py +++ b/migrations/versions/83eb4cbb0abd_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-07 09:30:29.175751 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/84c793a951b2_.py b/migrations/versions/84c793a951b2_.py index 6d5e9d063a..2133c8fcff 100644 --- a/migrations/versions/84c793a951b2_.py +++ b/migrations/versions/84c793a951b2_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-12 20:04:46.065237 """ + from datetime import datetime import sqlalchemy as sa diff --git a/migrations/versions/86c0f6b6a176_.py b/migrations/versions/86c0f6b6a176_.py index 71fc4d0ce3..e0d11ebdad 100644 --- a/migrations/versions/86c0f6b6a176_.py +++ b/migrations/versions/86c0f6b6a176_.py @@ -1,10 +1,11 @@ -""" add type field to organisation model +"""add type field to organisation model Revision ID: 86c0f6b6a176 Revises: 7937dae319b5 Create Date: 2021-02-09 03:29:03.763016 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/8a6419f289aa_.py b/migrations/versions/8a6419f289aa_.py index fbfa681b3a..420c727bf7 100644 --- a/migrations/versions/8a6419f289aa_.py +++ b/migrations/versions/8a6419f289aa_.py @@ -5,6 +5,7 @@ Create Date: 2021-06-23 17:11:22.666814 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/8aa8f8d6a0c3_.py b/migrations/versions/8aa8f8d6a0c3_.py index 13ac983f5e..84cdebb06a 100644 --- a/migrations/versions/8aa8f8d6a0c3_.py +++ b/migrations/versions/8aa8f8d6a0c3_.py @@ -5,6 +5,7 @@ Create Date: 2017-04-24 10:24:46.888136 """ + import geoalchemy2 import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/8b61ac59bc57_.py b/migrations/versions/8b61ac59bc57_.py index 412cfeb9e6..a1597ab591 100644 --- a/migrations/versions/8b61ac59bc57_.py +++ b/migrations/versions/8b61ac59bc57_.py @@ -5,6 +5,7 @@ Create Date: 2022-06-27 09:00:04.602260 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/8e5144b55919_.py b/migrations/versions/8e5144b55919_.py index 212014a062..39d4aa5543 100644 --- a/migrations/versions/8e5144b55919_.py +++ b/migrations/versions/8e5144b55919_.py @@ -4,6 +4,7 @@ Create Date: 2024-11-22 10:25:38.551015 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/8f51fb7f4e40_.py b/migrations/versions/8f51fb7f4e40_.py index 00c7e61adf..7767febe30 100644 --- a/migrations/versions/8f51fb7f4e40_.py +++ b/migrations/versions/8f51fb7f4e40_.py @@ -5,6 +5,7 @@ Create Date: 2019-05-01 16:09:21.471928 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/924a63857df4_.py b/migrations/versions/924a63857df4_.py index 22c5accda9..6546f45972 100644 --- a/migrations/versions/924a63857df4_.py +++ b/migrations/versions/924a63857df4_.py @@ -5,6 +5,7 @@ Create Date: 2022-04-28 13:32:15.595148 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/9712d29e24c8_.py b/migrations/versions/9712d29e24c8_.py index 54d7f6701b..a2f80ad62d 100644 --- a/migrations/versions/9712d29e24c8_.py +++ b/migrations/versions/9712d29e24c8_.py @@ -5,6 +5,7 @@ Create Date: 2020-07-28 21:13:50.314323 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/9f5b73af01db_.py b/migrations/versions/9f5b73af01db_.py index 917dc5e881..1b8c84ff0d 100644 --- a/migrations/versions/9f5b73af01db_.py +++ b/migrations/versions/9f5b73af01db_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-18 16:25:08.317568 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql diff --git a/migrations/versions/a43b9748ceee_.py b/migrations/versions/a43b9748ceee_.py index c8a84b78dc..86b0b6c118 100644 --- a/migrations/versions/a43b9748ceee_.py +++ b/migrations/versions/a43b9748ceee_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-12 12:50:15.809839 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/a60315eb2654_.py b/migrations/versions/a60315eb2654_.py index 72336d5977..bce67c2986 100644 --- a/migrations/versions/a60315eb2654_.py +++ b/migrations/versions/a60315eb2654_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-07 17:30:36.504327 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/a7c617755721_.py b/migrations/versions/a7c617755721_.py index c7f67b9193..a7016d6748 100644 --- a/migrations/versions/a7c617755721_.py +++ b/migrations/versions/a7c617755721_.py @@ -5,6 +5,7 @@ Create Date: 2017-04-26 11:22:15.384545 """ + import sqlalchemy as sa from alembic import op from sqlalchemy import text diff --git a/migrations/versions/a8a7537985c0_.py b/migrations/versions/a8a7537985c0_.py index 0f86bfb58f..bb33119a35 100644 --- a/migrations/versions/a8a7537985c0_.py +++ b/migrations/versions/a8a7537985c0_.py @@ -5,6 +5,7 @@ Create Date: 2019-05-09 15:45:43.492558 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/a9cbd2c6c213_.py b/migrations/versions/a9cbd2c6c213_.py index 083d295160..c40ca5284c 100644 --- a/migrations/versions/a9cbd2c6c213_.py +++ b/migrations/versions/a9cbd2c6c213_.py @@ -5,6 +5,7 @@ Create Date: 2022-11-04 09:18:31.672823 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/ac55902fcc3d_.py b/migrations/versions/ac55902fcc3d_.py index 1f80334277..26100ce280 100644 --- a/migrations/versions/ac55902fcc3d_.py +++ b/migrations/versions/ac55902fcc3d_.py @@ -5,6 +5,7 @@ Create Date: 2018-02-25 17:42:29.388863 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/b25f088d40c2_.py b/migrations/versions/b25f088d40c2_.py index ca77968e64..cbb2bd5f8f 100644 --- a/migrations/versions/b25f088d40c2_.py +++ b/migrations/versions/b25f088d40c2_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-11 12:31:41.697842 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/b5b8370f9262_.py b/migrations/versions/b5b8370f9262_.py index f28588b12e..79645b0e7f 100644 --- a/migrations/versions/b5b8370f9262_.py +++ b/migrations/versions/b5b8370f9262_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-04 12:08:56.957349 """ + import geoalchemy2 import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/ba778ef9c615_.py b/migrations/versions/ba778ef9c615_.py index d2ac9bfe33..ead87c93a8 100644 --- a/migrations/versions/ba778ef9c615_.py +++ b/migrations/versions/ba778ef9c615_.py @@ -5,6 +5,7 @@ Create Date: 2020-08-25 09:11:37.897176 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/badf8bb7d56b_.py b/migrations/versions/badf8bb7d56b_.py index d648ef6939..a0b86caaf9 100644 --- a/migrations/versions/badf8bb7d56b_.py +++ b/migrations/versions/badf8bb7d56b_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-04 09:25:44.871107 """ + from alembic import op from sqlalchemy.dialects import postgresql diff --git a/migrations/versions/bcb474128817_.py b/migrations/versions/bcb474128817_.py index 809fafc0d0..1bf43f945c 100644 --- a/migrations/versions/bcb474128817_.py +++ b/migrations/versions/bcb474128817_.py @@ -5,6 +5,7 @@ Create Date: 2022-07-03 10:46:56.075805 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/bcdb7875bd1c_.py b/migrations/versions/bcdb7875bd1c_.py index 7f802365d1..fca96f571d 100644 --- a/migrations/versions/bcdb7875bd1c_.py +++ b/migrations/versions/bcdb7875bd1c_.py @@ -5,6 +5,7 @@ Create Date: 2022-11-10 10:52:49.869498 """ + from alembic import op # revision identifiers, used by Alembic. diff --git a/migrations/versions/bfcf4182dcb5_.py b/migrations/versions/bfcf4182dcb5_.py index 627bb3c065..4ffb62beeb 100644 --- a/migrations/versions/bfcf4182dcb5_.py +++ b/migrations/versions/bfcf4182dcb5_.py @@ -5,6 +5,7 @@ Create Date: 2021-03-01 09:52:03.376234 """ + import sqlalchemy as sa from alembic import op from slugify import slugify diff --git a/migrations/versions/c40e1fdf6b70_.py b/migrations/versions/c40e1fdf6b70_.py index 0405704c85..445bc28dd2 100644 --- a/migrations/versions/c40e1fdf6b70_.py +++ b/migrations/versions/c40e1fdf6b70_.py @@ -5,6 +5,7 @@ Create Date: 2020-02-04 22:23:22.457001 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/c4670f3bb828_.py b/migrations/versions/c4670f3bb828_.py index c0697ca6eb..6ee1fc0acc 100644 --- a/migrations/versions/c4670f3bb828_.py +++ b/migrations/versions/c4670f3bb828_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-03 13:59:37.296261 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/d2e18f0f34a9_.py b/migrations/versions/d2e18f0f34a9_.py index 5d41ea3371..edb8b8ba18 100644 --- a/migrations/versions/d2e18f0f34a9_.py +++ b/migrations/versions/d2e18f0f34a9_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-09 14:07:45.528774 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/d77ee40254f1_.py b/migrations/versions/d77ee40254f1_.py index 547c13cdf0..361bf5cd98 100644 --- a/migrations/versions/d77ee40254f1_.py +++ b/migrations/versions/d77ee40254f1_.py @@ -5,6 +5,7 @@ Create Date: 2019-04-25 13:36:02.793208 """ + import sqlalchemy as sa from alembic import op from sqlalchemy.dialects import postgresql diff --git a/migrations/versions/dc250d726600_.py b/migrations/versions/dc250d726600_.py index 133f26038b..515bb84392 100644 --- a/migrations/versions/dc250d726600_.py +++ b/migrations/versions/dc250d726600_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-29 10:14:06.958352 """ + import geoalchemy2 import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/deec8123583d_.py b/migrations/versions/deec8123583d_.py index 0aec89d7a7..b901faf178 100644 --- a/migrations/versions/deec8123583d_.py +++ b/migrations/versions/deec8123583d_.py @@ -5,6 +5,7 @@ Create Date: 2018-08-07 23:09:58.621826 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/e0741bdfde1d_.py b/migrations/versions/e0741bdfde1d_.py index 8ad097c63f..c6cbdb7e2e 100644 --- a/migrations/versions/e0741bdfde1d_.py +++ b/migrations/versions/e0741bdfde1d_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-29 14:22:30.597232 """ + import geoalchemy2 import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/e3282e2db2d7_.py b/migrations/versions/e3282e2db2d7_.py index f16ee1dfe8..c597e115d0 100644 --- a/migrations/versions/e3282e2db2d7_.py +++ b/migrations/versions/e3282e2db2d7_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-17 18:34:11.058440 """ + import sqlalchemy as sa from alembic import op @@ -25,7 +26,7 @@ def upgrade(): sa.Column("name", sa.String(length=512), nullable=False), sa.Column("logo", sa.String(), nullable=True), sa.Column("url", sa.String(), nullable=True), - sa.PrimaryKeyConstraint("id") + sa.PrimaryKeyConstraint("id"), # , # sa.UniqueConstraint("name"), ) diff --git a/migrations/versions/e36f1d0c4947_.py b/migrations/versions/e36f1d0c4947_.py index 92358a2108..7e10c7f67c 100644 --- a/migrations/versions/e36f1d0c4947_.py +++ b/migrations/versions/e36f1d0c4947_.py @@ -5,6 +5,7 @@ Create Date: 2019-06-14 11:20:15.129237 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/e8ffa33a9c18_.py b/migrations/versions/e8ffa33a9c18_.py index 4427c3a129..adf0e6c033 100644 --- a/migrations/versions/e8ffa33a9c18_.py +++ b/migrations/versions/e8ffa33a9c18_.py @@ -5,6 +5,7 @@ Create Date: 2024-06-07 20:20:49.591011 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/ecb6985693c0_.py b/migrations/versions/ecb6985693c0_.py index 3f854af465..514a34205a 100644 --- a/migrations/versions/ecb6985693c0_.py +++ b/migrations/versions/ecb6985693c0_.py @@ -1,4 +1,4 @@ -""" Add mapswipe group ID to partners table +"""Add mapswipe group ID to partners table Revision ID: ecb6985693c0_ Revises: 749a9ae35ce5 diff --git a/migrations/versions/ee46f5e8723b_.py b/migrations/versions/ee46f5e8723b_.py index 41b4862665..925de4e321 100644 --- a/migrations/versions/ee46f5e8723b_.py +++ b/migrations/versions/ee46f5e8723b_.py @@ -5,6 +5,7 @@ Create Date: 2019-07-14 16:27:37.368109 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/ee5315dcf3e1_.py b/migrations/versions/ee5315dcf3e1_.py index 33332f7cb0..8ef0b86e66 100644 --- a/migrations/versions/ee5315dcf3e1_.py +++ b/migrations/versions/ee5315dcf3e1_.py @@ -5,6 +5,7 @@ Create Date: 2017-05-24 10:39:46.586986 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/f26a7c36eb65_.py b/migrations/versions/f26a7c36eb65_.py index 93cc8b8123..924c22f32e 100644 --- a/migrations/versions/f26a7c36eb65_.py +++ b/migrations/versions/f26a7c36eb65_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-28 04:44:32.764819 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/f547382df31b_.py b/migrations/versions/f547382df31b_.py index b20ad08ffd..4c71f8dba8 100644 --- a/migrations/versions/f547382df31b_.py +++ b/migrations/versions/f547382df31b_.py @@ -5,6 +5,7 @@ Create Date: 2019-10-07 07:06:12.394963 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/f86698c827cc_.py b/migrations/versions/f86698c827cc_.py index 6b524548d2..d13ca50106 100644 --- a/migrations/versions/f86698c827cc_.py +++ b/migrations/versions/f86698c827cc_.py @@ -5,6 +5,7 @@ Create Date: 2019-11-06 11:46:48.616033 """ + import sqlalchemy as sa from alembic import op diff --git a/migrations/versions/fcd9cebaa79c_.py b/migrations/versions/fcd9cebaa79c_.py index 90703d5e56..99d6778a15 100644 --- a/migrations/versions/fcd9cebaa79c_.py +++ b/migrations/versions/fcd9cebaa79c_.py @@ -5,6 +5,7 @@ Create Date: 2019-05-07 11:06:50.293370 """ + import sqlalchemy as sa from alembic import op diff --git a/tests/backend/unit/services/test_project_service.py b/tests/backend/unit/services/test_project_service.py index ba1600dc2f..b704537987 100644 --- a/tests/backend/unit/services/test_project_service.py +++ b/tests/backend/unit/services/test_project_service.py @@ -23,9 +23,9 @@ class TestProjectService(BaseTestCase): def setUp(self): super().setUp() - current_app.config[ - "SEND_PROJECT_EMAIL_UPDATES" - ] = True # Set to true to test email sending + current_app.config["SEND_PROJECT_EMAIL_UPDATES"] = ( + True # Set to true to test email sending + ) @patch.object(Project, "get") def test_project_service_raises_error_if_project_not_found(self, mock_project): @@ -273,7 +273,7 @@ def test_send_email_on_project_progress_doesnt_send_email_if_send_project_update # Act ProjectService.send_email_on_project_progress(1) # Assert - current_app.config[ - "SEND_PROJECT_EMAIL_UPDATES" - ] = True # Set to true for other tests + current_app.config["SEND_PROJECT_EMAIL_UPDATES"] = ( + True # Set to true for other tests + ) self.assertFalse(mock_send_email.called)