Skip to content

Commit 9429726

Browse files
committed
Merge branch 'main' into add-auto-completion-for-narration
2 parents 88f71c0 + c30c97f commit 9429726

File tree

103 files changed

+2401
-1631
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+2401
-1631
lines changed

.pre-commit-config.yaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,29 @@ ci:
22
skip: ["eslint"]
33
repos:
44
- repo: https://github.com/astral-sh/ruff-pre-commit
5-
rev: v0.6.9
5+
rev: v0.8.0
66
hooks:
77
- id: ruff
88
args: ["--fix"]
99
- id: ruff-format
10+
- repo: https://github.com/executablebooks/mdformat
11+
rev: 0.7.19
12+
hooks:
13+
- id: mdformat
14+
args: ["--wrap", "80"]
15+
additional_dependencies:
16+
- mdformat-gfm
1017
- repo: local
1118
hooks:
1219
- id: prettier
1320
name: prettier
1421
language: node
15-
entry: prettier --write --list-different --ignore-unknown
22+
entry: prettier --write --list-different
23+
files: \.(css|js|mjs|ts|svelte|yaml|json)$
1624
require_serial: true
1725
additional_dependencies:
1826
19-
- "prettier-plugin-svelte@3.2.7"
27+
- "prettier-plugin-svelte@3.3.2"
2028
2129
- id: stylelint
2230
name: stylelint

CHANGES

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
11
Changelog
22
=========
33

4+
Unreleased (Beancount v3 support)
5+
---------------------------------
6+
7+
Support for Beancount version 3 was added. Using Beancount 2 is still
8+
supported. Beancount query support is now provided by the beanquery package,
9+
which has some minor differences in syntax, the provided columns and functions
10+
to the bean-query functionality in Beancount version 2. For extensions using
11+
Fava's query_shell directly, this will lead to breakage due to differences in
12+
methods and the types that are returned.
13+
14+
For importers, this sticks to beancount.ingest on v2 and used beangulp for v3.
15+
It still expectes importers to conform to the v2 importer protocol for now. Due
16+
to changes related to duplicate detection, duplicate detection is not
17+
automatically done by Fava here but can still be manually specified as hooks.
18+
419
v1.29 (2024-10-09)
520
------------------
621

_build_backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from setuptools.build_meta import prepare_metadata_for_build_editable
1919
from setuptools.build_meta import prepare_metadata_for_build_wheel
2020

21-
if TYPE_CHECKING:
21+
if TYPE_CHECKING: # pragma: no cover
2222
from collections.abc import Iterable
2323

2424
__all__ = [

constraints-old.txt

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,33 @@ babel==2.11.0
99
# fava (pyproject.toml)
1010
# flask-babel
1111
beancount==2.3.5
12+
# via
13+
# fava (pyproject.toml)
14+
# beangulp
15+
# beanquery
16+
beangulp==0.1.0
17+
# via fava (pyproject.toml)
18+
beanquery==0.1.0
1219
# via fava (pyproject.toml)
1320
beautifulsoup4==4.0.1
14-
# via beancount
21+
# via
22+
# beancount
23+
# beangulp
1524
bottle==0.12.20
1625
# via
1726
# fava (pyproject.toml)
1827
# beancount
1928
chardet==1.0
20-
# via beancount
29+
# via
30+
# beancount
31+
# beangulp
2132
cheroot==8.0.0
2233
# via fava (pyproject.toml)
23-
click==8.0.0
34+
click==8.0.1
2435
# via
2536
# fava (pyproject.toml)
37+
# beangulp
38+
# beanquery
2639
# flask
2740
et-xmlfile==1.0.0
2841
# via openpyxl
@@ -32,7 +45,7 @@ flask==2.2.0
3245
# via
3346
# fava (pyproject.toml)
3447
# flask-babel
35-
flask-babel==1.0.0
48+
flask-babel==3.0.0
3649
# via fava (pyproject.toml)
3750
google-api-python-client==1.0
3851
# via beancount
@@ -55,7 +68,7 @@ jaraco-functools==4.0.0
5568
# cheroot
5669
jdcal==1.0.1
5770
# via openpyxl
58-
jinja2==3.0.0
71+
jinja2==3.1.2
5972
# via
6073
# fava (pyproject.toml)
6174
# flask
@@ -68,6 +81,7 @@ lxml==5.3.0
6881
# via
6982
# fava (pyproject.toml)
7083
# beancount
84+
# beangulp
7185
# pyexcel-ezodf
7286
# pyexcel-ods3
7387
markdown2==2.3.0
@@ -108,15 +122,18 @@ pytest==7.2.0
108122
# via
109123
# fava (pyproject.toml)
110124
# beancount
111-
python-dateutil==2.1
125+
python-dateutil==2.6.0
112126
# via
113127
# fava (pyproject.toml)
114128
# beancount
129+
# beanquery
115130
python-gflags==1.3
116131
# via google-api-python-client
117132
python-magic==0.4.12
118-
# via beancount
119-
pytz==2020.1
133+
# via
134+
# beancount
135+
# beangulp
136+
pytz==2022.7
120137
# via
121138
# fava (pyproject.toml)
122139
# babel
@@ -134,6 +151,8 @@ six==1.16.0
134151
# python-dateutil
135152
sniffio==1.1.0
136153
# via anyio
154+
tatsu==5.7.4
155+
# via beanquery
137156
texttable==0.8.3
138157
# via pyexcel
139158
tomli==1.0.0

0 commit comments

Comments
 (0)