oship-dev team mailing list archive
-
oship-dev team
-
Mailing list archive
-
Message #01680
[Branch ~oship-dev/oship/devel] Rev 527: Now the modularization process is complete. The archetype mode are separated into different packa...
Merge authors:
Diego Manhães Pinheiro (dmpinheiro)
Related merge proposals:
https://code.launchpad.net/~dmpinheiro/oship/module-reorganization/+merge/44276
proposed by: Diego Manhães Pinheiro (dmpinheiro)
review: Approve - Diego Manhães Pinheiro (dmpinheiro)
------------------------------------------------------------
revno: 527 [merge]
committer: Diego Manhães Pinheiro <me@xxxxxxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-12-20 19:29:14 -0200
message:
Now the modularization process is complete. The archetype mode are separated into different packages: oship.openrhr.am and oship.openehr.rm, respectively
removed:
src/oship.openehr/
src/oship.openehr/setup.py
added:
src/oship.openehr.am/
src/oship.openehr.am/setup.py
src/oship.openehr.am/src/
src/oship.openehr.am/src/__init__.py
src/oship.openehr.am/src/oship/
src/oship.openehr.am/src/oship/__init__.py
src/oship.openehr.am/src/oship/openehr/
src/oship.openehr.am/src/oship/openehr/__init__.py
src/oship.openehr.am/src/oship/openehr/am/configure.zcml
src/oship.openehr.am/src/oship/openehr/am/ftesting.zcml
src/oship.openehr.am/src/oship/openehr/am/tests.py
src/oship.openehr.rm/
src/oship.openehr.rm/setup.py
renamed:
src/oship.openehr/src/ => src/oship.openehr.rm/src/
src/oship.openehr/src/oship/openehr/am/ => src/oship.openehr.am/src/oship/openehr/am/
src/oship.openehr/src/oship/openehr/configure.zcml => src/oship.openehr.rm/src/oship/openehr/rm/configure.zcml
src/oship.openehr/src/oship/openehr/ftesting.zcml => src/oship.openehr.rm/src/oship/openehr/rm/ftesting.zcml
src/oship.openehr/src/oship/openehr/tests.py => src/oship.openehr.rm/src/oship/openehr/rm/tests.py
modified:
buildout.cfg
etc/site.zcml.in
src/oship.app/setup.py
src/oship.openehr.rm/src/oship/openehr/__init__.py
src/oship.openehr.rm/src/oship/openehr/rm/support/terminology/tests/terminology_service.py
src/oship.parser/setup.py
src/oship.openehr.rm/src/oship/openehr/rm/ftesting.zcml
src/oship.openehr.rm/src/oship/openehr/rm/tests.py
--
lp:oship
https://code.launchpad.net/~oship-dev/oship/devel
Your team OSHIP Development Team is subscribed to branch lp:oship.
To unsubscribe from this branch go to https://code.launchpad.net/~oship-dev/oship/devel/+edit-subscription
=== modified file 'buildout.cfg'
--- buildout.cfg 2010-12-16 23:20:19 +0000
+++ buildout.cfg 2010-12-20 19:50:27 +0000
@@ -3,7 +3,8 @@
develop =
src/oship.app
src/oship.parser
- src/oship.openehr
+ src/oship.openehr.am
+ src/oship.openehr.rm
src/loinc
src/oeterm
src/rxterms
@@ -55,8 +56,8 @@
eggs =
oship.app
- oship.parser
- oship.openehr
+ oship.openehr.rm
+ oship.openehr.am
egenix-mx-base
loinc
oeterm
=== modified file 'etc/site.zcml.in'
--- etc/site.zcml.in 2010-12-16 23:20:19 +0000
+++ etc/site.zcml.in 2010-12-20 19:50:27 +0000
@@ -2,7 +2,8 @@
i18n_domain="oship">
<include package="oship.app" />
- <include package="oship.openehr" />
+ <include package="oship.openehr.am" />
+ <include package="oship.openehr.rm" />
<include package="bptrack" />
<include package="dsedemo" />
=== modified file 'src/oship.app/setup.py'
--- src/oship.app/setup.py 2010-12-16 23:20:19 +0000
+++ src/oship.app/setup.py 2010-12-20 19:50:27 +0000
@@ -31,9 +31,9 @@
'megrok.resource',
'megrok.layout',
'megrok.navigation',
- #'megrok.pagetemplate',
'oship.parser',
- 'oship.openehr',
+ 'oship.openehr.rm',
+ 'oship.openehr.am',
'loinc',
'oeterm',
'rxterms',
=== removed directory 'src/oship.openehr'
=== added directory 'src/oship.openehr.am'
=== added file 'src/oship.openehr.am/setup.py'
--- src/oship.openehr.am/setup.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/setup.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,26 @@
+from setuptools import setup, find_packages
+
+version = '0.5'
+
+setup(name='oship.openehr.am',
+ version=version,
+ description="OSHIP",
+ long_description="""Open Source Health Information Platform\
+""",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+ classifiers=[],
+ keywords="EHR,EMR,Healthcare,Python,MLHIM,openEHR",
+ author="Timothy Cook & Contributors",
+ author_email="timothywayne.cook@xxxxxxxxx",
+ url="http://www.oship.org";,
+ license="MPL1.1",
+ package_dir={'': 'src'},
+ packages=find_packages('src'),
+ namespace_packages=['oship','oship.openehr'],
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=['setuptools',
+ 'grok',
+ 'z3c.testsetup',
+ ],
+ )
=== added directory 'src/oship.openehr.am/src'
=== added file 'src/oship.openehr.am/src/__init__.py'
--- src/oship.openehr.am/src/__init__.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/__init__.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,8 @@
+# this is a namespace package
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
+
=== added directory 'src/oship.openehr.am/src/oship'
=== added file 'src/oship.openehr.am/src/oship/__init__.py'
--- src/oship.openehr.am/src/oship/__init__.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/oship/__init__.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,9 @@
+# this is a namespace package
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
+
+
=== added directory 'src/oship.openehr.am/src/oship/openehr'
=== added file 'src/oship.openehr.am/src/oship/openehr/__init__.py'
--- src/oship.openehr.am/src/oship/openehr/__init__.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/oship/openehr/__init__.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,10 @@
+# this is a namespace package
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
+
+
+
=== renamed directory 'src/oship.openehr/src/oship/openehr/am' => 'src/oship.openehr.am/src/oship/openehr/am'
=== added file 'src/oship.openehr.am/src/oship/openehr/am/configure.zcml'
--- src/oship.openehr.am/src/oship/openehr/am/configure.zcml 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/oship/openehr/am/configure.zcml 2010-12-20 19:50:27 +0000
@@ -0,0 +1,6 @@
+<configure xmlns="http://namespaces.zope.org/zope";
+ xmlns:grok="http://namespaces.zope.org/grok";>
+ <include package="grok" />
+ <includeDependencies package="."/>
+ <grok:grok package="." />
+</configure>
=== added file 'src/oship.openehr.am/src/oship/openehr/am/ftesting.zcml'
--- src/oship.openehr.am/src/oship/openehr/am/ftesting.zcml 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/oship/openehr/am/ftesting.zcml 2010-12-20 19:50:27 +0000
@@ -0,0 +1,34 @@
+<configure
+ xmlns="http://namespaces.zope.org/zope";
+ i18n_domain="oship.openehr.am"
+ package="oship.openehr.am"
+ >
+
+ <include package="oship.openehr.am" />
+
+ <!-- Typical functional testing security setup -->
+ <securityPolicy
+ component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"
+ />
+
+ <unauthenticatedPrincipal
+ id="zope.anybody"
+ title="Unauthenticated User"
+ />
+ <grant
+ permission="zope.View"
+ principal="zope.anybody"
+ />
+
+ <principal
+ id="zope.mgr"
+ title="Manager"
+ login="mgr"
+ password="mgrpw"
+ />
+
+ <role id="zope.Manager" title="Site Manager" />
+ <grantAll role="zope.Manager" />
+ <grant role="zope.Manager" principal="zope.mgr" />
+
+</configure>
=== added file 'src/oship.openehr.am/src/oship/openehr/am/tests.py'
--- src/oship.openehr.am/src/oship/openehr/am/tests.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.am/src/oship/openehr/am/tests.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,12 @@
+import os.path
+import z3c.testsetup
+import oship.openehr.am
+from zope.app.testing.functional import ZCMLLayer
+
+
+ftesting_zcml = os.path.join(
+ os.path.dirname(oship.openehr.am.__file__), 'ftesting.zcml')
+FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
+ allow_teardown=True)
+
+test_suite = z3c.testsetup.register_all_tests('oship.openehr.am')
=== added directory 'src/oship.openehr.rm'
=== added file 'src/oship.openehr.rm/setup.py'
--- src/oship.openehr.rm/setup.py 1970-01-01 00:00:00 +0000
+++ src/oship.openehr.rm/setup.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,26 @@
+from setuptools import setup, find_packages
+
+version = '0.5'
+
+setup(name='oship.openehr.rm',
+ version=version,
+ description="OSHIP",
+ long_description="""Open Source Health Information Platform\
+""",
+ # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
+ classifiers=[],
+ keywords="EHR,EMR,Healthcare,Python,MLHIM,openEHR",
+ author="Timothy Cook & Contributors",
+ author_email="timothywayne.cook@xxxxxxxxx",
+ url="http://www.oship.org";,
+ license="MPL1.1",
+ package_dir={'': 'src'},
+ packages=find_packages('src'),
+ namespace_packages=['oship','oship.openehr'],
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=['setuptools',
+ 'grok',
+ 'z3c.testsetup',
+ ],
+ )
=== renamed directory 'src/oship.openehr/src' => 'src/oship.openehr.rm/src'
=== modified file 'src/oship.openehr.rm/src/oship/openehr/__init__.py'
--- src/oship.openehr/src/oship/openehr/__init__.py 2010-08-06 21:24:11 +0000
+++ src/oship.openehr.rm/src/oship/openehr/__init__.py 2010-12-20 19:50:27 +0000
@@ -0,0 +1,8 @@
+# this is a namespace package
+try:
+ import pkg_resources
+ pkg_resources.declare_namespace(__name__)
+except ImportError:
+ import pkgutil
+ __path__ = pkgutil.extend_path(__path__, __name__)
+
=== renamed file 'src/oship.openehr/src/oship/openehr/configure.zcml' => 'src/oship.openehr.rm/src/oship/openehr/rm/configure.zcml'
=== renamed file 'src/oship.openehr/src/oship/openehr/ftesting.zcml' => 'src/oship.openehr.rm/src/oship/openehr/rm/ftesting.zcml'
--- src/oship.openehr/src/oship/openehr/ftesting.zcml 2010-12-16 23:33:46 +0000
+++ src/oship.openehr.rm/src/oship/openehr/rm/ftesting.zcml 2010-12-20 19:50:27 +0000
@@ -1,10 +1,10 @@
<configure
xmlns="http://namespaces.zope.org/zope";
- i18n_domain="oship.openehr"
- package="oship.openehr"
+ i18n_domain="oship.openehr.rm"
+ package="oship.openehr.rm"
>
- <include package="oship.openehr" />
+ <include package="oship.openehr.rm" />
<!-- Typical functional testing security setup -->
<securityPolicy
=== modified file 'src/oship.openehr.rm/src/oship/openehr/rm/support/terminology/tests/terminology_service.py'
--- src/oship.openehr/src/oship/openehr/rm/support/terminology/tests/terminology_service.py 2010-12-16 23:33:46 +0000
+++ src/oship.openehr.rm/src/oship/openehr/rm/support/terminology/tests/terminology_service.py 2010-12-20 19:50:27 +0000
@@ -10,7 +10,7 @@
from grok.testing import grok_component
from zope.app.testing.functional import FunctionalTestCase
from zope.component import getGlobalSiteManager, getAllUtilitiesRegisteredFor
-from oship.openehr.tests import FunctionalLayer
+from oship.openehr.rm.tests import FunctionalLayer
from oship.openehr.rm.support.terminology.interfaces import (ITerminologyAccess,
ICodeSetAccess,)
from oship.openehr.rm.support.terminology import TerminologyService
=== renamed file 'src/oship.openehr/src/oship/openehr/tests.py' => 'src/oship.openehr.rm/src/oship/openehr/rm/tests.py'
--- src/oship.openehr/src/oship/openehr/tests.py 2010-12-16 23:20:19 +0000
+++ src/oship.openehr.rm/src/oship/openehr/rm/tests.py 2010-12-20 19:50:27 +0000
@@ -1,12 +1,12 @@
import os.path
import z3c.testsetup
-import oship.openehr
+import oship.openehr.rm
from zope.app.testing.functional import ZCMLLayer
ftesting_zcml = os.path.join(
- os.path.dirname(oship.openehr.__file__), 'ftesting.zcml')
+ os.path.dirname(oship.openehr.rm.__file__), 'ftesting.zcml')
FunctionalLayer = ZCMLLayer(ftesting_zcml, __name__, 'FunctionalLayer',
allow_teardown=True)
-test_suite = z3c.testsetup.register_all_tests('oship.openehr')
+test_suite = z3c.testsetup.register_all_tests('oship.openehr.rm')
=== removed file 'src/oship.openehr/setup.py'
--- src/oship.openehr/setup.py 2010-12-16 23:20:19 +0000
+++ src/oship.openehr/setup.py 1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-from setuptools import setup, find_packages
-
-version = '0.5'
-
-setup(name='oship.openehr',
- version=version,
- description="OSHIP",
- long_description="""Open Source Health Information Platform\
-""",
- # Get strings from http://www.python.org/pypi?%3Aaction=list_classifiers
- classifiers=[],
- keywords="EHR,EMR,Healthcare,Python,MLHIM,openEHR",
- author="Timothy Cook & Contributors",
- author_email="timothywayne.cook@xxxxxxxxx",
- url="http://www.oship.org";,
- license="MPL1.1",
- package_dir={'': 'src'},
- packages=find_packages('src'),
- namespace_packages=['oship'],
- include_package_data=True,
- zip_safe=False,
- install_requires=['setuptools',
- 'grok',
- 'z3c.testsetup',
- 'pyparsing',
- ],
- )
=== modified file 'src/oship.parser/setup.py'
--- src/oship.parser/setup.py 2010-12-16 23:20:19 +0000
+++ src/oship.parser/setup.py 2010-12-20 19:50:27 +0000
@@ -22,7 +22,7 @@
install_requires=['setuptools',
'grok',
'z3c.testsetup',
- 'oship.openehr',
+ 'oship.openehr.rm',
'pyparsing',
'mglob',
],
