Skip to content

Commit 0111306

Browse files
committed
switch to pyproject.toml
update to python 3.13
1 parent 20efbb0 commit 0111306

7 files changed

Lines changed: 727 additions & 157 deletions

File tree

.github/workflows/pythontest.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,22 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v3
12+
- name: Install uv
13+
uses: astral-sh/setup-uv@v7
14+
with:
15+
version: "0.7.19"
16+
enable-cache: true
1217
- name: Set up Python
1318
uses: actions/setup-python@v4
1419
with:
1520
python-version-file: ".python-version"
21+
cache: "pip"
1622
- name: Install dependencies
17-
run: |
18-
python -m pip install --upgrade pip
19-
pip install -r requirements.txt
23+
run: uv sync --locked --all-extras --dev
2024
- name: ruff
2125
run: |
22-
ruff check .
23-
ruff format . --check
26+
uv run ruff check .
27+
uv run ruff format . --check
2428
- name: Test with pytest
2529
run: |
26-
python -m pytest
30+
uv run python -m pytest

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.10
1+
3.13

ngo_explorer/classes/results.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ class ResultAggregateGeo:
2424

2525
@dataclass
2626
class ResultAggregate:
27-
finances: ResultAggregateFinances = ResultAggregateFinances()
27+
finances: ResultAggregateFinances = field(default_factory=ResultAggregateFinances)
2828
causes: list[ResultBucket] = field(default_factory=list)
2929
beneficiaries: list[ResultBucket] = field(default_factory=list)
3030
operations: list[ResultBucket] = field(default_factory=list)
3131
areas: list[ResultBucket] = field(default_factory=list)
3232
countries: list[ResultBucket] = field(default_factory=list)
33-
geo: ResultAggregateGeo = ResultAggregateGeo()
33+
geo: ResultAggregateGeo = field(default_factory=ResultAggregateGeo)

pyproject.toml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[project]
2+
name = "ngo-explorer"
3+
version = "1.0.0"
4+
description = "Data tool to help international development NGOs to navigate charity commission data."
5+
readme = "readme.md"
6+
authors = [{ name = "David Kane", email = "david@dkane.net" }]
7+
requires-python = ">=3.13"
8+
dependencies = [
9+
"flask",
10+
"requests",
11+
"requests-cache",
12+
"Flask-Babel",
13+
"python-slugify",
14+
"plotly",
15+
"XlsxWriter",
16+
"graphqlclient",
17+
"gunicorn",
18+
"python-dotenv",
19+
"pytest",
20+
"requests-mock",
21+
"ruff",
22+
"psycopg[binary]",
23+
"sqlite_utils",
24+
"tqdm",
25+
"titlecase",
26+
]

requirements.in

Lines changed: 0 additions & 17 deletions
This file was deleted.

requirements.txt

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)