Skip to content

Commit d449d42

Browse files
committed
update more config and import settings
1 parent 0a30575 commit d449d42

5 files changed

Lines changed: 40 additions & 14 deletions

File tree

.meta.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ template = "default"
66
commit-id = "2.8.0"
77

88
[pyproject]
9-
codespell_ignores = "Ist"
9+
codespell_ignores = "Ist"
10+
dependencies_mappings = [
11+
"'beautifulsoup4' = ['bs4']",
12+
]
13+
dependencies_ignores = "['zest.pocompile','zestreleaser.towncrier', 'zest.releaser', 'Products.Five','collective.z3cform.norobots','plone.formwidget.hcaptcha','plone.formwidget.recaptcha']"

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ Zope = [
8686
]
8787
python-dateutil = ['dateutil']
8888
pytest-plone = ['pytest', 'zope.pytestlayer', 'plone.testing', 'plone.app.testing']
89+
ignore-packages = ['zest.pocompile','zestreleaser.towncrier', 'zest.releaser', 'Products.Five','collective.z3cform.norobots','plone.formwidget.hcaptcha','plone.formwidget.recaptcha']
90+
'beautifulsoup4' = ['bs4']
8991

9092
##
9193
# Add extra configuration options in .meta.toml:

setup.py

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,32 +34,55 @@
3434
zip_safe=False,
3535
python_requires=">=3.10",
3636
install_requires=[
37+
"AccessControl",
38+
"beautifulsoup4",
39+
"lxml",
40+
"openpyxl",
3741
"plone.api",
42+
"plone.autoform",
43+
"plone.app.contenttypes",
3844
"plone.app.dexterity",
45+
"plone.app.registry",
3946
"plone.app.textfield",
40-
"plone.autoform",
47+
"plone.app.z3cform",
48+
"plone.base",
4149
"plone.dexterity",
50+
"plone.memoize",
4251
"plone.namedfile",
52+
"plone.protect",
53+
"plone.resourceeditor",
54+
"plone.restapi",
55+
"plone.registry",
4356
"plone.schema",
4457
"plone.schemaeditor",
4558
"plone.supermodel",
46-
"plone.restapi",
59+
"Products.CMFCore",
4760
"Products.CMFPlone",
61+
"Products.PloneFormGen",
62+
"Products.statusmessages",
4863
"Products.validation",
64+
"python-dateutil",
65+
"z3c.form",
66+
"Zope",
4967
],
5068
extras_require={
51-
"downloadxlsx": ["openpyxl"],
52-
"recaptcha": ["plone.formwidget.recaptcha"],
53-
"hcaptcha": ["plone.formwidget.hcaptcha"],
54-
"norobots": ["collective.z3cform.norobots"],
5569
"test": [
56-
"beautifulsoup4",
70+
"collective.z3cform.norobots",
71+
"Products.MailHost",
5772
"plone.app.testing[robot]",
5873
"plone.app.robotframework",
5974
"plone.app.contenttypes",
6075
"plone.formwidget.recaptcha",
6176
"plone.formwidget.hcaptcha",
77+
"plone.testing",
78+
"robotsuite",
79+
"Zope",
80+
"transaction",
6281
],
82+
"downloadxlsx": ["openpyxl"],
83+
"recaptcha": ["plone.formwidget.recaptcha"],
84+
"hcaptcha": ["plone.formwidget.hcaptcha"],
85+
"norobots": ["collective.z3cform.norobots"],
6386
},
6487
entry_points="""
6588
# -*- Entry points: -*-

src/collective/easyform/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66

77

88
try:
9-
import openpyxl
9+
import openpyxl # noqa: F401
10+
1011
HAS_XLSX_SUPPORT = True
1112
except ImportError:
1213
HAS_XLSX_SUPPORT = False

src/collective/easyform/tests/testValidators.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1-
try:
2-
from StringIO import StringIO # for Python 2
3-
except ImportError:
4-
from io import StringIO # for Python 3
5-
61
from collective.easyform import validators
72
from collective.easyform.api import get_schema
83
from collective.easyform.api import set_fields
94
from collective.easyform.browser.view import EasyFormForm
105
from collective.easyform.browser.view import ValidateFile
116
from collective.easyform.interfaces import IFieldExtender
127
from collective.easyform.tests import base
8+
from io import StringIO
139
from os.path import dirname
1410
from os.path import join
1511
from plone import api

0 commit comments

Comments
 (0)