Skip to content

Commit

Permalink
Attempt to fix tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
david-batranu committed Dec 20, 2024
1 parent 6a29626 commit 49f2176
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 77 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/plone-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
plone-version:
- 'Plone52'
- 'Plone60'
python-version: [3.7, 3.8, 3.9]
python-version: [3.12]

steps:
- uses: actions/setup-python@v4
with:
python-version: '3.9'
python-version: '3.12'
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
Expand Down Expand Up @@ -58,8 +58,3 @@ jobs:
env:
PLONE-VERSION: ${{ matrix.plone-version }}
PYTHON-VERSION: ${{ matrix.python-version }}
- name: "Upload coverage to Codecov"
uses: "codecov/codecov-action@v3"
with:
fail_ci_if_error: true
if: matrix.python-version == '3.7'
58 changes: 30 additions & 28 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='pas.plugins.eea',
version='1.0a1',
name="pas.plugins.eea",
version="1.0a1",
description="Provides user and group enumeration on top of pas.plugins.authomatic",
long_description=long_description,
# Get more from https://pypi.org/classifiers/
Expand All @@ -31,40 +33,40 @@
"Operating System :: OS Independent",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
],
keywords='Python Plone CMS',
author='David Bătrânu',
author_email='[email protected]',
url='https://github.com/collective/pas.plugins.eea',
keywords="Python Plone CMS",
author="David Bătrânu",
author_email="[email protected]",
url="https://github.com/collective/pas.plugins.eea",
project_urls={
'PyPI': 'https://pypi.org/project/pas.plugins.eea/',
'Source': 'https://github.com/collective/pas.plugins.eea',
'Tracker': 'https://github.com/collective/pas.plugins.eea/issues',
"PyPI": "https://pypi.org/project/pas.plugins.eea/",
"Source": "https://github.com/collective/pas.plugins.eea",
"Tracker": "https://github.com/collective/pas.plugins.eea/issues",
# 'Documentation': 'https://pas.plugins.eea.readthedocs.io/en/latest/',
},
license='GPL version 2',
packages=find_packages('src', exclude=['ez_setup']),
namespace_packages=['pas', 'pas.plugins'],
package_dir={'': 'src'},
license="GPL version 2",
packages=find_packages("src", exclude=["ez_setup"]),
namespace_packages=["pas", "pas.plugins"],
package_dir={"": "src"},
include_package_data=True,
zip_safe=False,
python_requires=">=3.7",
install_requires=[
'setuptools',
"setuptools",
# -*- Extra requirements: -*-
'z3c.jbot',
'plone.api>=1.8.4',
'plone.app.dexterity',
'pas.plugins.authomatic',
"z3c.jbot",
"plone.api>=1.8.4",
"plone.app.dexterity",
"pas.plugins.authomatic",
],
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="""
Expand Down
50 changes: 8 additions & 42 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
min_version = 4.11.0

envlist =
py37-lint,
py38-lint,
py39-lint,
py310-lint,
py312-lint,
black-check,
py{38,37}-Plone{52},
py{39,310}-Plone{60},
py312-Plone{60},
# docs,
# coverage-report,

Expand All @@ -18,16 +14,11 @@ skip_missing_interpreters = True

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38
3.9: py39
3.10: py310
3.12: py312


[gh-actions:env]
PLONE-VERSION =
Plone52: Plone52
Plone60: Plone60


Expand All @@ -48,12 +39,9 @@ commands =
setenv =
COVERAGE_FILE=.coverage.{envname}
# version_file=test_plone60.cfg
Plone52: version_file=test_plone52.cfg
Plone60: version_file=test_plone60.cfg

deps =
Plone52: -rrequirements_plone52.txt
# Plone52: -cconstraints_plone52.txt
Plone60: -rrequirements_plone60.txt
# Plone60: -cconstraints_plone60.txt
coverage
Expand All @@ -62,7 +50,7 @@ deps =
[testenv:coverage-report]
skip_install = true
usedevelop = True
basepython = python3.9
basepython = python3.12

deps =
coverage
Expand Down Expand Up @@ -130,7 +118,7 @@ commands =


[testenv:black-check]
basepython = python3.9
basepython = python3.12
skip_install = True
deps =
-cconstraints.txt
Expand All @@ -141,7 +129,7 @@ commands =


[testenv:black-enforce]
basepython = python3.9
basepython = python3.12
skip_install = True
deps =
-cconstraints.txt
Expand All @@ -150,30 +138,8 @@ deps =
commands =
black -v src setup.py


[testenv:py37-lint]
basepython = python3.7
skip_install = true
deps = {[lint]deps}
commands = {[lint]commands}
allowlist_externals = {[lint]allowlist_externals}

[testenv:py38-lint]
basepython = python3.8
skip_install = true
deps = {[lint]deps}
commands = {[lint]commands}
allowlist_externals = {[lint]allowlist_externals}

[testenv:py39-lint]
basepython = python3.9
skip_install = true
deps = {[lint]deps}
commands = {[lint]commands}
allowlist_externals = {[lint]allowlist_externals}

[testenv:py310-lint]
basepython = python3.10
[testenv:py312-lint]
basepython = python3.12
skip_install = true
deps = {[lint]deps}
commands = {[lint]commands}
Expand Down

0 comments on commit 49f2176

Please sign in to comment.