Skip to content

Commit

Permalink
Merge branch 'main' into Fix-1611-incorrect-errors-when-validating-da…
Browse files Browse the repository at this point in the history
…ta-with-a-missiing-required-column
  • Loading branch information
roll authored Jan 24, 2024
2 parents 23e4231 + 90f717f commit 5e4e245
Show file tree
Hide file tree
Showing 63 changed files with 44,993 additions and 21,012 deletions.
30 changes: 17 additions & 13 deletions .github/workflows/general.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@ on:
pull_request:
branches:
- main
schedule:
- cron: "0 3 * * *"
# schedule:
# - cron: "0 3 * * *"

jobs:

# Test (Linux)

test-linux:
if: github.event_name != 'schedule' || github.repository_owner == 'frictionlessdata'
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8, 3.9, '3.10']
# TODO: recover 3.8 and 3.9 when pytest-vcr is fixed
# https://github.com/ktosiek/pytest-vcr/issues/53
# TODO: recover 3.12 when duck is fixed
# https://github.com/duckdb/duckdb/issues/9563
# python-version: [3.8, 3.9, "3.10", "3.11", "3.12"]
python-version: ["3.10", "3.11"]
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand All @@ -39,7 +43,7 @@ jobs:
env:
GOOGLE_CREDENTIALS_DATA: ${{ secrets.GOOGLE_CREDENTIALS_DATA }}
- name: Test software
run: hatch run ci:test +py=${{ matrix.py || matrix.python-version }}
run: hatch run +py=${{ matrix.py || matrix.python-version }} ci:test
- name: Report coverage
uses: codecov/codecov-action@v2
services:
Expand All @@ -58,10 +62,10 @@ jobs:
mysql:
image: mysql:8
env:
MYSQL_DATABASE: test
MYSQL_ALLOW_EMPTY_PASSWORD: yes
MYSQL_DATABASE: test
MYSQL_ALLOW_EMPTY_PASSWORD: yes
ports:
- 3306:3306
- 3306:3306
options: >-
--health-cmd="mysqladmin ping"
--health-interval=10s
Expand All @@ -79,7 +83,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: "3.10"
- name: Prepare environment
run: pip3 install hatch
- name: Prepare variables
Expand All @@ -99,7 +103,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: "3.10"
- name: Prepare environment
run: pip3 install hatch
- name: Prepare variables
Expand All @@ -118,7 +122,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: "3.10"
- name: Prepare environment
run: pip3 install hatch
- name: Install and build site
Expand All @@ -130,7 +134,7 @@ jobs:
with:
branch: site
create_branch: true
push_options: '--force'
push_options: "--force"

# Release

Expand All @@ -144,7 +148,7 @@ jobs:
- name: Install Python
uses: actions/setup-python@v2
with:
python-version: '3.10'
python-version: "3.10"
- name: Install dependencies
run: pip install -U build
- name: Build distribution
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ RUN apt-get update \
&& apt-get install -y --no-install-recommends \
make \
python3-pip \
python3-psycopg2
postgresql-common \
libpq-dev \
build-essential \
libpython3-dev

COPY . /home/frictionless

WORKDIR /home/frictionless

RUN pip install wheel \
RUN pip install wheel hatch \
&& make install
1 change: 0 additions & 1 deletion data/capital.package.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
$frictionless: package/v2
resources:
- name: capital-invalid
type: table
Expand Down
46 changes: 24 additions & 22 deletions data/cassettes/test_csv_parser_remote.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ interactions:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
- gzip, deflate, zstd
Connection:
- keep-alive
User-Agent:
Expand All @@ -15,8 +15,7 @@ interactions:
uri: https://raw.githubusercontent.com/frictionlessdata/frictionless-py/master/data/table.csv
response:
body:
string: !!binary |
H4sIAAAAAAAAA8tM0clLzE3lMtRJzUvPySzO4DLSebJj7dPZe5/s2sUFAAFuQI0eAAAA
string: "id,name\n1,english\n2,\u4E2D\u56FD\u4EBA\n"
headers:
Accept-Ranges:
- bytes
Expand All @@ -34,18 +33,20 @@ interactions:
- default-src 'none'; style-src 'unsafe-inline'; sandbox
Content-Type:
- text/plain; charset=utf-8
Cross-Origin-Resource-Policy:
- cross-origin
Date:
- Tue, 09 Feb 2021 08:52:53 GMT
- Wed, 24 Jan 2024 11:36:03 GMT
ETag:
- W/"0172a2fd99319bed82fe7cccbd7a44b27a77f7200caf0d04b7f23cbb6b81026d"
Expires:
- Tue, 09 Feb 2021 08:57:53 GMT
- Wed, 24 Jan 2024 11:41:03 GMT
Source-Age:
- '181'
- '53'
Strict-Transport-Security:
- max-age=31536000
Vary:
- Authorization,Accept-Encoding, Accept-Encoding
- Authorization,Accept-Encoding,Origin
Via:
- 1.1 varnish
X-Cache:
Expand All @@ -55,15 +56,15 @@ interactions:
X-Content-Type-Options:
- nosniff
X-Fastly-Request-ID:
- 486c22a821d73b3be433a4a88a8964a6c974e883
- e0c39c6b5391b3e8a11dcdfb293820eddc7ce4d7
X-Frame-Options:
- deny
X-GitHub-Request-Id:
- D380:D1E8:3124FA:3429BD:602249E6
- C1DC:3AF103:81CB19:879050:65B0F5ED
X-Served-By:
- cache-fra19127-FRA
- cache-lis1490025-LIS
X-Timer:
- S1612860774.851531,VS0,VE1
- S1706096163.360211,VS0,VE1
X-XSS-Protection:
- 1; mode=block
status:
Expand All @@ -75,7 +76,7 @@ interactions:
Accept:
- '*/*'
Accept-Encoding:
- gzip, deflate
- gzip, deflate, zstd
Connection:
- keep-alive
User-Agent:
Expand All @@ -85,8 +86,7 @@ interactions:
uri: https://raw.githubusercontent.com/frictionlessdata/frictionless-py/master/data/table.csv
response:
body:
string: !!binary |
H4sIAAAAAAAAA8tM0clLzE3lMtRJzUvPySzO4DLSebJj7dPZe5/s2sUFAAFuQI0eAAAA
string: "id,name\n1,english\n2,\u4E2D\u56FD\u4EBA\n"
headers:
Accept-Ranges:
- bytes
Expand All @@ -104,18 +104,20 @@ interactions:
- default-src 'none'; style-src 'unsafe-inline'; sandbox
Content-Type:
- text/plain; charset=utf-8
Cross-Origin-Resource-Policy:
- cross-origin
Date:
- Tue, 09 Feb 2021 08:52:54 GMT
- Wed, 24 Jan 2024 11:36:03 GMT
ETag:
- W/"0172a2fd99319bed82fe7cccbd7a44b27a77f7200caf0d04b7f23cbb6b81026d"
Expires:
- Tue, 09 Feb 2021 08:57:54 GMT
- Wed, 24 Jan 2024 11:41:03 GMT
Source-Age:
- '182'
- '53'
Strict-Transport-Security:
- max-age=31536000
Vary:
- Authorization,Accept-Encoding, Accept-Encoding
- Authorization,Accept-Encoding,Origin
Via:
- 1.1 varnish
X-Cache:
Expand All @@ -125,15 +127,15 @@ interactions:
X-Content-Type-Options:
- nosniff
X-Fastly-Request-ID:
- 87b1226ba8513f8a12e88a4d57d9ebc92d6ce4fc
- a503cf4d7d093beb6deea0a91e663fcdb6867cee
X-Frame-Options:
- deny
X-GitHub-Request-Id:
- D380:D1E8:3124FA:3429BD:602249E6
- C1DC:3AF103:81CB19:879050:65B0F5ED
X-Served-By:
- cache-fra19141-FRA
- cache-lis1490055-LIS
X-Timer:
- S1612860775.844970,VS0,VE0
- S1706096164.629165,VS0,VE7
X-XSS-Protection:
- 1; mode=block
status:
Expand Down
Loading

0 comments on commit 5e4e245

Please sign in to comment.