Merge 13c9680 into a313f25

CHANGES.rst

@@ -18,6 +18,11 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
   native ``str`` on both Python versions.
   (`#265 <https://github.com/zopefoundation/Zope/pull/265>`_)
 
+- Inlcude the ``zmi.styles`` repository in this package to break a circular
+  dependency.
+  (`#307 <https://github.com/zopefoundation/Zope/pull/307>`_)
+
+
 4.0b5 (2018-05-18)
 ------------------
 

buildout.cfg

@@ -19,7 +19,6 @@ parts =
     requirements
 sources-dir = develop
 auto-checkout =
-    zmi.styles
     Persistence
     AccessControl
     Products.BTreeFolder2

docs/ZMI.rst

@@ -12,7 +12,7 @@ Bootstrap ZMI
 
 Since Zope 4.0b6 the ZMI is styled using Bootstrap. The previously used
 GIF icons were replaced by font glyphs which are stored in the package
-`zmi.styles`_ together with the CSS and JavaScript needed by Bootstrap.
+`zmi.styles`_ (part of Zope) together with the CSS and JavaScript needed by Bootstrap.
 
 The free Font Awesome glyphs are used as icons, see the table of
 `available icons`_.
@@ -29,7 +29,7 @@ Example to use the info icon (i in a circle)::
 
     zmi_icon = 'fas fa-info-circle'
 
-.. _`zmi.styles` : https://github.com/zopefoundation/zmi.styles
+.. _`zmi.styles` : https://github.com/zopefoundation/Zope/tree/master/src/zmi/styles
 .. _`available icons` : https://fontawesome.com/icons?d=gallery&m=free
 
 Use custom icons and resources

requirements-full.txt

@@ -27,6 +27,7 @@ Zope2==4.0b1
 five.globalrequest==99.1
 five.localsitemanager==3.1
 funcsigs==1.0.2
+future==0.16.0
 ipaddress==1.0.22
 mock==2.0.0
 pbr==4.0.3

setup.py

@@ -55,7 +55,7 @@ def _read_file(filename):
         "Topic :: Software Development :: Libraries :: Application Frameworks",
     ],
     packages=find_packages('src'),
-    namespace_packages=['Products', 'Shared', 'Shared.DC'],
+    namespace_packages=['Products', 'Shared', 'Shared.DC', 'zmi'],
     package_dir={'': 'src'},
     install_requires=[
         'AccessControl >= 4.0b4',
@@ -77,7 +77,6 @@ def _read_file(filename):
         'waitress',
         'zExceptions >= 3.4',
         'z3c.pt',
-        'zmi.styles',
         'zope.browser',
         'zope.browsermenu',
         'zope.browserpage >= 4.0',

sources.cfg

@@ -15,7 +15,6 @@ Persistence = git ${remotes:github}/Persistence pushurl=${remotes:github_push}/P
 RestrictedPython = git ${remotes:github}/RestrictedPython pushurl=${remotes:github_push}/RestrictedPython
 zExceptions = git ${remotes:github}/zExceptions pushurl=${remotes:github_push}/zExceptions
 zope.globalrequest = git ${remotes:github}/zope.globalrequest pushurl=${remotes:github_push}/zope.globalrequest
-zmi.styles = git ${remotes:github}/zmi.styles pushurl=${remotes:github_push}/zmi.styles
 
 # Optional dependencies
 five.localsitemanager = git ${remotes:github}/five.localsitemanager pushurl=${remotes:github_push}/five.localsitemanager

src/.gitignore

@@ -0,0 +1,24 @@
+*.egg-info
+*.py?
+.coverage
+.coverage.py*
+.installed*.cfg
+.mr.developer.cfg
+.project
+.pydevproject
+.tox
+/bin/
+/build/
+/develop-eggs/
+/develop/
+/dist/
+/docs/_build/
+/eggs/
+/etc/
+/htmlcov/
+/include/
+/lib/
+/log/
+/parts/
+/var/
+coverage.xml

src/.travis.yml

@@ -0,0 +1,29 @@
+language: python
+sudo: false
+python:
+    - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
+
+install:
+    - pip install six==1.10.0 # force here to avoid conflict with zc.recipe.testrunner
+    - pip install -U setuptools==33.1.1
+    - pip install coveralls coverage
+    - pip install zc.buildout
+    - buildout bootstrap
+    - buildout install test
+
+script:
+    - coverage run bin/test -v1
+after_success:
+    - coverage combine
+    - coveralls
+
+notifications:
+    email: false
+
+cache:
+  pip: true
+  directories:
+    - eggs/

src/zmi/__init__.py

@@ -0,0 +1 @@
+__import__('pkg_resources').declare_namespace(__name__)

src/zmi/styles/README.rst

@@ -0,0 +1,26 @@
+zmi.styles
+**********
+
+Introduction
+============
+
+This library packages the resources used to style the ZMI with 
+Bootstrap.
+
+It uses the `Font Awesome`_ font for the icons.
+
+.. _`Font Awesome`: https://fontawesome.com
+
+Contents
+========
+
+* Bootstrap CSS and JS
+* FontAwesome
+* jQuery
+* custom CSS and JS for the ZMI
+
+
+Usage
+=====
+
+See http://zope.readthedocs.io/en/latest/ZMI.html

src/zmi/styles/configure.zcml

@@ -0,0 +1,19 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:browser="http://namespaces.zope.org/browser">
+
+    <include package="Products.Five.browser" file="meta.zcml" />
+
+    <browser:resourceDirectory
+        name="zmi"
+        directory="resources" />
+
+    <subscriber
+        provides="App.interfaces.ICSSPaths"
+        factory=".subscriber.css_paths" />
+
+    <subscriber
+        provides="App.interfaces.IJSPaths"
+        factory=".subscriber.js_paths" />
+
+</configure>