Skip to content

Commit 1de397e

Browse files
committed
chore: cleanup tests requirements and GitHub actions flows
1 parent 7392c8c commit 1de397e

File tree

3 files changed

+23
-28
lines changed

3 files changed

+23
-28
lines changed

.github/workflows/default.yml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
name: Lint
1+
name: Tests
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "support/**"
48

59
jobs:
610
flake8:
7-
name: flake8
8-
runs-on: ubuntu-lts
11+
runs-on: ubuntu-latest
912
steps:
1013
- name: Checkout
11-
uses: actions/checkout@v2
14+
uses: actions/checkout@v6
1215
- name: Set up Python
13-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v6
1417
with:
1518
python-version: 3.9
1619
- name: Install flake8
@@ -38,27 +41,25 @@ jobs:
3841
run: isort -c -rc -df aldryn_django
3942

4043
unit-tests:
41-
runs-on: ubuntu-lts
44+
runs-on: ubuntu-latest
4245
strategy:
4346
fail-fast: false
4447
matrix:
45-
python-version: ["3.8", "3.9", "3.10"]
48+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
4649
steps:
47-
- uses: actions/checkout@v1
50+
- uses: actions/checkout@v6
51+
- name: Update depenedencies
52+
run: sudo apt-get update
4853
- name: Install dependencies
4954
run: sudo apt-get install -y libxml2-dev libxslt-dev python-dev-is-python3
5055
- name: Set up Python ${{ matrix.python-version }}
51-
uses: actions/setup-python@v2
56+
uses: actions/setup-python@v6
5257
with:
5358
python-version: ${{ matrix.python-version }}
54-
- name: Install dependencies
59+
- name: Run tests
5560
run: |
5661
python -m pip install --upgrade pip
57-
pip install packaging
58-
pip install --upgrade urllib3
59-
pip install -r tests/requirements.txt
62+
python -m pip install -U packaging setuptools
63+
python -m pip install -r tests/requirements.txt
6064
python setup.py install
61-
- name: Run coverage
62-
run: coverage run setup.py test
63-
- name: Upload Coverage to Codecov
64-
uses: codecov/codecov-action@v1
65+
python tests/settings.py

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
zip_safe=False,
6767
install_requires=REQUIREMENTS,
6868
classifiers=CLASSIFIERS,
69-
test_suite="tests.settings.run",
7069
entry_points="""
7170
[console_scripts]
7271
aldryn-django=aldryn_django.cli:main

tests/requirements.txt

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
1-
# other requirements
2-
# django-app-helper is not yet ready for Django 4
3-
https://github.com/FinalAngel/django-app-helper/archive/refs/heads/develop.zip#egg=django-app-helper
4-
coverage
1+
django-app-helper
52
isort
63
flake8
7-
# needed for the build to work
8-
uwsgi
9-
# currently breaks ci because it wants rust now
10-
cryptography<3.4
4+
cffi<2.0.0
115
urllib3<1.27
12-
Pillow
6+
psycopg2<2.9.11
7+
Pillow<11.0.0

0 commit comments

Comments
 (0)