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
4 changes: 2 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Changes
=======

4.2 (unreleased)
5.0 (unreleased)
----------------

- Nothing changed yet.
- Replace ``pkg_resources`` namespace with PEP 420 native namespace.


4.1 (2025-05-27)
Expand Down
6 changes: 1 addition & 5 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 @@ -24,7 +23,7 @@ def read(*rnames):

setup(
name='grokcore.site',
version='4.2.dev0',
version='5.0.dev0',
author='Grok Team',
author_email='zope-dev@zope.dev',
url='https://github.com/zopefoundation/grokcore.site',
Expand All @@ -46,9 +45,6 @@ def read(*rnames):
'Programming Language :: Python :: Implementation :: PyPy',
'Programming Language :: Python',
],
packages=find_packages('src'),
package_dir={'': 'src'},
namespace_packages=['grokcore'],
include_package_data=True,
zip_safe=False,
python_requires='>=3.9',
Expand Down
7 changes: 0 additions & 7 deletions src/grokcore/__init__.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/grokcore/site/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#
##############################################################################

from grokcore.component import * # noqa: F401, F403
from zope.component.hooks import getSite # noqa: F401

import grokcore.site.testing # noqa: F401
from grokcore.component import * # noqa: F401, F403
from grokcore.site.components import Application # noqa: F401
from grokcore.site.components import LocalUtility # noqa: F401
from grokcore.site.components import Site # noqa: F401
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/site/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
#
##############################################################################

from grokcore.component.interfaces import IContext
from persistent import Persistent
from zope.annotation.interfaces import IAttributeAnnotatable
from zope.container.contained import Contained
from zope.interface import implementer
from zope.site.site import SiteManagerContainer

from grokcore.component.interfaces import IContext
from grokcore.site.interfaces import IApplication


Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/site/directive.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"""Grok directives.
"""

import grokcore.component
import martian
from martian import util
from martian.error import GrokImportError
from zope import interface
from zope.interface.interfaces import IInterface

import grokcore.component
from grokcore.site.components import LocalUtility


Expand Down
3 changes: 1 addition & 2 deletions src/grokcore/site/interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@
#
##############################################################################

from grokcore.component.interfaces import IGrokcoreComponentAPI
from zope.interface import Attribute
from zope.interface import Interface
from zope.interface import implementer
from zope.interface.interfaces import IObjectEvent

from grokcore.component.interfaces import IGrokcoreComponentAPI


class IApplication(Interface):
"""Interface to mark the local site used as application root.
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/site/meta.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
#
##############################################################################

import grokcore.component
import martian
from martian.error import GrokError
from zope import component
from zope.container.interfaces import IContainer
from zope.container.interfaces import INameChooser
from zope.lifecycleevent.interfaces import IObjectAddedEvent

import grokcore.component
import grokcore.site
import grokcore.site.components
import grokcore.site.interfaces
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/site/subscriber.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#
##############################################################################

import grokcore.component
from zope.lifecycleevent.interfaces import IObjectAddedEvent
from zope.site import LocalSiteManager

import grokcore.component
from grokcore.site.components import Site


Expand Down
3 changes: 1 addition & 2 deletions src/grokcore/site/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@
##############################################################################
"""Grok test helpers
"""
from zope.configuration.config import ConfigurationMachine

from grokcore.component import zcml
from zope.configuration.config import ConfigurationMachine


def grok(module_name):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@

"""
import grokcore.content

import grokcore.site


Expand Down