Skip to content

Commit

Permalink
Merge branch 'main' into docker
Browse files Browse the repository at this point in the history
  • Loading branch information
baszoetekouw authored Oct 9, 2023
2 parents 9e5df2d + 569b9b0 commit bc7fbb5
Show file tree
Hide file tree
Showing 21 changed files with 9,325 additions and 7,411 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
fail-fast: false
matrix:
python:
- '3.7'
- '3.9'
- '3.10'
- '3.11'

services:
ldap:
Expand All @@ -34,7 +34,7 @@ jobs:
LDAP_TLS: true

steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608

- name: Install dependencies
run: sudo apt-get update && sudo apt-get install -y libsasl2-dev libldap2-dev ldap-utils
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Install dependencies
run: |
python3 -m pip install --upgrade pip flake8
python3 -m pip install --upgrade pip flake8 gera2ld-pyserve
pip install flake8 pytest
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608

- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ config.d/
tests/api/
.vscode/
.theia/
Pipfile
.python-version
plsc.yaml
.python-version
Pipfile
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ SBS_URL=https://sbs.example.com
SBS_USER=sysread
SBS_PASS=secret
SBS_API_RECORDING=Yes
SBS_VERIFY_SSL=Yes
```
You have the option to run against an operational instance of SBS by specifing the **SBS_URL** and **SBS_USER** /**SBS_PASS** constants as shown above. If you do not want to access an SBS instance, just leave these constant out.
Expand Down
Loading

0 comments on commit bc7fbb5

Please sign in to comment.