Skip to content

Commit 3214e75

Browse files
dolfinusdolfinus
committed
Merge branch 'develop'
2 parents f5244e5 + 631cb1d commit 3214e75

File tree

327 files changed

+4646
-5164
lines changed

Some content is hidden

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

327 files changed

+4646
-5164
lines changed

‎.env.docker‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ TZ=UTC
33
# Greenplum
44
ONETL_GP_HOST=greenplum
55
ONETL_GP_PORT=5432
6-
ONETL_GP_DATABASE=testdb
7-
ONETL_GP_USER=tester
8-
ONETL_GP_PASSWORD=pivotal
6+
ONETL_GP_DATABASE=postgres
7+
ONETL_GP_USER=gpadmin
8+
ONETL_GP_PASSWORD=
99

1010
# ClickHouse
1111
ONETL_CH_HOST=clickhouse

‎.env.local‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ export TZ=UTC
33
# Greenplum
44
export ONETL_GP_HOST=localhost
55
export ONETL_GP_PORT=5433
6-
export ONETL_GP_DATABASE=testdb
7-
export ONETL_GP_USER=tester
8-
export ONETL_GP_PASSWORD=pivotal
6+
export ONETL_GP_DATABASE=postgres
7+
export ONETL_GP_USER=gpadmin
8+
export ONETL_GP_PASSWORD=
99

1010
# ClickHouse
1111
export ONETL_CH_HOST=localhost

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Set update schedule for GitHub Actions
2+
3+
version: 2
4+
updates:
5+
- package-ecosystem: github-actions
6+
directory: /
7+
schedule:
8+
interval: daily
9+
labels:
10+
- type:ci

‎.github/workflows/automerge.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]'
1111

1212
steps:
13-
- uses: alexwilson/enable-github-automerge-action@1.0.0
14-
with:
15-
github-token: ${{ secrets.AUTOMERGE_TOKEN }}
16-
merge-method: REBASE
13+
- uses: alexwilson/enable-github-automerge-action@1.0.0
14+
with:
15+
github-token: ${{ secrets.AUTOMERGE_TOKEN }}
16+
merge-method: REBASE
1717

1818
autoapprove:
1919
name: Automatically approve pull request
@@ -22,6 +22,6 @@ jobs:
2222
if: github.event.pull_request.user.login == 'pre-commit-ci[bot]' || github.event.pull_request.user.login == 'dependabot[bot]'
2323

2424
steps:
25-
- uses: hmarr/auto-approve-action@v3
26-
with:
27-
github-token: ${{ secrets.AUTOMERGE_TOKEN }}
25+
- uses: hmarr/auto-approve-action@v4
26+
with:
27+
github-token: ${{ secrets.AUTOMERGE_TOKEN }}

‎.github/workflows/changelog.yml‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
types: [opened, synchronize, labeled, unlabeled, reopened]
66
branches-ignore:
7-
- master
7+
- master
88

99
env:
1010
DEFAULT_PYTHON: '3.12'
@@ -19,44 +19,44 @@ jobs:
1919
timeout-minutes: 10
2020
if: "!contains(github.event.pull_request.labels.*.name, 'ci:skip-changelog') && github.event.pull_request.user.login != 'pre-commit-ci[bot]' && github.event.pull_request.user.login != 'dependabot[bot]'"
2121
steps:
22-
- name: Checkout code
23-
uses: actions/checkout@v4
24-
with:
25-
fetch-depth: 0
26-
27-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
28-
id: python
29-
uses: actions/setup-python@v4
30-
with:
31-
python-version: ${{ env.DEFAULT_PYTHON }}
32-
33-
- name: Cache pip
34-
uses: actions/cache@v3
35-
with:
36-
path: ~/.cache/pip
37-
key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-${{ hashFiles('requirements/core.txt', 'requirements/docs.txt') }}
38-
restore-keys: |
39-
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-${{ hashFiles('requirements/core.txt', 'requirements/docs.txt') }}
40-
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-
41-
42-
- name: Upgrade pip
43-
run: python -m pip install --upgrade pip setuptools wheel
44-
45-
- name: Install dependencies
46-
run: |
47-
pip install -I -r requirements/core.txt -r requirements/docs.txt
48-
49-
- name: Check changelog entry exists
50-
run: |
51-
if [ ! -s docs/changelog/next_release/${{ github.event.pull_request.number }}.*.rst ]; then
52-
echo "Please add corresponding file 'docs/changelog/next_release/<issue number>.<change type>.rst' with changes description"
53-
exit 1
54-
fi
55-
56-
- name: Validate changelog
57-
run: |
58-
# Fetch the pull request' base branch so towncrier will be able to
59-
# compare the current branch with the base branch.
60-
git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
61-
towncrier check --compare-with origin/${{ github.base_ref }}
62-
towncrier --draft
22+
- name: Checkout code
23+
uses: actions/checkout@v4
24+
with:
25+
fetch-depth: 0
26+
27+
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
28+
id: python
29+
uses: actions/setup-python@v5
30+
with:
31+
python-version: ${{ env.DEFAULT_PYTHON }}
32+
33+
- name: Cache pip
34+
uses: actions/cache@v4
35+
with:
36+
path: ~/.cache/pip
37+
key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-${{ hashFiles('requirements/core.txt', 'requirements/docs.txt') }}
38+
restore-keys: |
39+
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-${{ hashFiles('requirements/core.txt', 'requirements/docs.txt') }}
40+
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-changelog-
41+
42+
- name: Upgrade pip
43+
run: python -m pip install --upgrade pip setuptools wheel
44+
45+
- name: Install dependencies
46+
run: |
47+
pip install -I -r requirements/core.txt -r requirements/docs.txt
48+
49+
- name: Check changelog entry exists
50+
run: |
51+
if [ ! -s docs/changelog/next_release/${{ github.event.pull_request.number }}.*.rst ]; then
52+
echo "Please add corresponding file 'docs/changelog/next_release/<issue number>.<change type>.rst' with changes description"
53+
exit 1
54+
fi
55+
56+
- name: Validate changelog
57+
run: |
58+
# Fetch the pull request' base branch so towncrier will be able to
59+
# compare the current branch with the base branch.
60+
git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
61+
towncrier check --compare-with origin/${{ github.base_ref }}
62+
towncrier --draft

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Code analysis
33
on:
44
push:
55
branches:
6-
- develop
6+
- develop
77
pull_request:
88
branches-ignore:
9-
- master
9+
- master
1010
workflow_dispatch:
1111

1212
concurrency:
@@ -28,55 +28,55 @@ jobs:
2828
security-events: write
2929

3030
steps:
31-
- name: Checkout repository
32-
uses: actions/checkout@v4
33-
34-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
35-
uses: actions/setup-python@v4
36-
with:
37-
python-version: ${{ env.DEFAULT_PYTHON }}
38-
39-
- name: Install Kerberos headers
40-
run: |
41-
sudo apt-get update
42-
sudo apt-get install --no-install-recommends libkrb5-dev
43-
44-
- name: Cache pip
45-
uses: actions/cache@v3
46-
with:
47-
path: ~/.cache/pip
48-
key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-${{ hashFiles('requirements*.txt') }}
49-
restore-keys: |
50-
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-${{ hashFiles('requirements*.txt') }}
51-
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-
52-
${{ runner.os }}-python
53-
${{ runner.os }}-
54-
55-
- name: Upgrade pip
56-
run: python -m pip install --upgrade pip setuptools wheel
57-
58-
- name: Install dependencies
59-
run: |
60-
pip install -I \
61-
-r requirements/core.txt \
62-
-r requirements/dev.txt \
63-
-r requirements/ftp.txt \
64-
-r requirements/hdfs.txt \
65-
-r requirements/kerberos.txt \
66-
-r requirements/s3.txt \
67-
-r requirements/sftp.txt \
68-
-r requirements/spark.txt \
69-
-r requirements/webdav.txt
70-
71-
# Set the `CODEQL-PYTHON` environment variable to the Python executable
72-
# that includes the dependencies
73-
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
74-
75-
- name: Run flake8
76-
run: python3 -m flake8 --config setup.cfg .
77-
78-
- name: Run mypy
79-
run: python3 -m mypy --config-file setup.cfg onetl
31+
- name: Checkout repository
32+
uses: actions/checkout@v4
33+
34+
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
35+
uses: actions/setup-python@v5
36+
with:
37+
python-version: ${{ env.DEFAULT_PYTHON }}
38+
39+
- name: Install Kerberos headers
40+
run: |
41+
sudo apt-get update
42+
sudo apt-get install --no-install-recommends libkrb5-dev
43+
44+
- name: Cache pip
45+
uses: actions/cache@v4
46+
with:
47+
path: ~/.cache/pip
48+
key: ${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-${{ hashFiles('requirements*.txt') }}
49+
restore-keys: |
50+
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-${{ hashFiles('requirements*.txt') }}
51+
${{ runner.os }}-python-${{ env.DEFAULT_PYTHON }}-codeql-
52+
${{ runner.os }}-python
53+
${{ runner.os }}-
54+
55+
- name: Upgrade pip
56+
run: python -m pip install --upgrade pip setuptools wheel
57+
58+
- name: Install dependencies
59+
run: |
60+
pip install -I \
61+
-r requirements/core.txt \
62+
-r requirements/dev.txt \
63+
-r requirements/ftp.txt \
64+
-r requirements/hdfs.txt \
65+
-r requirements/kerberos.txt \
66+
-r requirements/s3.txt \
67+
-r requirements/sftp.txt \
68+
-r requirements/spark.txt \
69+
-r requirements/webdav.txt
70+
71+
# Set the `CODEQL-PYTHON` environment variable to the Python executable
72+
# that includes the dependencies
73+
echo "CODEQL_PYTHON=$(which python)" >> $GITHUB_ENV
74+
75+
- name: Run flake8
76+
run: python3 -m flake8 --config setup.cfg .
77+
78+
- name: Run mypy
79+
run: python3 -m mypy --config-file setup.cfg onetl
8080

8181
codeql:
8282
name: CodeQL
@@ -87,21 +87,21 @@ jobs:
8787
security-events: write
8888

8989
steps:
90-
- name: Checkout repository
91-
uses: actions/checkout@v4
90+
- name: Checkout repository
91+
uses: actions/checkout@v4
9292

93-
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
94-
uses: actions/setup-python@v4
95-
with:
96-
python-version: ${{ env.DEFAULT_PYTHON }}
93+
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
94+
uses: actions/setup-python@v5
95+
with:
96+
python-version: ${{ env.DEFAULT_PYTHON }}
9797

9898
# Initializes the CodeQL tools for scanning.
99-
- name: Initialize CodeQL
100-
uses: github/codeql-action/init@v2
101-
with:
102-
languages: python
103-
104-
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@v2
106-
with:
107-
category: /language:python
99+
- name: Initialize CodeQL
100+
uses: github/codeql-action/init@v3
101+
with:
102+
languages: python
103+
104+
- name: Perform CodeQL Analysis
105+
uses: github/codeql-action/analyze@v3
106+
with:
107+
category: /language:python

‎.github/workflows/data/clickhouse/matrix.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@ latest: &latest
1818

1919
matrix:
2020
small:
21-
- clickhouse-image: clickhouse/clickhouse-server
22-
clickhouse-version: 23.6.1-alpine
23-
<<: *max
21+
- clickhouse-image: clickhouse/clickhouse-server
22+
clickhouse-version: 23.6.1-alpine
23+
<<: *max
2424
full:
2525
# the lowest supported Clickhouse version by JDBC driver
26-
- clickhouse-image: yandex/clickhouse-server
27-
clickhouse-version: '20.7'
28-
<<: *min
29-
- clickhouse-image: clickhouse/clickhouse-server
30-
clickhouse-version: 23.6.1-alpine
31-
<<: *max
26+
- clickhouse-image: yandex/clickhouse-server
27+
clickhouse-version: '20.7'
28+
<<: *min
29+
- clickhouse-image: clickhouse/clickhouse-server
30+
clickhouse-version: 23.6.1-alpine
31+
<<: *max
3232
nightly:
33-
- clickhouse-image: yandex/clickhouse-server
34-
clickhouse-version: '20.7'
35-
<<: *min
36-
- clickhouse-image: clickhouse/clickhouse-server
37-
clickhouse-version: latest-alpine
38-
<<: *latest
33+
- clickhouse-image: yandex/clickhouse-server
34+
clickhouse-version: '20.7'
35+
<<: *min
36+
- clickhouse-image: clickhouse/clickhouse-server
37+
clickhouse-version: latest-alpine
38+
<<: *latest

‎.github/workflows/data/clickhouse/tracked.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
**/clickhouse*
1+
**/*clickhouse*
2+
**/*clickhouse*/**

‎.github/workflows/data/ftp/matrix.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ max: &max
99
matrix:
1010
small:
1111
# chonjay21/ftps image has only latest tag
12-
- ftp-version: latest
13-
<<: *max
12+
- ftp-version: latest
13+
<<: *max
1414
full: &full
15-
- ftp-version: latest
16-
<<: *min
17-
- ftp-version: latest
18-
<<: *max
15+
- ftp-version: latest
16+
<<: *min
17+
- ftp-version: latest
18+
<<: *max
1919
nightly: *full

‎.github/workflows/data/ftp/tracked.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
**/ftp*
1+
**/*ftp*
2+
**/*ftp*/**
23
docker-compose.yml
34
.env.dependencies

0 commit comments

Comments
 (0)