Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #1075

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
repos:
# Versioning: Commit messages & changelog
- repo: https://github.com/commitizen-tools/commitizen
rev: v3.13.0
rev: v3.27.0
hooks:
- id: commitizen
stages: [commit-msg]

# Lint / autoformat: Python code
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: "v0.1.13"
rev: "v0.4.5"
hooks:
# Run the linter
- id: ruff
Expand All @@ -28,15 +28,15 @@ repos:

# Spelling: Checks for common misspellings in text files.
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
types: [text]
args: [--toml, src/backend/pyproject.toml]

# Autoformat: YAML, JSON, Markdown, etc.
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
rev: v4.0.0-alpha.8
hooks:
- id: prettier
entry: env PRETTIER_LEGACY_CLI=1 prettier
Expand Down Expand Up @@ -66,7 +66,7 @@ repos:

# Lint & Autoformat: SQL
- repo: https://github.com/sqlfluff/sqlfluff
rev: 3.0.6
rev: 3.0.7
hooks:
- id: sqlfluff-lint
files: ^src/backend/migrations/(?:.*/)*.*$
Expand All @@ -84,15 +84,15 @@ repos:

# Lint: Shell scripts
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.6
rev: v0.10.0.1
hooks:
- id: shellcheck
files: ^(?!.*(?:^|/)contrib(?:/|$)).*$
args: ["-x", "--exclude=SC2317,SC2188,SC2143"]

# Lint: Markdown
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.38.0
rev: v0.41.0
hooks:
- id: markdownlint
args:
Expand Down
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
- add community_type for organisations, add unapproved org list endpoint (#1197)
- osm-rawdata for generating data extracts (#1183)
- create / edit organization form (#1178)
- **frontend**: default organisation credentials during proj create (#1174)
- **frontend**: default organisation credentials during proj create (#1174)
- task history end point with associated user (#1071)
- manage / edit project UI (#1154)
- mapper role (#1163)
Expand Down Expand Up @@ -422,7 +422,7 @@
- added alchemy text on centroid api
- map Component added to main
- add script to generate openapi.json
- Added a new function to perform the conversion of task_boundary from GeoJSON to .osm format.
- Added a new function to perform the conversion of task_boundary from GeoJSON to .osm format.
- download button for data extract on project details fix Add option to download the data extract fix #779
- api for download data extract
- added download data extract loading
Expand All @@ -431,7 +431,7 @@
- use loguru stdout + json file logging
- form validation added on custom form
- added organisation_id on create project frontend
- organisation Id on create project api
- organisation Id on create project api
- added api to centroid logo
- added projectId on projectbyid
- Tailwindcss integrated
Expand Down Expand Up @@ -621,7 +621,7 @@
- minimum 5 of splitting algorithm
- Project name should accept other characters too. #754
- organization_id none case handled
- task splitted is not shown in map, although the number of tasks are determined and generated #750
- task splitted is not shown in map, although the number of tasks are determined and generated #750
- previous button wrong route issue
- project_id added in the tile_instance
- set tile_path_instance outside try, ref before assign
Expand Down Expand Up @@ -662,7 +662,7 @@
- pwa fixes for icon
- merge conflicts
- data Cleaning fix
- removed api listing static content
- removed api listing static content
- projects can be filter based on user_id and hashtags present in the project
- filtering by hashtags check if project hashtags overlap with requested hashtags
- task spliting for geojson with polygons instead of features
Expand Down Expand Up @@ -723,7 +723,7 @@
- osm-fieldwork import
- osm-fieldwork imports
- Fixes Create Project Section : The input file name has design issues. #452
- Create Project Section - Upload Area subsection : Alignment of the map elements need to be maintained. #451
- Create Project Section - Upload Area subsection : Alignment of the map elements need to be maintained. #451
- handle click outside issue
- organization post
- adjusted map page of home
Expand Down Expand Up @@ -836,7 +836,7 @@
- move app backend server files to app dir
- move backend code out of app dir for rebase
- add additional logging to odkcentral connection
- update __version__.py path in pyproject.toml
- update **version**.py path in pyproject.toml
- remove FMTM_TEST_DB_NAME, DB_URL --> FMTM_DB_URL
- ignore osm-fieldwork local dir
- remove tests dir in root (under src dirs)
Expand Down
4 changes: 2 additions & 2 deletions chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ description: Field Mapping Tasking Manager - coordinated field mapping.
version: "0.1.0"
appVersion: "2024.3.0"
maintainers:
- email: [email protected]
name: Sam Woodcock
- email: [email protected]
name: Sam Woodcock
home: https://github.com/hotosm/fmtm/tree/main/chart
icon: https://fmtm.hotosm.org/favicon.ico
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion chart/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Requires secrets to be pre-populated inside the correct namespace:

```bash
kubectl create namespace fmtm
kubectl
kubectl
```

- **db-fmtm-vars** for postgres database
Expand Down
12 changes: 5 additions & 7 deletions chart/templates/service.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
apiVersion: v1
kind: Service
metadata:
name: {{ include "fmtm.fullname" . }}
labels:
{{- include "fmtm.labels" . | nindent 4 }}
name: { { include "fmtm.fullname" . } }
labels: { { - include "fmtm.labels" . | nindent 4 } }
spec:
type: {{ .Values.backend.service.type }}
type: { { .Values.backend.service.type } }
ports:
- port: {{ .Values.backend.service.port }}
- port: { { .Values.backend.service.port } }
targetPort: http
protocol: TCP
name: http
selector:
{{- include "fmtm.selectorLabels" . | nindent 4 }}
selector: { { - include "fmtm.selectorLabels" . | nindent 4 } }
6 changes: 4 additions & 2 deletions chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ backend:
# hosts:
# - chart-example.local

resources: {}
resources:
{}
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
Expand Down Expand Up @@ -159,7 +160,8 @@ serviceAccount:
podAnnotations: {}
podLabels: {}

podSecurityContext: {}
podSecurityContext:
{}
# fsGroup: 2000

securityContext:
Expand Down
1 change: 1 addition & 0 deletions src/backend/app/auth/auth_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#

"""Auth routes, to login, logout, and get user details."""

from datetime import datetime, timezone

from fastapi import APIRouter, Depends, HTTPException, Request, Response
Expand Down
1 change: 0 additions & 1 deletion src/backend/app/central/central_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#
"""Routes to relay requests to ODK Central server."""


from fastapi import APIRouter, Depends
from fastapi.concurrency import run_in_threadpool
from fastapi.responses import JSONResponse
Expand Down
2 changes: 1 addition & 1 deletion src/backend/app/db/db_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ class DbTaskMappingIssue(Base):


class DbMappingIssueCategory(Base):
"""Represents a category of task mapping issues identified during validaton."""
"""Represents a category of task mapping issues identified during validation."""

__tablename__ = "mapping_issue_categories"

Expand Down
1 change: 0 additions & 1 deletion src/backend/app/users/user_crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#
"""Logic for user routes."""


from sqlalchemy.orm import Session

from app.db import db_models
Expand Down
1 change: 0 additions & 1 deletion src/backend/app/users/user_deps.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

"""User dependencies for use in Depends."""


from typing import Union

from fastapi import Depends
Expand Down
2 changes: 1 addition & 1 deletion src/backend/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -155,5 +155,5 @@ exclude_rules = "CP05" # Avoid capitalisation of enums

[tool.codespell]
skip = "contrib/*.py,*languages_and_countries.py,*pnpm-lock.yaml,*CHANGELOG.md"
ignore-words-list = "ProjectIn"
write-changes = true

16,124 changes: 16,123 additions & 1 deletion src/backend/tests/test_data/data_extract_kathmandu.geojson

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ const ActivitiesPanel = ({ defaultTheme, state, params, map, view, mapDivPostion

const ActivitiesCard = ({ taskHistory }: { taskHistory: taskHistoryListType }) => {
const actionDate = taskHistory?.action_date?.split('T')[0];
const actionTime = `${taskHistory?.action_date?.split('T')[1].split(':')[0]}:${taskHistory?.action_date
?.split('T')[1]
.split(':')[1]}`;
const actionTime = `${taskHistory?.action_date?.split('T')[1].split(':')[0]}:${
taskHistory?.action_date?.split('T')[1].split(':')[1]
}`;
return (
<div className="fmtm-flex fmtm-gap-2 fmtm-items-center fmtm-justify-between fmtm-px-1 fmtm-border-b-[2px] fmtm-border-white fmtm-py-3">
<div className="fmtm-flex fmtm-items-center">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ const ProjectInfo = () => {
Created On:{' '}
<span>
{projectDashboardDetail?.created
? `${projectDashboardDetail?.created?.split('T')[0]} ${projectDashboardDetail?.created
?.split('T')[1]
?.split('.')[0]}`
? `${projectDashboardDetail?.created?.split('T')[0]} ${
projectDashboardDetail?.created?.split('T')[1]?.split('.')[0]
}`
: '-'}
</span>
</p>
Expand Down
Loading