Skip to content

Commit 2f6cf46

Browse files
authored
#258 use pyproject.toml for dependencies and configuration (#290)
* #258 use pyproject.toml for dependencies and configuration * fix coverage, missed config * cleanup
1 parent 4650d76 commit 2f6cf46

17 files changed

Lines changed: 159 additions & 213 deletions

.github/workflows/bandit.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: bandit
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

.github/workflows/bearer.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: bearer
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

.github/workflows/black.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: black
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

@@ -36,8 +34,7 @@ jobs:
3634
source ./venv/bin/activate
3735
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
3836
python -m pip install --upgrade pip
39-
python -m pip install --requirement development-requirements.txt
40-
python -m pip install --requirement requirements.txt
37+
python -m pip install --group all .
4138
4239
- name: Run black testing
4340
run: |

.github/workflows/check-development-dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
source ./venv/bin/activate
3535
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
3636
python -m pip install --upgrade pip
37-
python -m pip install --requirement development-requirements.txt
37+
python -m pip install --group all .

.github/workflows/dependency-scan.yaml

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,6 @@ on:
77
permissions: {}
88

99
jobs:
10-
fpvs:
11-
permissions:
12-
contents: read
13-
runs-on: ubuntu-latest
14-
strategy:
15-
fail-fast: false
16-
matrix:
17-
python-version: ["3.12"]
18-
19-
steps:
20-
- name: Checkout repository
21-
uses: actions/checkout@v5
22-
with:
23-
persist-credentials: false
24-
25-
- name: Set up Python ${{ matrix.python-version }}
26-
uses: actions/setup-python@v6
27-
with:
28-
python-version: ${{ matrix.python-version }}
29-
30-
- name: Install dependencies
31-
run: |
32-
python -m venv ./venv
33-
source ./venv/bin/activate
34-
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
35-
python -m pip install --upgrade pip
36-
python -m pip install --requirement development-requirements.txt
37-
python -m pip install --requirement requirements.txt
38-
python -m pip wheel -r requirements.txt --wheel-dir=vendor
39-
40-
- name: Run fpvs scan
41-
run: |
42-
python -m pip install fpvs
43-
git clone https://gitlab.com/gitlab-org/security-products/gemnasium-db.git
44-
fpvs-scan --verbose
45-
4610
pip-audit:
4711
permissions:
4812
contents: read
@@ -68,10 +32,9 @@ jobs:
6832
python -m venv ./venv
6933
source ./venv/bin/activate
7034
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
71-
python -m pip install --requirement requirements.txt
7235
python -m pip install .
7336
7437
- name: Run pip-audit
7538
uses: pypa/gh-action-pip-audit@v1.1.0
7639
with:
77-
inputs: requirements.txt
40+
inputs: ${{ github.workspace}}

.github/workflows/flake8.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: flake8
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

.github/workflows/isort.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: isort
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

@@ -35,12 +33,9 @@ jobs:
3533
source ./venv/bin/activate
3634
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
3735
python -m pip install --upgrade pip
38-
python -m pip install --requirement development-requirements.txt
39-
python -m pip install --requirement requirements.txt
36+
python -m pip install --group all .
4037
4138
- name: Run isort
4239
uses: isort/isort-action@v1
4340
with:
44-
configuration:
45-
requirements-files: requirements.txt
4641
sort-paths: "sz_tools"

.github/workflows/mypy.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: mypy
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

@@ -36,8 +34,7 @@ jobs:
3634
source ./venv/bin/activate
3735
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
3836
python -m pip install --upgrade pip
39-
python -m pip install --requirement development-requirements.txt
40-
python -m pip install --requirement requirements.txt
37+
python -m pip install --group all .
4138
4239
- name: Run mypy tests
4340
run: |

.github/workflows/pylint.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: pylint
22

33
on:
4-
push:
5-
branches-ignore: [main]
64
pull_request:
75
branches: [main]
86

@@ -35,8 +33,7 @@ jobs:
3533
source ./venv/bin/activate
3634
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
3735
python -m pip install --upgrade pip
38-
python -m pip install --requirement development-requirements.txt
39-
python -m pip install --requirement requirements.txt
36+
python -m pip install --group all .
4037
4138
- name: Analysing the code with pylint
4239
run: |

.github/workflows/pytest-darwin.yaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,7 @@ jobs:
4545
source ./venv/bin/activate
4646
echo "PATH=${PATH}" >> "${GITHUB_ENV}"
4747
python -m pip install --upgrade pip
48-
python -m pip install --requirement development-requirements.txt
49-
python -m pip install --requirement requirements.txt
50-
51-
- if: matrix.python-version == '3.10'
52-
name: Install python libraries for python 3.10
53-
run: |
54-
source ./venv/bin/activate
55-
python -m pip install typing_extensions
48+
python -m pip install --group all .
5649
5750
- name: Install Senzing SDK
5851
uses: senzing-factory/github-action-install-senzing-sdk@v3

0 commit comments

Comments
 (0)