Skip to content

Commit f3ce53e

Browse files
authored
chore: Update project meta data and use pyproject.toml (#1541)
* fix: Docs build * update python version * update actions * chore: Collect meta information in pyproject.toml * Update action * update pre-commit * fix frontend tests * fix precommit * Update action versions * Move kara tests to chrome
1 parent e618986 commit f3ce53e

File tree

12 files changed

+134
-119
lines changed

12 files changed

+134
-119
lines changed

.github/workflows/frontend.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: gulp
1+
name: Frontend CI
22

33
on: [push]
44

@@ -7,12 +7,12 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
node-version: [16.20.x]
10+
node-version: [18.19.x]
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v5
1414
- name: Use Node.js ${{ matrix.node-version }}
15-
uses: actions/setup-node@v1
15+
uses: actions/setup-node@v4
1616
with:
1717
node-version: ${{ matrix.node-version }}
1818
- run: python -m pip install -r tests/requirements/frontend.txt

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
python-version: 3.9
1616
- name: Install flake8
17-
run: pip install --upgrade flake8
17+
run: pip install --upgrade flake8 flake8-pyproject
1818
- name: Run flake8
1919
uses: liskin/gh-problem-matcher-wrap@v1
2020
with:

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18

.pre-commit-config.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ repos:
2121
# args: [--target-version, "2.2"]
2222

2323
- repo: https://github.com/PyCQA/flake8
24-
rev: 7.3.0
24+
rev: 7.0.0
2525
hooks:
2626
- id: flake8
27-
27+
entry: pflake8
28+
additional_dependencies: [pyproject-flake8]
2829
- repo: https://github.com/asottile/yesqa
2930
rev: v1.5.0
3031
hooks:

filer/static/filer/css/admin_filer.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

filer/static/filer/css/maps/admin_filer.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
"jasmine-core": "^2.3.2",
1616
"jshint-stylish": "^2.2.1",
1717
"karma": "^0.13.22",
18+
"karma-chrome-launcher": "^3.2.0",
1819
"karma-fixture": "^0.2.6",
1920
"karma-html2js-preprocessor": "^0.1.0",
2021
"karma-jasmine": "^0.3.8",
2122
"karma-json-fixtures-preprocessor": "^0.0.6",
22-
"karma-phantomjs-launcher": "^1.0.4",
23-
"phantomjs-prebuilt": "^2.1.7",
2423
"request": "^2.88.2",
2524
"sass": "^1.63.4"
2625
}

pyproject.toml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
[build-system]
2+
requires = ["setuptools>=45", "wheel"]
3+
build-backend = "setuptools.build_meta"
4+
5+
[project]
6+
name = "django-filer"
7+
dynamic = ["version"]
8+
authors = [
9+
{name = "Divio AG", email = "info@divio.ch"},
10+
]
11+
maintainers = [
12+
{name = "Django CMS Association and contributors", email = "info@django-cms.org"},
13+
]
14+
description = "A file management application for django that makes handling of files and images a breeze."
15+
readme = "README.rst"
16+
license = {text = "BSD-3-Clause"}
17+
requires-python = ">=3.8"
18+
dependencies = [
19+
"django>=3.2",
20+
"django-polymorphic",
21+
"easy-thumbnails[svg]",
22+
]
23+
classifiers = [
24+
"Development Status :: 5 - Production/Stable",
25+
"Environment :: Web Environment",
26+
"Intended Audience :: Developers",
27+
"License :: OSI Approved :: BSD License",
28+
"Operating System :: OS Independent",
29+
"Programming Language :: Python",
30+
"Programming Language :: Python :: 3",
31+
"Programming Language :: Python :: 3.8",
32+
"Programming Language :: Python :: 3.9",
33+
"Programming Language :: Python :: 3.10",
34+
"Programming Language :: Python :: 3.11",
35+
"Programming Language :: Python :: 3.12",
36+
"Framework :: Django",
37+
"Framework :: Django :: 3.2",
38+
"Framework :: Django :: 4.2",
39+
"Framework :: Django :: 5.0",
40+
"Framework :: Django :: 5.1",
41+
"Framework :: Django :: 5.2",
42+
"Framework :: Django CMS",
43+
"Framework :: Django CMS :: 3.11",
44+
"Framework :: Django CMS :: 4.0",
45+
"Framework :: Django CMS :: 4.1",
46+
"Framework :: Django CMS :: 5.0",
47+
"Topic :: Internet :: WWW/HTTP",
48+
"Topic :: Internet :: WWW/HTTP :: Dynamic Content",
49+
"Topic :: Software Development",
50+
"Topic :: Software Development :: Libraries",
51+
]
52+
53+
[project.optional-dependencies]
54+
heif = ["pillow-heif"]
55+
56+
[project.urls]
57+
Homepage = "https://github.com/django-cms/django-filer"
58+
59+
[tool.setuptools]
60+
packages = ["filer"]
61+
include-package-data = true
62+
zip-safe = false
63+
64+
[tool.setuptools.dynamic]
65+
version = {attr = "filer.__version__"}
66+
67+
[tool.flake8]
68+
max-line-length = 119
69+
exclude = [
70+
"*.egg-info",
71+
".eggs",
72+
".env",
73+
".git",
74+
".settings",
75+
".tox",
76+
".venv",
77+
"build",
78+
"data",
79+
"dist",
80+
"docs",
81+
"*migrations*",
82+
"tmp",
83+
"node_modules",
84+
]
85+
ignore = ["E251", "E128", "E501", "W503"]
86+
87+
[tool.isort]
88+
line_length = 119
89+
skip = [
90+
"manage.py",
91+
"*migrations*",
92+
".tox",
93+
".eggs",
94+
"data",
95+
".env",
96+
".venv",
97+
]
98+
include_trailing_comma = true
99+
multi_line_output = 5
100+
lines_after_imports = 2
101+
default_section = "THIRDPARTY"
102+
sections = [
103+
"FUTURE",
104+
"STDLIB",
105+
"DJANGO",
106+
"CMS",
107+
"THIRDPARTY",
108+
"FIRSTPARTY",
109+
"LOCALFOLDER",
110+
]
111+
known_first_party = ["filer"]
112+
known_cms = ["cms", "menus"]
113+
known_django = ["django"]

setup.cfg

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

setup.py

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

0 commit comments

Comments
 (0)