Skip to content

Commit ac4ec55

Browse files
authored
Merge branch 'frictionlessdata:main' into main
2 parents 7c0cfb5 + be08dcf commit ac4ec55

32 files changed

Lines changed: 1077 additions & 872 deletions

.github/workflows/general.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
run: |
131131
echo '!**/*.html' >> .gitignore
132132
hatch run docs-build
133-
- name: Publush to Github Pages
133+
- name: Publish to Github Pages
134134
uses: stefanzweifel/git-auto-commit-action@v5
135135
with:
136136
branch: site

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22

33
Here described only the breaking and most significant changes. The full changelog and documentation for all released versions could be found in nicely formatted [commit history](https://github.com/frictionlessdata/frictionless-py/commits/main).
44

5+
## v5.18.1
6+
7+
- feat: add pass_row as configurable parameter for field_update
8+
([#1729](https://github.com/frictionlessdata/frictionless-py/pull/1729))
9+
- fix: vendor unmaintained stringcase library
10+
([#1727](https://github.com/frictionlessdata/frictionless-py/pull/1727))
11+
- Various bug fixes
12+
513
## v5.18
614

715
- Support `ignore_constraints` option for the `Indexer` (#1691)
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"name": "testing",
3+
"resources": [
4+
{
5+
"name": "data",
6+
"path": "data.csv",
7+
"schema": {
8+
"fields": [
9+
{
10+
"name": "id",
11+
"type": "string",
12+
"constraints": {
13+
"required": true
14+
}
15+
},
16+
{
17+
"name": "name",
18+
"type": "string"
19+
},
20+
{
21+
"name": "description",
22+
"type": "string"
23+
},
24+
{
25+
"name": "amount",
26+
"type": "number"
27+
}
28+
],
29+
"primaryKey": "id"
30+
}
31+
},
32+
{
33+
"name": "data2",
34+
"path": "data2.csv",
35+
"schema": {
36+
"fields": [
37+
{
38+
"type": "string",
39+
"name": "parent"
40+
},
41+
{
42+
"type": "string",
43+
"name": "comment"
44+
}
45+
]
46+
}
47+
}
48+
]
49+
}

docs/guides/transforming-data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ cat transform.csv
5353

5454
The high-level interface to transform data is a set of `transform` functions:
5555
- `transform`: detects the source type and transforms data accordingly
56-
- `reosurce.transform`: transforms a resource
56+
- `resource.transform`: transforms a resource
5757
- `package.transform`: transforms a package
5858

5959
We'll see examples of these functions in the next few sections.
@@ -157,7 +157,7 @@ Frictionless includes more than 40+ built-in transform steps. They are grouped b
157157
- row
158158
- cell
159159

160-
See [Transform Steps](../steps/cell.md) for a list of all available steps. It is also possible to write custom transform steps: see the next section.
160+
See [Transform Steps](../steps/cell.html) for a list of all available steps. It is also possible to write custom transform steps: see the next section.
161161

162162
## Custom Steps
163163

frictionless/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,6 @@
4040
from .table import Lookup as Lookup
4141
from .table import Row as Row
4242
from .transformer import Transformer as Transformer
43+
44+
# Deprecated
4345
from .validator import Validator as Validator

frictionless/console/__spec__/test_console.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
def test_console():
1313
result = runner.invoke(console)
1414
assert result.exit_code == 2
15-
assert result.stdout.count("Usage")
15+
assert result.output.count("Usage")
1616

1717

1818
def test_console_version():
@@ -30,4 +30,4 @@ def test_console_help():
3030
def test_console_error_bad_command():
3131
result = runner.invoke(console, "bad")
3232
assert result.exit_code == 2
33-
assert result.stdout.count("No such command 'bad'")
33+
assert result.output.count("No such command 'bad'")

frictionless/console/commands/__spec__/test_summary.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ def test_console_summary_error_not_found():
1313
result = runner.invoke(console, "summary data/countriess.csv")
1414
assert result.exit_code == 1
1515
assert (
16-
result.stdout.count("[scheme-error]")
17-
and result.stdout.count("[Errno 2]")
18-
and result.stdout.count("data/countriess.csv")
16+
result.output.count("[scheme-error]")
17+
and result.output.count("[Errno 2]")
18+
and result.output.count("data/countriess.csv")
1919
)
2020

2121

2222
def test_console_summary_invalid():
2323
result = runner.invoke(console, "summary data/countries-invalid.yaml")
2424
assert result.exit_code == 1
25-
assert result.stdout.count(
25+
assert result.output.count(
2626
'Field is not valid: "required" should be set as "constraints.required"'
2727
)
2828

@@ -155,7 +155,7 @@ def test_console_summary_without_command(tmpdir):
155155
def test_console_summary_without_filepath():
156156
result = runner.invoke(console, "summary")
157157
assert result.exit_code == 1
158-
assert result.stdout.strip() == 'Providing "source" is required'
158+
assert result.output.strip() == 'Providing "source" is required'
159159

160160

161161
def test_console_summary_zipped_innerpath():

0 commit comments

Comments
 (0)