Skip to content

Commit 77bede5

Browse files
committed
chore: cleanup tests requirements and GitHub actions flows
1 parent 16ae381 commit 77bede5

File tree

3 files changed

+21
-24
lines changed

3 files changed

+21
-24
lines changed

.github/workflows/default.yml

Lines changed: 19 additions & 14 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@v4
14+
uses: actions/checkout@v6
1215
- name: Set up Python
13-
uses: actions/setup-python@v5
16+
uses: actions/setup-python@v6
1417
with:
1518
python-version: "3.12"
1619
- name: Install flake8
@@ -25,9 +28,9 @@ jobs:
2528
runs-on: ubuntu-latest
2629
steps:
2730
- name: Checkout
28-
uses: actions/checkout@v4
31+
uses: actions/checkout@v6
2932
- name: Set up Python
30-
uses: actions/setup-python@v5
33+
uses: actions/setup-python@v6
3134
with:
3235
python-version: "3.12"
3336
- run: python -m pip install isort
@@ -38,23 +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.10", "3.11", "3.12"]
48+
python-version: ["3.10", "3.11", "3.12", "3.13"]
4649
steps:
47-
- uses: actions/checkout@v4
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@v5
56+
uses: actions/setup-python@v6
5257
with:
5358
python-version: ${{ matrix.python-version }}
5459
- name: Install dependencies
5560
run: |
5661
python -m pip install --upgrade pip
57-
pip install packaging
58-
pip install --upgrade urllib3 setuptools
62+
pip install -U packaging setuptools
5963
pip install -r tests/requirements.txt
6064
python setup.py install
65+
python tests/settings.py

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"License :: OSI Approved :: BSD License",
4040
"Operating System :: OS Independent",
4141
"Framework :: Django",
42-
"Framework :: Django :: 5.1",
42+
"Framework :: Django :: 5.2",
4343
"Programming Language :: Python",
4444
"Programming Language :: Python :: 3",
4545
"Programming Language :: Python :: 3.10",
@@ -67,7 +67,6 @@
6767
zip_safe=False,
6868
install_requires=REQUIREMENTS,
6969
classifiers=CLASSIFIERS,
70-
test_suite="tests.settings.run",
7170
entry_points="""
7271
[console_scripts]
7372
aldryn-django=aldryn_django.cli:main

tests/requirements.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
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
1+
django-app-helper
42
coverage
53
isort
64
flake8
7-
# needed for the build to work
8-
uwsgi
9-
# currently breaks ci because it wants rust now
10-
cryptography<3.4
11-
urllib3<1.27

0 commit comments

Comments
 (0)