8000 Added SSL/TLS support · psqlpy-python/psqlpy@42ced7a · GitHub
[go: up one dir, main page]

Skip to content

Commit 42ced7a

Browse files
committed
Added SSL/TLS support
Signed-off-by: chandr-andr (Kiselev Aleksandr) <chandr@chandr.net>
1 parent 434434b commit 42ced7a

File tree

3 files changed

+37
-39
lines changed

3 files changed

+37
-39
lines changed

.github/workflows/release_docs.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Release PSQLPy documentation
22

3-
on:
4-
push:
5-
branches:
6-
- main
3+
on: workflow_dispatch
74

85
permissions:
96
contents: write

.github/workflows/test.yaml

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,39 +51,6 @@ jobs:
5151
token: ${{ secrets.GITHUB_TOKEN }}
5252
args: -p psqlpy --all-features -- -W clippy::all -W clippy::pedantic -D warnings
5353
pytest:
54-
name: ${{matrix.job.os}}-${{matrix.py_version}}
55-
strategy:
56-
matrix:
57-
py_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
58-
job:
59-
- os: ubuntu-latest
60-
ssl_cmd: sudo apt-get update && sudo apt-get install libssl-dev openssl
61-
runs-on: ${{matrix.job.os}}
62-
steps:
63-
- uses: actions/checkout@v1
64-
- uses: ikalnytskyi/action-setup-postgres@v4
65-
with:
66-
username: postgres
67-
password: postgres
68-
database: psqlpy_test
69-
id: postgres
70-
- uses: actions-rs/toolchain@v1
71-
with:
72-
toolchain: stable
73-
components: clippy
74-
override: true
75-
- name: Setup OpenSSL
76-
run: ${{matrix.job.ssl_cmd}}
77-
- name: Setup python for test ${{ matrix.py_version }}
78-
uses: actions/setup-python@v4
79-
with:
80-
python-version: ${{ matrix.py_version }}
81-
- name: Install tox
82-
run: pip install "tox-gh>=1.2,<2"
83-
- name: Run pytest
84-
run: tox -v -c tox.ini
85-
86-
pytest_with_ssl_postgres:
8754
name: ${{matrix.job.os}}-${{matrix.py_version}}
8855
strategy:
8956
matrix:
@@ -115,4 +82,38 @@ jobs:
11582
- name: Install tox
11683
run: pip install "tox-gh>=1.2,<2"
11784
- name: Run pytest
118-
run: tox -v -c tox_ssl_mode.ini
85+
run: tox -v -c tox.ini
86+
87+
# pytest_with_ssl_postgres:
88+
# name: ${{matrix.job.os}}-${{matrix.py_version}}
89+
# strategy:
90+
# matrix:
91+
# py_version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
92+
# job:
93+
# - os: ubuntu-latest
94+
# ssl_cmd: sudo apt-get update && sudo apt-get install libssl-dev openssl
95+
# runs-on: ${{matrix.job.os}}
96+
# steps:
97+
# - uses: actions/checkout@v1
98+
# - name: Setup Postgres
99+
# uses: ./.github/actions/setup_postgres/
100+
# with:
101+
# username: postgres
102+
# password: postgres
103+
# database: psqlpy_test
104+
# id: postgres
105+
# - uses: actions-rs/toolchain@v1
106+
# with:
107+
# toolchain: stable
108+
# components: clippy
109+
# override: true
110+
# - name: Setup OpenSSL
111+
# run: ${{matrix.job.ssl_cmd}}
112+
# - name: Setup python for test ${{ matrix.py_version }}
113+
# uses: actions/setup-python@v4
114+
# with:
115+
# python-version: ${{ matrix.py_version }}
116+
# - name: Install tox
117+
# run: pip install "tox-gh>=1.2,<2"
118+
# - name: Run pytest
119+
# run: tox -v -c tox_ssl_mode.ini

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ allowlist_externals = maturin
2626
commands_pre =
2727
maturin develop
2828
commands =
29-
pytest -vv --ignore="./python/tests/test_ssl_mode.py"
29+
pytest -vv

0 commit comments

Comments
 (0)
0