Skip to content

Commit

Permalink
Merge pull request #658 from IATI/update-requirements
Browse files Browse the repository at this point in the history
requirements: Update all requirements, and update README for this
  • Loading branch information
Bjwebb authored Feb 19, 2025
2 parents af26534 + 1c6d270 commit 3d3b7f2
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 66 deletions.
11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,21 @@ Often you only want to regenerate the current stats, use `get_stats.sh` to downl
If a change requires new dependencies then please add to `requirements.in` or `requirements_dev.in` as appropriate and recompile:

```
# Install an older version of pip, see https://github.com/jazzband/pip-tools/issues/2131
pip install 'pip<24.3'
pip-compile requirements.in
pip-compile requirements_dev.in
```

### Upgrading dependencies

```
# Install an older version of pip, see https://github.com/jazzband/pip-tools/issues/2131
pip install 'pip<24.3'
pip-compile --upgrade requirements.in
pip-compile --upgrade requirements_dev.in
```

### Linting

Code linting is carried out using Black, isort and [Flake8](https://flake8.pycqa.org/en/latest/) and `pyproject.toml` has the configuration.
Expand Down
3 changes: 1 addition & 2 deletions iati_dashboard/make_csv.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Generates CSV files from data in the 'stats-calculated' folder and using additional logic
"""
"""Generates CSV files from data in the 'stats-calculated' folder and using additional logic"""

import csv
import logging
Expand Down
3 changes: 1 addition & 2 deletions iati_dashboard/make_plots.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env python
""" Generates static images of stats graphs using matplotlib.
"""
"""Generates static images of stats graphs using matplotlib."""

import argparse
import csv
Expand Down
3 changes: 1 addition & 2 deletions iati_dashboard/tests/test_timeliness.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Testing of functions in timeliness.py
"""
"""Testing of functions in timeliness.py"""

from iati_dashboard import timeliness # noqa: E402

Expand Down
3 changes: 1 addition & 2 deletions iati_dashboard/text.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Text fragments for page titles, navigation and page leaders/sub-leaders
"""
"""Text fragments for page titles, navigation and page leaders/sub-leaders"""

import copy

Expand Down
3 changes: 1 addition & 2 deletions iati_dashboard/ui/jinja2.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
"""Jinja2 template configuration
"""
"""Jinja2 template configuration"""

import re

Expand Down
52 changes: 26 additions & 26 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,33 @@
# This file is autogenerated by pip-compile with Python 3.12
# by the following command:
#
# pip-compile
# pip-compile requirements.in
#
asgiref==3.8.1
# via django
blinker==1.8.2
blinker==1.9.0
# via flask
certifi==2024.8.30
certifi==2025.1.31
# via requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via flask
contourpy==1.3.0
contourpy==1.3.1
# via matplotlib
cycler==0.12.1
# via matplotlib
django==5.1.5
django==5.1.6
# via -r requirements.in
django-environ==0.11.2
django-environ==0.12.0
# via -r requirements.in
elementpath==4.6.0
elementpath==4.7.0
# via xmlschema
flask==3.0.3
flask==3.1.0
# via
# -r requirements.in
# frozen-flask
fonttools==4.54.1
fonttools==4.56.0
# via matplotlib
frozen-flask==1.0.2
# via -r requirements.in
Expand All @@ -44,54 +44,54 @@ jinja2==3.1.5
# via
# -r requirements.in
# flask
kiwisolver==1.4.7
kiwisolver==1.4.8
# via matplotlib
lxml==5.3.0
lxml==5.3.1
# via -r requirements.in
markupsafe==3.0.2
# via
# -r requirements.in
# jinja2
# werkzeug
matplotlib==3.9.2
matplotlib==3.10.0
# via -r requirements.in
numpy==2.1.3
numpy==2.2.3
# via
# contourpy
# matplotlib
packaging==24.1
packaging==24.2
# via
# gunicorn
# matplotlib
pillow==11.0.0
pillow==11.1.0
# via matplotlib
psycopg==3.2.3
psycopg==3.2.4
# via -r requirements.in
pyparsing==3.2.0
pyparsing==3.2.1
# via matplotlib
python-dateutil==2.9.0.post0
# via
# -r requirements.in
# matplotlib
pytz==2024.2
pytz==2025.1
# via -r requirements.in
requests==2.32.3
# via -r requirements.in
six==1.16.0
six==1.17.0
# via python-dateutil
sqlparse==0.5.1
sqlparse==0.5.3
# via django
tqdm==4.67.0
tqdm==4.67.1
# via -r requirements.in
typing-extensions==4.12.2
# via psycopg
urllib3==2.2.3
urllib3==2.3.0
# via requests
werkzeug==3.1.2
werkzeug==3.1.3
# via
# -r requirements.in
# flask
whitenoise==6.8.2
whitenoise==6.9.0
# via -r requirements.in
xmlschema==3.4.3
# via -r requirements.in
60 changes: 30 additions & 30 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@ asgiref==3.8.1
# via
# -r requirements.txt
# django
black==24.10.0
black==25.1.0
# via -r requirements_dev.in
blinker==1.8.2
blinker==1.9.0
# via
# -r requirements.txt
# flask
certifi==2024.8.30
certifi==2025.1.31
# via
# -r requirements.txt
# requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via
# -r requirements.txt
# requests
click==8.1.7
click==8.1.8
# via
# -r requirements.txt
# black
# flask
contourpy==1.3.0
contourpy==1.3.1
# via
# -r requirements.txt
# matplotlib
coverage[toml]==7.6.4
coverage[toml]==7.6.12
# via
# coveralls
# pytest-cov
Expand All @@ -41,27 +41,27 @@ cycler==0.12.1
# via
# -r requirements.txt
# matplotlib
django==5.1.5
django==5.1.6
# via -r requirements.txt
django-environ==0.11.2
django-environ==0.12.0
# via -r requirements.txt
docopt==0.6.2
# via coveralls
elementpath==4.6.0
elementpath==4.7.0
# via
# -r requirements.txt
# xmlschema
flake8==7.1.1
flake8==7.1.2
# via
# -r requirements_dev.in
# flake8-pyproject
flake8-pyproject==1.2.3
# via -r requirements_dev.in
flask==3.0.3
flask==3.1.0
# via
# -r requirements.txt
# frozen-flask
fonttools==4.54.1
fonttools==4.56.0
# via
# -r requirements.txt
# matplotlib
Expand All @@ -75,7 +75,7 @@ idna==3.10
# requests
iniconfig==2.0.0
# via pytest
isort==5.13.2
isort==6.0.0
# via -r requirements_dev.in
itsdangerous==2.2.0
# via
Expand All @@ -85,29 +85,29 @@ jinja2==3.1.5
# via
# -r requirements.txt
# flask
kiwisolver==1.4.7
kiwisolver==1.4.8
# via
# -r requirements.txt
# matplotlib
lxml==5.3.0
lxml==5.3.1
# via -r requirements.txt
markupsafe==3.0.2
# via
# -r requirements.txt
# jinja2
# werkzeug
matplotlib==3.9.2
matplotlib==3.10.0
# via -r requirements.txt
mccabe==0.7.0
# via flake8
mypy-extensions==1.0.0
# via black
numpy==2.1.3
numpy==2.2.3
# via
# -r requirements.txt
# contourpy
# matplotlib
packaging==24.1
packaging==24.2
# via
# -r requirements.txt
# black
Expand All @@ -116,25 +116,25 @@ packaging==24.1
# pytest
pathspec==0.12.1
# via black
pillow==11.0.0
pillow==11.1.0
# via
# -r requirements.txt
# matplotlib
platformdirs==4.3.6
# via black
pluggy==1.5.0
# via pytest
psycopg==3.2.3
psycopg==3.2.4
# via -r requirements.txt
pycodestyle==2.12.1
# via flake8
pyflakes==3.2.0
# via flake8
pyparsing==3.2.0
pyparsing==3.2.1
# via
# -r requirements.txt
# matplotlib
pytest==8.3.3
pytest==8.3.4
# via
# -r requirements_dev.in
# pytest-cov
Expand All @@ -144,35 +144,35 @@ python-dateutil==2.9.0.post0
# via
# -r requirements.txt
# matplotlib
pytz==2024.2
pytz==2025.1
# via -r requirements.txt
requests==2.32.3
# via
# -r requirements.txt
# coveralls
six==1.16.0
six==1.17.0
# via
# -r requirements.txt
# python-dateutil
sqlparse==0.5.1
sqlparse==0.5.3
# via
# -r requirements.txt
# django
tqdm==4.67.0
tqdm==4.67.1
# via -r requirements.txt
typing-extensions==4.12.2
# via
# -r requirements.txt
# psycopg
urllib3==2.2.3
urllib3==2.3.0
# via
# -r requirements.txt
# requests
werkzeug==3.1.2
werkzeug==3.1.3
# via
# -r requirements.txt
# flask
whitenoise==6.8.2
whitenoise==6.9.0
# via -r requirements.txt
xmlschema==3.4.3
# via -r requirements.txt

0 comments on commit 3d3b7f2

Please sign in to comment.