Skip to content

Commit d54f83d

Browse files
Merge branch 'main' into fix/prevent-recursion-limit-fields
2 parents be238f6 + f383549 commit d54f83d

5 files changed

Lines changed: 49 additions & 29 deletions

File tree

.github/release.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- dependencies
5+
- Internal
6+
- CI
7+
- Documentation
8+
authors:
9+
- dependabot[bot]
10+
- pre-commit-ci[bot]
11+
categories:
12+
- title: Breaking changes
13+
labels:
14+
- Breaking
15+
- title: Features
16+
labels:
17+
- Feature
18+
- title: Bug fixes
19+
labels:
20+
- Bug
21+
- title: Translations
22+
labels:
23+
- Translations
24+
- title: Packaging
25+
labels:
26+
- Packaging
27+
- title: Other changes
28+
labels:
29+
- '*'

.github/workflows/main.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14+
pre-commit:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v6
18+
with:
19+
fetch-depth: 0
20+
21+
- uses: actions/setup-python@v6
22+
with:
23+
python-version: "3.10"
24+
25+
- uses: pre-commit/action@v3.0.1
26+
1427
tests:
1528
name: Python ${{ matrix.python-version }}
1629
runs-on: ubuntu-24.04

.github/workflows/pre-commit.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

docs/img/build-status.png

130 KB
Loading

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ dev = [
4444
{ include-group = "test" },
4545
]
4646
test = [
47-
# temporary pin of attrs
48-
"attrs==22.1.0",
49-
"importlib-metadata<5.0",
47+
"importlib-metadata<9.0",
5048

5149
# Pytest for running the tests.
5250
"pytest==9.*",
@@ -64,16 +62,18 @@ docs = [
6462
]
6563
optional = [
6664
# Optional packages which may be used with REST framework.
67-
"coreapi==2.3.1",
65+
"coreapi==2.3.3",
6866
"coreschema==0.0.4",
6967
"django-filter",
70-
"django-guardian>=2.4.0,<2.5",
68+
"django-guardian>=2.4.0,<3.3",
7169
"inflection==0.5.1",
7270
"legacy-cgi; python_version>='3.13'",
7371
"markdown>=3.3.7",
7472
"psycopg[binary]>=3.1.8",
75-
"pygments~=2.17.0",
76-
"pyyaml>=5.3.1,<5.4",
73+
"pygments>=2.17,<2.20",
74+
"pyyaml>=5.3.1,<6.1",
75+
# setuptools is needed for coreapi (imports pkg_resources)
76+
"setuptools<82",
7777
]
7878
django42 = [ "django>=4.2,<5.0" ]
7979
django50 = [ "django>=5.0,<5.1" ]

0 commit comments

Comments
 (0)