Skip to content

Commit 915014c

Browse files
funilrysfunilrys
committed
Merge remote-tracking branch 'origin/dev'
2 parents 3c8f620 + 70b390f commit 915014c

File tree

375 files changed

+4087
-1184
lines changed

Some content is hidden

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

375 files changed

+4087
-1184
lines changed

‎.github/workflows/branches.yml‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
python_version:
26-
- "3.10"
26+
- "3.11"
2727
os:
2828
- ubuntu-latest
2929

@@ -56,7 +56,7 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
python_version:
59-
- "3.10"
59+
- "3.11"
6060
os:
6161
- ubuntu-latest
6262

@@ -75,7 +75,7 @@ jobs:
7575
pip install safety
7676
7777
- name: Check the safety of our dependencies.
78-
run: safety check
78+
run: safety check -i 51668
7979

8080
test:
8181
needs: [lint, deps_safety_check]
@@ -87,10 +87,10 @@ jobs:
8787
fail-fast: false
8888
matrix:
8989
python_version:
90-
- "3.7"
9190
- "3.8"
9291
- "3.9"
9392
- "3.10"
93+
- "3.11"
9494
os:
9595
- ubuntu-latest
9696
- macos-latest
@@ -132,7 +132,7 @@ jobs:
132132
fail-fast: false
133133
matrix:
134134
python_version:
135-
- "3.10"
135+
- "3.11"
136136
os:
137137
- ubuntu-latest
138138

@@ -153,10 +153,10 @@ jobs:
153153
fail-fast: false
154154
matrix:
155155
python_version:
156-
- "3.7"
157156
- "3.8"
158157
- "3.9"
159158
- "3.10"
159+
- "3.11"
160160
os:
161161
- ubuntu-latest
162162
- macos-latest
@@ -209,10 +209,10 @@ jobs:
209209
fail-fast: false
210210
matrix:
211211
python_version:
212-
- "3.7"
213212
- "3.8"
214213
- "3.9"
215214
- "3.10"
215+
- "3.11"
216216
os:
217217
- ubuntu-latest
218218

@@ -232,3 +232,57 @@ jobs:
232232
233233
- name: Run PyFunceble as defined by tox_run_mariadb.ini
234234
run: tox -c tox_run_mariadb.ini
235+
236+
run_cli_postgresql:
237+
needs: test
238+
name: "[${{ matrix.os }}] Run PyFunceble (with postgresql) with Python ${{ matrix.python_version }}"
239+
240+
runs-on: "${{ matrix.os }}"
241+
242+
services:
243+
mariadb:
244+
image: postgres:latest
245+
ports:
246+
- 5432:5432
247+
env:
248+
POSTGRES_USER: pyfunceble
249+
POSTGRES_PASSWORD: my_pyfunceble_password
250+
POSTGRES_DB: pyfunceble
251+
MYSQL_ROOT_PASSWORD: my_awesome_root_password
252+
options: --health-cmd="pg_isready --host=localhost --username=pyfunceble --port=5432" --health-interval=5s --health-timeout=2s --health-retries=3
253+
254+
env:
255+
PYFUNCEBLE_DB_CHARSET: utf8
256+
PYFUNCEBLE_DB_HOST: "127.0.0.1"
257+
PYFUNCEBLE_DB_NAME: pyfunceble
258+
PYFUNCEBLE_DB_PASSWORD: my_pyfunceble_password
259+
PYFUNCEBLE_DB_PORT: "3306"
260+
PYFUNCEBLE_DB_USERNAME: pyfunceble
261+
262+
strategy:
263+
fail-fast: false
264+
matrix:
265+
python_version:
266+
- "3.8"
267+
- "3.9"
268+
- "3.10"
269+
- "3.11"
270+
os:
271+
- ubuntu-latest
272+
273+
steps:
274+
- uses: actions/checkout@v3
275+
name: Clone repository
276+
277+
- name: Set up Python ${{ matrix.python_version }}
278+
uses: actions/setup-python@v4
279+
with:
280+
python-version: ${{ matrix.python_version }}
281+
282+
- name: Install dependencies
283+
run: |
284+
pip install -r requirements.txt
285+
pip install tox psycopg2
286+
287+
- name: Run PyFunceble as defined by tox_run_postgresql.ini
288+
run: tox -c tox_run_postgresql.ini

‎.github/workflows/dev.yml‎

Lines changed: 67 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
python_version:
22-
- "3.10"
22+
- "3.11"
2323
os:
2424
- ubuntu-latest
2525

@@ -52,7 +52,7 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
python_version:
55-
- "3.10"
55+
- "3.11"
5656
os:
5757
- ubuntu-latest
5858

@@ -71,7 +71,7 @@ jobs:
7171
pip install safety
7272
7373
- name: Check the safety of our dependencies.
74-
run: safety check
74+
run: safety check -i 51668
7575

7676
test:
7777
needs: [lint, deps_safety_check]
@@ -83,10 +83,10 @@ jobs:
8383
fail-fast: false
8484
matrix:
8585
python_version:
86-
- "3.7"
8786
- "3.8"
8887
- "3.9"
8988
- "3.10"
89+
- "3.11"
9090
os:
9191
- ubuntu-latest
9292
- macos-latest
@@ -129,7 +129,7 @@ jobs:
129129
fail-fast: false
130130
matrix:
131131
python_version:
132-
- "3.10"
132+
- "3.11"
133133
os:
134134
- ubuntu-latest
135135

@@ -150,10 +150,10 @@ jobs:
150150
fail-fast: false
151151
matrix:
152152
python_version:
153-
- "3.7"
154153
- "3.8"
155154
- "3.9"
156155
- "3.10"
156+
- "3.11"
157157
os:
158158
- ubuntu-latest
159159
- macos-latest
@@ -206,10 +206,10 @@ jobs:
206206
fail-fast: false
207207
matrix:
208208
python_version:
209-
- "3.7"
210209
- "3.8"
211210
- "3.9"
212211
- "3.10"
212+
- "3.11"
213213
os:
214214
- ubuntu-latest
215215

@@ -230,8 +230,62 @@ jobs:
230230
- name: Run PyFunceble as defined by tox_run_mariadb.ini
231231
run: tox -c tox_run_mariadb.ini
232232

233+
run_cli_postgresql:
234+
needs: test
235+
name: "[${{ matrix.os }}] Run PyFunceble (with postgresql) with Python ${{ matrix.python_version }}"
236+
237+
runs-on: "${{ matrix.os }}"
238+
239+
services:
240+
mariadb:
241+
image: postgres:latest
242+
ports:
243+
- 5432:5432
244+
env:
245+
POSTGRES_USER: pyfunceble
246+
POSTGRES_PASSWORD: my_pyfunceble_password
247+
POSTGRES_DB: pyfunceble
248+
MYSQL_ROOT_PASSWORD: my_awesome_root_password
249+
options: --health-cmd="pg_isready --host=localhost --username=pyfunceble --port=5432" --health-interval=5s --health-timeout=2s --health-retries=3
250+
251+
env:
252+
PYFUNCEBLE_DB_CHARSET: utf8
253+
PYFUNCEBLE_DB_HOST: "127.0.0.1"
254+
PYFUNCEBLE_DB_NAME: pyfunceble
255+
PYFUNCEBLE_DB_PASSWORD: my_pyfunceble_password
256+
PYFUNCEBLE_DB_PORT: "3306"
257+
PYFUNCEBLE_DB_USERNAME: pyfunceble
258+
259+
strategy:
260+
fail-fast: false
261+
matrix:
262+
python_version:
263+
- "3.8"
264+
- "3.9"
265+
- "3.10"
266+
- "3.11"
267+
os:
268+
- ubuntu-latest
269+
270+
steps:
271+
- uses: actions/checkout@v3
272+
name: Clone repository
273+
274+
- name: Set up Python ${{ matrix.python_version }}
275+
uses: actions/setup-python@v4
276+
with:
277+
python-version: ${{ matrix.python_version }}
278+
279+
- name: Install dependencies
280+
run: |
281+
pip install -r requirements.txt
282+
pip install tox psycopg2
283+
284+
- name: Run PyFunceble as defined by tox_run_postgresql.ini
285+
run: tox -c tox_run_postgresql.ini
286+
233287
deploy_to_pypi:
234-
needs: [run_cli, run_cli_mariadb]
288+
needs: [run_cli, run_cli_mariadb, run_cli_postgresql]
235289
name: "Deploy 📦 to the PyPi"
236290

237291
if: github.event_name == 'push' && github.ref == 'refs/heads/dev'
@@ -242,7 +296,7 @@ jobs:
242296
fail-fast: false
243297
matrix:
244298
python_version:
245-
- "3.10"
299+
- "3.11"
246300
os:
247301
- ubuntu-latest
248302

@@ -268,7 +322,7 @@ jobs:
268322
twine check dist/*
269323
270324
- name: Publish 📦 to PyPI
271-
uses: pypa/gh-action-pypi-publish@master
325+
uses: pypa/gh-action-pypi-publish@release/v1
272326
with:
273327
password: ${{ secrets.PYPI_DEV_API_TOKEN }}
274328
skip_existing: true
@@ -285,12 +339,12 @@ jobs:
285339
fail-fast: false
286340
matrix:
287341
python_version:
288-
- "3.10"
342+
- "3.11"
289343
os:
290344
- ubuntu-latest
291345

292346
env:
293-
DOCKER_PYTHON_VERSION: "3.10"
347+
DOCKER_PYTHON_VERSION: "3.11"
294348
BUILDER_CLONE_DIRNAME: pyfunceble_docker
295349
OUR_DOCKER_USERNAME: ${{ secrets.OUR_DOCKER_USERNAME }}
296350
OUR_DOCKER_PASSWORD: ${{ secrets.OUR_DOCKER_PASSWORD }}
@@ -351,7 +405,7 @@ jobs:
351405
352406
- name: Get time for cache
353407
id: cache_time
354-
run: echo "::set-output name=time::$(date +%F-%T)"
408+
run: echo "time=$(date +%F-%T)" >> ${$GITHUB_OUTPUT}
355409

356410
- name: Set up cache
357411
uses: actions/cache@master

‎.github/workflows/stable.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
python_version:
22-
- "3.10"
22+
- "3.11"
2323
os:
2424
- ubuntu-latest
2525

@@ -52,7 +52,7 @@ jobs:
5252
fail-fast: false
5353
matrix:
5454
python_version:
55-
- "3.10"
55+
- "3.11"
5656
os:
5757
- ubuntu-latest
5858

@@ -71,7 +71,7 @@ jobs:
7171
pip install safety
7272
7373
- name: Check the safety of our dependencies.
74-
run: safety check
74+
run: safety check -i 51668
7575

7676
test:
7777
needs: [lint, deps_safety_check]
@@ -83,10 +83,10 @@ jobs:
8383
fail-fast: false
8484
matrix:
8585
python_version:
86-
- "3.7"
8786
- "3.8"
8887
- "3.9"
8988
- "3.10"
89+
- "3.11"
9090
os:
9191
- ubuntu-latest
9292
- macos-latest
@@ -128,7 +128,7 @@ jobs:
128128
fail-fast: false
129129
matrix:
130130
python_version:
131-
- "3.10"
131+
- "3.11"
132132
os:
133133
- ubuntu-latest
134134

@@ -151,7 +151,7 @@ jobs:
151151
fail-fast: false
152152
matrix:
153153
python_version:
154-
- "3.10"
154+
- "3.11"
155155
os:
156156
- ubuntu-latest
157157

@@ -177,7 +177,7 @@ jobs:
177177
twine check dist/*
178178
179179
- name: Publish 📦 to PyPI
180-
uses: pypa/gh-action-pypi-publish@master
180+
uses: pypa/gh-action-pypi-publish@release/v1
181181
with:
182182
password: ${{ secrets.PYPI_API_TOKEN }}
183183
skip_existing: true
@@ -194,12 +194,12 @@ jobs:
194194
fail-fast: false
195195
matrix:
196196
python_version:
197-
- "3.10"
197+
- "3.11"
198198
os:
199199
- ubuntu-latest
200200

201201
env:
202-
DOCKER_PYTHON_VERSION: "3.10"
202+
DOCKER_PYTHON_VERSION: "3.11"
203203
BUILDER_CLONE_DIRNAME: pyfunceble_docker
204204
OUR_DOCKER_USERNAME: ${{ secrets.OUR_DOCKER_USERNAME }}
205205
OUR_DOCKER_PASSWORD: ${{ secrets.OUR_DOCKER_PASSWORD }}
@@ -260,7 +260,7 @@ jobs:
260260
261261
- name: Get time for cache
262262
id: cache_time
263-
run: echo "::set-output name=time::$(date +%F-%T)"
263+
run: echo "time=$(date +%F-%T)" >> ${$GITHUB_OUTPUT}
264264

265265
- name: Set up cache
266266
uses: actions/cache@master

0 commit comments

Comments
 (0)