Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove DeprecationWarning from a moved p.a.z3cform.widgets import #387

Merged
merged 2 commits into from
May 12, 2024
Merged

Remove DeprecationWarning from a moved p.a.z3cform.widgets import #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
461525d
Remove DeprecationWarning from a moved p.a.z3cfrom.widgets import.
jensens May 2, 2024
7119142
Plone 6.1 only
jensens May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/387.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove a DeprecationWarning from a moved p.a.z3cform.widgets import. [@jensens]
8 changes: 4 additions & 4 deletions plone/app/dexterity/behaviors/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
from datetime import datetime
from DateTime import DateTime
from plone.app.dexterity import _
from plone.app.z3cform.widget import AjaxSelectFieldWidget
from plone.app.z3cform.widget import DatetimeFieldWidget
from plone.app.z3cform.widget import SelectFieldWidget
from plone.app.z3cform.widgets.datetime import DatetimeFieldWidget
from plone.app.z3cform.widgets.select import AjaxSelectFieldWidget
from plone.app.z3cform.widgets.select import Select2FieldWidget
from plone.autoform import directives
from plone.autoform.interfaces import IFormFieldProvider
from plone.base.interfaces.siteroot import IPloneSiteRoot
Expand Down Expand Up @@ -116,7 +116,7 @@ class ICategorization(model.Schema):
missing_value="",
defaultFactory=default_language,
)
directives.widget("language", SelectFieldWidget)
directives.widget("language", Select2FieldWidget)

directives.omitted("subjects", "language")
directives.no_omit(IEditForm, "subjects", "language")
Expand Down
13 changes: 6 additions & 7 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import setup


version = "3.2.1.dev0"
version = "4.0.0.dev0"

short_description = (
"Dexterity is a content type framework for CMF applications, "
Expand All @@ -29,16 +29,15 @@
"Development Status :: 5 - Production/Stable",
"Environment :: Web Environment",
"Framework :: Plone",
"Framework :: Plone :: 6.0",
"Framework :: Plone :: 6.1",
"Framework :: Plone :: Core",
"Framework :: Zope :: 5",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
],
keywords="plone ttw dexterity schema interface",
author="Martin Aspeli, David Glick, et al",
Expand All @@ -49,7 +48,7 @@
namespace_packages=["plone", "plone.app"],
include_package_data=True,
zip_safe=False,
python_requires=">=3.8",
python_requires=">=3.10",
install_requires=[
# Dexterity
"plone.app.textfield",
Expand All @@ -58,12 +57,12 @@
"plone.formwidget.namedfile",
"plone.namedfile>=1.0.0",
"plone.rfc822",
"plone.schemaeditor >1.3.3",
"plone.schemaeditor>1.3.3",
# Plone/Zope core
"lxml",
"plone.base",
"plone.app.uuid",
"plone.app.z3cform>=1.1.0",
"plone.app.z3cform>=4.6.0",
"plone.autoform>=1.1",
"plone.contentrules",
"plone.portlets",
Expand Down
16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ set_env =
##
deps =
zope.testrunner
-c https://dist.plone.org/release/6.0-dev/constraints.txt
-c https://dist.plone.org/release/6.1-dev/constraints.txt

##
# Specify additional deps in .meta.toml:
# [tox]
Expand Down Expand Up @@ -152,8 +152,8 @@ set_env =
deps =
coverage
zope.testrunner
-c https://dist.plone.org/release/6.0-dev/constraints.txt
-c https://dist.plone.org/release/6.1-dev/constraints.txt

commands =
rfbrowser init
coverage run --branch --source plone.app.dexterity {envbindir}/zope-testrunner --quiet --all --test-path={toxinidir} -s plone.app.dexterity {posargs}
Expand All @@ -170,8 +170,8 @@ deps =
twine
build
towncrier
-c https://dist.plone.org/release/6.0-dev/constraints.txt
-c https://dist.plone.org/release/6.1-dev/constraints.txt

commands =
# fake version to not have to install the package
# we build the change log as news entries might break
Expand All @@ -198,8 +198,8 @@ allowlist_externals =
deps =
pipdeptree
pipforester
-c https://dist.plone.org/release/6.0-dev/constraints.txt
-c https://dist.plone.org/release/6.1-dev/constraints.txt

commands =
# Generate the full dependency tree
sh -c 'pipdeptree -j > forest.json'
Expand Down