Skip to content

Commit a481957

Browse files
Fixing CI integration (#126)
* Fixing CI integration * Bumping version to 0.1.58 * Removed python 3.7 check * Fixing circular deps introduced errors * Update deps. Ensuring RDB is generated uppon tox running on CI * Fixed scc unit test checks * Fixed scc unit test checks * Fixed scc unit test checks * Fixed builder tests * Priting redis container logs on error * Priting redis container logs on error
1 parent f20acd9 commit a481957

File tree

48 files changed

+1456
-750
lines changed

Some content is hidden

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

48 files changed

+1456
-750
lines changed

.github/workflows/publish-pypi.yml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,29 @@ jobs:
1010
env:
1111
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
1212
steps:
13-
- uses: actions/checkout@master
14-
- name: Set up Python 3.7
15-
uses: actions/setup-python@v1
16-
with:
17-
python-version: 3.7
13+
- uses: actions/checkout@master
1814

19-
- name: Install Poetry
20-
uses: dschep/[email protected]
15+
- name: Set up Python
16+
uses: actions/setup-python@v1
17+
with:
18+
python-version: '3.10'
2119

22-
- name: Cache Poetry virtualenv
23-
uses: actions/cache@v1
24-
id: cache
25-
with:
26-
path: ~/.virtualenvs
27-
key: poetry-${{ hashFiles('**/poetry.lock') }}
28-
restore-keys: |
29-
poetry-${{ hashFiles('**/poetry.lock') }}
20+
- uses: docker-practice/actions-setup-docker@master
3021

31-
- name: Set Poetry config
32-
run: |
33-
poetry config virtualenvs.in-project false
34-
poetry config virtualenvs.path ~/.virtualenvs
22+
- name: Install Poetry
23+
run: |
24+
curl -sSL https://install.python-poetry.org | python3 -
3525
36-
- name: Install Dependencies
37-
run: poetry install
38-
if: steps.cache.outputs.cache-hit != 'true'
26+
- name: Install Dev requirements
27+
run: |
28+
pip install -U setuptools wheel
29+
pip install -r dev_requirements.txt
3930
40-
- name: Publish to PyPI
41-
if: github.event_name == 'release'
42-
run: |
43-
poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }} --build
31+
- name: Install Dependencies
32+
run: |
33+
poetry install
34+
35+
- name: Publish to PyPI
36+
if: github.event_name == 'release'
37+
run: |
38+
poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }} --build

.github/workflows/tox.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ on:
33
pull_request:
44
push:
55
branches:
6-
- master
76
- main
7+
88
jobs:
99
pytest:
1010
strategy:
1111
matrix:
12-
python-version: [ '3.7', '3.8', '3.9', '3.10' ]
13-
os: [ ubuntu-latest ]
12+
python-version: [ '3.8', '3.9', '3.10' ]
1413
env:
1514
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
16-
USING_COVERAGE: "3.9"
15+
USING_COVERAGE: "3.10"
16+
USING_COVERAGE_OS: "ubuntu-latest"
1717

18-
runs-on: ${{ matrix.os }}
19-
name: os ${{ matrix.os }} python ${{ matrix.python-version }} Linting, testing, and compliance
18+
runs-on: "ubuntu-latest"
19+
name: python ${{ matrix.python-version }} Linting, testing, and compliance
2020
steps:
2121
- uses: actions/checkout@master
2222

@@ -31,16 +31,18 @@ jobs:
3131
run: |
3232
curl -sSL https://install.python-poetry.org | python3 -
3333
34-
- name: Install Tox
34+
- name: Install Dev requirements
3535
run: |
36-
pip3 install -r ./utils/test-requirements.txt
36+
pip install -U setuptools wheel
37+
pip install -r dev_requirements.txt
3738
3839
- name: Run tox
3940
run: |
40-
tox
41+
TST_RUNNER_USE_RDB=0 tox
4142
4243
- name: Upload coverage to Codecov
43-
uses: codecov/codecov-action@v1
44+
uses: codecov/codecov-action@v2
4445
if: contains(env.USING_COVERAGE, matrix.python-version)
4546
with:
47+
token: ${{secrets.CODECOV_TOKEN}}
4648
fail_ci_if_error: true

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ poetry run flake8
355355
A test suite is provided, and can be run with:
356356

357357
```sh
358-
$ pip3 install -r ./utils/test-requirements.txt
358+
$ pip3 install -r ./dev_requirements.txt
359359
$ tox
360360
```
361361

dev_requirements.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
click==8.0.4
2+
black==22.3.0
3+
flake8==4.0.1
4+
flynt~=0.69.0
5+
isort==5.10.1
6+
mock==4.0.3
7+
packaging>=20.4
8+
pytest==7.2.0
9+
pytest-timeout==2.0.1
10+
pytest-asyncio>=0.16.0
11+
tox==3.24.4
12+
tox-docker==4.0.0a2
13+
invoke==1.6.0
14+
pytest-cov>=3.0.0
15+
vulture>=2.3.0
16+
ujson>=4.2.0
17+
wheel>=0.30.0

0 commit comments

Comments
 (0)