WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
#
# EditorConfig Configuration file, for more details see:
# http://EditorConfig.org
# https://EditorConfig.org
# EditorConfig is a convention description, that could be interpreted
# by multiple editors to enforce common coding conventions for specific
# file types
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
name: linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
- uses: actions/checkout@v5
- uses: actions/setup-python@v6
with:
python-version: 3.x
python-version: '3.13'
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd #v3.0.1
with:
extra_args: --all-files --show-diff-on-failure
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,30 @@ jobs:
config:
# [Python version, tox env]
- ["3.11", "release-check"]
- ["3.9", "py39"]
- ["3.10", "py310"]
- ["3.11", "py311"]
- ["3.12", "py312"]
- ["3.13", "py313"]
- ["3.14", "py314"]
- ["3.11", "docs"]
- ["3.11", "coverage"]

runs-on: ${{ matrix.os[1] }}
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
name: ${{ matrix.config[1] }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5
with:
persist-credentials: false
- name: Install uv + caching
uses: astral-sh/setup-uv@v5
# astral/[email protected]
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3
with:
enable-cache: true
cache-dependency-glob: |
setup.*
tox.ini
python-version: ${{ matrix.matrix.config[0] }}
python-version: ${{ matrix.config[0] }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Test
if: ${{ !startsWith(runner.os, 'Mac') }}
Expand Down
3 changes: 2 additions & 1 deletion .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "a0de4e93"
commit-id = "9fcd3d67"

[python]
with-pypy = false
Expand Down Expand Up @@ -39,6 +39,7 @@ additional-rules = [
additional-ignores = [
"docs/_build/html/_sources/narrative/*",
"docs/_build/html/_sources/api/*",
"docs/_build/html/_static/scripts/*",
]

[tox]
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
minimum_pre_commit_version: '3.6'
repos:
- repo: https://github.com/pycqa/isort
rev: "6.0.1"
rev: "7.0.0"
hooks:
- id: isort
- repo: https://github.com/hhatto/autopep8
Expand All @@ -12,16 +12,16 @@ repos:
- id: autopep8
args: [--in-place, --aggressive, --aggressive]
- repo: https://github.com/asottile/pyupgrade
rev: v3.19.1
rev: v3.21.0
hooks:
- id: pyupgrade
args: [--py39-plus]
args: [--py310-plus]
- repo: https://github.com/isidentical/teyit
rev: 0.4.3
hooks:
- id: teyit
- repo: https://github.com/PyCQA/flake8
rev: "7.1.2"
rev: "7.3.0"
hooks:
- id: flake8
additional_dependencies:
Expand Down
7 changes: 3 additions & 4 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ Products.DCWorkflow Changelog
3.1 (unreleased)
----------------

- Add support for Python 3.13.
- Switch to PEP 420 native namespace.

- Drop support for Python 3.8.
- Add support for Python 3.12, 3.13 and 3.14.

- Add support for Python 3.12.
- Drop support for Python 3.7, 3.8 and 3.9.

- Drop support for Python 3.7.

3.0 (2023-02-02)
----------------
Expand Down
28 changes: 9 additions & 19 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,12 @@
import datetime
import os
import sys
from importlib.metadata import distribution

import pkginfo

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.append(os.path.abspath('.'))
import Products


Products.__path__.append(os.path.abspath('../Products'))
year = datetime.datetime.now().year
sys.path.append(os.path.abspath('../src'))
rqmt = distribution('Products.DCWorkflow')

# -- General configuration -----------------------------------------------

Expand All @@ -51,22 +46,17 @@
master_doc = 'index'

# General information about the project.
parent = os.path.dirname(os.path.dirname(__file__))
parent_dir = os.path.abspath(parent)
sys.path.append(parent_dir)
pkg_info = pkginfo.Develop(parent_dir)
year = datetime.datetime.now().year
project = '%s' % pkg_info.name
copyright = '%s, CMF Developers' % year
project = 'Products.DCWorkflow'
copyright = f'2010-{year}, CMF Developers'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = pkg_info.version.replace('dev', '')
version = '%s.%s' % tuple(map(int, rqmt.version.split('.')[:2]))
# The full version, including alpha/beta/rc tags.
release = pkg_info.version
release = rqmt.version

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -109,7 +99,7 @@

# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
html_theme = 'default'
html_theme = 'furo'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Sphinx
pkginfo
furo
repoze.sphinx.autointerface
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

[build-system]
requires = [
"setuptools == 75.8.2",
"setuptools >= 78.1.1,< 81",
"wheel",
]
build-backend = "setuptools.build_meta"
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ignore =
docs/_build/html/_sources/*
docs/_build/html/_sources/narrative/*
docs/_build/html/_sources/api/*
docs/_build/html/_static/scripts/*

[isort]
force_single_line = True
Expand Down
13 changes: 3 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import os

from setuptools import find_packages
from setuptools import setup


Expand All @@ -26,11 +25,11 @@ def _package_doc(name):
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: 3.13',
'Programming Language :: Python :: 3.14',
'Topic :: Software Development',
'Topic :: Software Development :: Libraries'
' :: Application Frameworks',
Expand All @@ -45,22 +44,16 @@ def _package_doc(name):
'Sources': 'https://github.com/zopefoundation/Products.DCWorkflow',
},
license='ZPL-2.1',
packages=find_packages('src'),
package_dir={'': 'src'},
include_package_data=True,
namespace_packages=['Products'],
zip_safe=False,
python_requires='>=3.9',
python_requires='>=3.10',
install_requires=[
'setuptools',
'Zope >= 5.0',
'Products.CMFCore >= 2.4.0',
'Products.ExternalMethod',
'Products.GenericSetup >= 2.0b1',
'Products.PythonScripts',
],
extras_require={
'docs': ['Sphinx', 'repoze.sphinx.autointerface', 'pkginfo']
'docs': ['Sphinx', 'repoze.sphinx.autointerface', 'furo']
},
entry_points=f"""
[zope2.initialize]
Expand Down
1 change: 0 additions & 1 deletion src/Products/__init__.py

This file was deleted.

8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ minversion = 3.18
envlist =
release-check
lint
py39
py310
py311
py312
py313
py314
docs
coverage

[testenv]
skip_install = true
deps =
setuptools == 75.8.2
setuptools >= 78.1.1,< 81
zc.buildout
wheel
setenv =
Expand All @@ -38,7 +38,7 @@ description = ensure that the distribution is ready to release
basepython = python3
skip_install = true
deps =
setuptools == 75.8.2
setuptools >= 78.1.1,< 81
wheel
twine
build
Expand All @@ -48,7 +48,7 @@ deps =
commands_pre =
commands =
check-manifest
check-python-versions --only setup.py,tox.ini,.github/workflows/tests.yml
check-python-versions --only pyproject.toml,setup.py,tox.ini,.github/workflows/tests.yml
python -m build --sdist --no-isolation
twine check dist/*

Expand Down
Loading