Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
dolfinus committed Dec 17, 2023
2 parents 17ed2de + 551d99b commit f5244e5
Show file tree
Hide file tree
Showing 232 changed files with 6,806 additions and 4,610 deletions.
2 changes: 1 addition & 1 deletion .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ONETL_PG_PASSWORD=ohtae0luxeshi1uraeluMoh9IShah7ai
# Oracle
ONETL_ORA_HOST=oracle
ONETL_ORA_PORT=1521
ONETL_ORA_SERVICE_NAME=XEPDB1
ONETL_ORA_SERVICE_NAME=FREEPDB1
ONETL_ORA_USER=onetl
ONETL_ORA_PASSWORD=Yoequ2Hoeceit4ch

Expand Down
2 changes: 1 addition & 1 deletion .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export ONETL_PG_PASSWORD=ohtae0luxeshi1uraeluMoh9IShah7ai
# Oracle
export ONETL_ORA_HOST=localhost
export ONETL_ORA_PORT=1522
export ONETL_ORA_SERVICE_NAME=XEPDB1
export ONETL_ORA_SERVICE_NAME=FREEPDB1
export ONETL_ORA_USER=onetl
export ONETL_ORA_PASSWORD=Yoequ2Hoeceit4ch

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- master

env:
DEFAULT_PYTHON: '3.11'
DEFAULT_PYTHON: '3.12'

permissions:
contents: read
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ concurrency:
cancel-in-progress: true

env:
# flake8-commas is failing on Python 3.12
# as well as bandit https://github.com/PyCQA/bandit/issues/1077
DEFAULT_PYTHON: '3.11'

jobs:
Expand All @@ -35,7 +37,9 @@ jobs:
python-version: ${{ env.DEFAULT_PYTHON }}

- name: Install Kerberos headers
run: sudo apt-get install --no-install-recommends libkrb5-dev
run: |
sudo apt-get update
sudo apt-get install --no-install-recommends libkrb5-dev
- name: Cache pip
uses: actions/cache@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/clickhouse/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/core/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/data/ftp/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min: &min
os: ubuntu-latest

max: &max
python-version: '3.11'
python-version: '3.12'
os: ubuntu-latest

matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/data/ftps/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min: &min
os: ubuntu-latest

max: &max
python-version: '3.11'
python-version: '3.12'
os: ubuntu-latest

matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/hdfs/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ min: &min
max: &max
hadoop-version: hadoop3-hdfs
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
hadoop-version: hadoop3-hdfs
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/hive/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/kafka/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ min: &min
max: &max
kafka-version: 3.5.1
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
kafka-version: latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/data/local-fs/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,33 +16,25 @@ min_excel: &min_excel
java-version: 8
os: ubuntu-latest

max_excel: &max_excel
spark-version: 3.4.1
python-version: '3.11'
java-version: 20
os: ubuntu-latest

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

matrix:
small:
- <<: *max_excel
- <<: *max
full:
- <<: *min
- <<: *min_avro
- <<: *min_excel
- <<: *max_excel
- <<: *max
nightly:
- <<: *min
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/data/local-fs/tracked.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
**/*local_fs*
**/*local-fs*
6 changes: 3 additions & 3 deletions .github/workflows/data/mongodb/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ min: &min
os: ubuntu-latest

max: &max
spark-version: 3.4.1
python-version: '3.11'
spark-version: 3.4.2
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/mssql/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/mysql/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
27 changes: 18 additions & 9 deletions .github/workflows/data/oracle/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,41 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

matrix:
small:
- oracle-version: 21.3.0-slim-faststart
db-name: XEPDB1
- oracle-image: gvenzl/oracle-free
oracle-version: 23.3-slim-faststart
db-name: FREEPDB1
<<: *max
full:
- oracle-version: 11.2.0.2-slim-faststart
- oracle-image: gvenzl/oracle-xe
oracle-version: 11.2.0.2-slim-faststart
db-name: XE
<<: *min
- oracle-version: 21.3.0-slim-faststart
- oracle-image: gvenzl/oracle-xe
oracle-version: 21.3.0-slim-faststart
db-name: XEPDB1
<<: *max
- oracle-image: gvenzl/oracle-free
oracle-version: 23.3-slim-faststart
db-name: FREEPDB1
<<: *max
nightly:
- oracle-version: 11.2.0.2-slim-faststart
- oracle-image: gvenzl/oracle-xe
oracle-version: 11.2.0.2-slim-faststart
db-name: XE
<<: *min
- oracle-version: latest-faststart
db-name: XEPDB1
- oracle-image: gvenzl/oracle-free
oracle-version: slim-faststart
db-name: FREEPDB1
<<: *latest
4 changes: 2 additions & 2 deletions .github/workflows/data/postgres/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ min: &min

max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/s3/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ min: &min
max: &max
minio-version: 2023.7.18
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
minio-version: latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/data/samba/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min: &min
os: ubuntu-latest

max: &max
python-version: '3.11'
python-version: '3.12'
os: ubuntu-latest

matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/data/sftp/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min: &min
os: ubuntu-latest

max: &max
python-version: '3.11'
python-version: '3.12'
os: ubuntu-latest

matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/data/teradata/matrix.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
max: &max
spark-version: 3.5.0
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

latest: &latest
spark-version: latest
python-version: '3.11'
python-version: '3.12'
java-version: 20
os: ubuntu-latest

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/data/webdav/matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min: &min
os: ubuntu-latest

max: &max
python-version: '3.11'
python-version: '3.12'
os: ubuntu-latest

matrix:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
workflow_dispatch:

env:
DEFAULT_PYTHON: '3.11'
DEFAULT_PYTHON: '3.12'

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
Expand Down Expand Up @@ -42,6 +42,10 @@ jobs:
- name: Upgrade pip
run: python -m pip install --upgrade pip setuptools wheel

- name: Fix logo in Readme
run: |
sed -i "s#image:: docs/#image:: https://raw.githubusercontent.com/MobileTeleSystems/onetl/$GITHUB_SHA/docs/#g" README.rst
- name: Build package
run: python setup.py sdist bdist_wheel

Expand Down
Loading

0 comments on commit f5244e5

Please sign in to comment.