diff --git a/.github/workflows/plone-package.yml b/.github/workflows/plone-package.yml index 2eddb76..5429a0e 100644 --- a/.github/workflows/plone-package.yml +++ b/.github/workflows/plone-package.yml @@ -1,7 +1,7 @@ # This workflow will install Python dependencies, run tests and lint with a variety of Python versions # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions -name: Plone package +name: Plone package tests on: push: @@ -16,9 +16,8 @@ jobs: fail-fast: false matrix: plone-version: - - 'Plone52' - 'Plone60' - python-version: [3.7, 3.8, 3.9] + python-version: [3.9] steps: - uses: actions/setup-python@v2 @@ -58,8 +57,3 @@ jobs: env: PLONE-VERSION: ${{ matrix.plone-version }} PYTHON-VERSION: ${{ matrix.python-version }} - - name: "Upload coverage to Codecov" - uses: "codecov/codecov-action@v1" - with: - fail_ci_if_error: true - if: matrix.python-version == '3.7' diff --git a/README.rst b/README.rst index c52ea65..39ccdff 100644 --- a/README.rst +++ b/README.rst @@ -1,111 +1,11 @@ -.. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features. - If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html - This text does not appear on pypi or github. It is a comment. - -.. image:: https://github.com/collective/ploneconf.site/actions/workflows/plone-package.yml/badge.svg - :target: https://github.com/collective/ploneconf.site/actions/workflows/plone-package.yml - -.. image:: https://coveralls.io/repos/github/collective/ploneconf.site/badge.svg?branch=main - :target: https://coveralls.io/github/collective/ploneconf.site?branch=main - :alt: Coveralls - -.. image:: https://codecov.io/gh/collective/ploneconf.site/branch/master/graph/badge.svg - :target: https://codecov.io/gh/collective/ploneconf.site - -.. image:: https://img.shields.io/pypi/v/ploneconf.site.svg - :target: https://pypi.python.org/pypi/ploneconf.site/ - :alt: Latest Version - -.. image:: https://img.shields.io/pypi/status/ploneconf.site.svg - :target: https://pypi.python.org/pypi/ploneconf.site - :alt: Egg Status - -.. image:: https://img.shields.io/pypi/pyversions/ploneconf.site.svg?style=plastic :alt: Supported - Python Versions - -.. image:: https://img.shields.io/pypi/l/ploneconf.site.svg - :target: https://pypi.python.org/pypi/ploneconf.site/ - :alt: License +.. image:: https://github.com/github/docs/actions/workflows/plone-package.yml/badge.svg + :target: https://github.com/collective/ploneconf.site/actions ============== ploneconf.site ============== -An add-on for Plone - -Features --------- - -- Can be bullet points - - -Examples --------- - -This add-on can be seen in action at the following sites: -- Is there a page on the internet where everybody can see the features? - - -Documentation -------------- - -Full documentation for end users can be found in the "docs" folder, and is also available online at http://docs.plone.org/foo/bar - - -Translations ------------- - -This product has been translated into - -- Klingon (thanks, K'Plai) - - -Installation ------------- - -Install ploneconf.site by adding it to your buildout:: - - [buildout] - - ... - - eggs = - ploneconf.site - - -and then running ``bin/buildout`` - - -Authors -------- - -Provided by awesome people ;) - - -Contributors ------------- - -Put your name here, you deserve it! - -- ? - - -Contribute ----------- - -- Issue Tracker: https://github.com/collective/ploneconf.site/issues -- Source Code: https://github.com/collective/ploneconf.site -- Documentation: https://docs.plone.org/foo/bar - - -Support -------- - -If you are having issues, please let us know. -We have a mailing list located at: project@example.com - - -License -------- +Plone backend add-on for training Mastering Plone Development -The project is licensed under the GPLv2. +https://training.plone.org/mastering-plone/installation.html diff --git a/setup.py b/setup.py index 596e1f3..0ab1716 100644 --- a/setup.py +++ b/setup.py @@ -5,16 +5,18 @@ from setuptools import setup -long_description = '\n\n'.join([ - open('README.rst').read(), - open('CONTRIBUTORS.rst').read(), - open('CHANGES.rst').read(), -]) +long_description = "\n\n".join( + [ + open("README.rst").read(), + open("CONTRIBUTORS.rst").read(), + open("CHANGES.rst").read(), + ] +) setup( - name='ploneconf.site', - version='1.0a1', + name="ploneconf.site", + version="1.0a1", description="An add-on for Plone", long_description=long_description, # Get more from https://pypi.org/classifiers/ @@ -30,39 +32,39 @@ "Operating System :: OS Independent", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)", ], - keywords='Python Plone CMS', - author='Katja Süss', - author_email='k.suess@rohberg.ch', - url='https://github.com/collective/ploneconf.site', + keywords="Python Plone CMS", + author="Katja Süss", + author_email="k.suess@rohberg.ch", + url="https://github.com/collective/ploneconf.site", project_urls={ - 'PyPI': 'https://pypi.python.org/pypi/ploneconf.site', - 'Source': 'https://github.com/collective/ploneconf.site', - 'Tracker': 'https://github.com/collective/ploneconf.site/issues', + "PyPI": "https://pypi.python.org/pypi/ploneconf.site", + "Source": "https://github.com/collective/ploneconf.site", + "Tracker": "https://github.com/collective/ploneconf.site/issues", # 'Documentation': 'https://ploneconf.site.readthedocs.io/en/latest/', }, - license='GPL version 2', - packages=find_packages('src', exclude=['ez_setup']), - namespace_packages=['ploneconf'], - package_dir={'': 'src'}, + license="GPL version 2", + packages=find_packages("src", exclude=["ez_setup"]), + namespace_packages=["ploneconf"], + package_dir={"": "src"}, include_package_data=True, zip_safe=False, python_requires=">=3.8", install_requires=[ - 'setuptools', + "setuptools", # -*- Extra requirements: -*- - 'z3c.jbot', - 'plone.api>=1.8.4', - 'plone.app.dexterity', + "z3c.jbot", + "plone.api>=1.8.4", + "plone.app.dexterity", ], extras_require={ - 'test': [ - 'plone.app.testing', + "test": [ + "plone.app.testing", # Plone KGS does not use this version, because it would break # Remove if your package shall be part of coredev. # plone_coredev tests as of 2016-04-01. - 'plone.testing>=5.0.0', - 'plone.app.contenttypes', - 'plone.app.robotframework[debug]', + "plone.testing>=5.0.0", + "plone.app.contenttypes", + "plone.app.robotframework[debug]", ], }, entry_points=""" diff --git a/src/ploneconf/site/content/talk.py b/src/ploneconf/site/content/talk.py index 07ff876..fe23a7c 100644 --- a/src/ploneconf/site/content/talk.py +++ b/src/ploneconf/site/content/talk.py @@ -16,7 +16,7 @@ class ITalk(model.Schema): directives.widget(type_of_talk=RadioFieldWidget) type_of_talk = schema.Choice( title="Type of talk", - vocabulary='ploneconf.types_of_talk', + vocabulary="ploneconf.types_of_talk", required=True, ) @@ -30,7 +30,7 @@ class ITalk(model.Schema): directives.widget(audience=CheckBoxFieldWidget) audience = schema.Set( title="Audience", - value_type=schema.Choice(vocabulary='ploneconf.audiences'), + value_type=schema.Choice(vocabulary="ploneconf.audiences"), required=False, ) @@ -79,8 +79,8 @@ class ITalk(model.Schema): ) room = schema.Choice( - title='Room', - vocabulary='ploneconf.rooms', + title="Room", + vocabulary="ploneconf.rooms", required=False, )