You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bloodhound.apache.org by da...@apache.org on 2017/03/10 14:52:02 UTC
svn commit: r1786356 - in
/bloodhound/branches/bep_0011_batch_create_tickets: ./
bloodhound_dashboard/ bloodhound_multiproduct/ bloodhound_relations/
bloodhound_search/ bloodhound_theme/ installer/
Author: dammina
Date: Fri Mar 10 14:52:02 2017
New Revision: 1786356
URL: http://svn.apache.org/viewvc?rev=1786356&view=rev
Log:
Merging changes from the trunk.
Modified:
bloodhound/branches/bep_0011_batch_create_tickets/ (props changed)
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.py
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.py
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.py
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.py
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.py
bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.cfg
bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.py
Propchange: bloodhound/branches/bep_0011_batch_create_tickets/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 10 14:52:02 2017
@@ -1,4 +1,4 @@
/bloodhound/branches/bep_0003_multiproduct:1461360-1463488
/bloodhound/branches/bep_0010_ticket_numbering:1506462-1517786
-/bloodhound/trunk:1598681-1763083
+/bloodhound/trunk:1598681-1786355
/incubator/bloodhound/branches/bep_0003_multiproduct:1420073-1461359
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_dashboard/setup.py Fri Mar 10 14:52:02 2017
@@ -19,10 +19,8 @@
# under the License.
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+import sys
+from setuptools import setup
DESC = """Project dashboard for Apache(TM) Bloodhound.
@@ -39,83 +37,76 @@ versions = [
(0, 7, 0),
(0, 8, 0),
(0, 9, 0),
- ]
+]
latest = '.'.join(str(x) for x in versions[-1])
status = {
- 'planning' : "Development Status :: 1 - Planning",
- 'pre-alpha' : "Development Status :: 2 - Pre-Alpha",
- 'alpha' : "Development Status :: 3 - Alpha",
- 'beta' : "Development Status :: 4 - Beta",
- 'stable' : "Development Status :: 5 - Production/Stable",
- 'mature' : "Development Status :: 6 - Mature",
- 'inactive' : "Development Status :: 7 - Inactive"
- }
+ 'planning': "Development Status :: 1 - Planning",
+ 'pre-alpha': "Development Status :: 2 - Pre-Alpha",
+ 'alpha': "Development Status :: 3 - Alpha",
+ 'beta': "Development Status :: 4 - Beta",
+ 'stable': "Development Status :: 5 - Production/Stable",
+ 'mature': "Development Status :: 6 - Mature",
+ 'inactive': "Development Status :: 7 - Inactive"
+}
dev_status = status["alpha"]
cats = [
- dev_status,
- "Environment :: Plugins",
- "Environment :: Web Environment",
- "Framework :: Trac",
- "Intended Audience :: Developers",
- "Intended Audience :: Information Technology",
- "Intended Audience :: Other Audience",
- "Intended Audience :: System Administrators",
- "License :: Unknown",
- "Operating System :: OS Independent",
- "Programming Language :: Python",
- "Programming Language :: Python :: 2.5",
- "Programming Language :: Python :: 2.6",
- "Programming Language :: Python :: 2.7",
- "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
- "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
- "Topic :: Internet :: WWW/HTTP :: WSGI",
- "Topic :: Software Development :: Bug Tracking",
- "Topic :: Software Development :: Libraries :: Application Frameworks",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Topic :: Software Development :: User Interfaces",
- "Topic :: Software Development :: Widget Sets"
- ]
+ dev_status,
+ "Environment :: Plugins",
+ "Environment :: Web Environment",
+ "Framework :: Trac",
+ "Intended Audience :: Developers",
+ "Intended Audience :: Information Technology",
+ "Intended Audience :: Other Audience",
+ "Intended Audience :: System Administrators",
+ "License :: Unknown",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2.5",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
+ "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+ "Topic :: Internet :: WWW/HTTP :: WSGI",
+ "Topic :: Software Development :: Bug Tracking",
+ "Topic :: Software Development :: Libraries :: Application Frameworks",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Software Development :: User Interfaces",
+ "Topic :: Software Development :: Widget Sets"
+]
# Add the change log to the package description.
chglog = None
try:
from os.path import dirname, join
+
chglog = open(join(dirname(__file__), "CHANGES"))
- DESC+= ('\n\n' + chglog.read())
+ DESC += ('\n\n' + chglog.read())
finally:
if chglog:
chglog.close()
DIST_NM = 'BloodhoundDashboardPlugin'
-PKG_INFO = {'bhdashboard' : ('bhdashboard', # Package dir
- # Package data
- ['../CHANGES', '../TODO', '../COPYRIGHT',
- '../NOTICE', '../README', '../TESTING_README',
- 'htdocs/*.*', 'htdocs/css/*.css',
- 'htdocs/img/*.*', 'htdocs/js/*.js',
- 'templates/*', 'default-pages/*',
- 'locale/*/LC_MESSAGES/*.mo'],
- ),
- 'bhdashboard.widgets' : ('bhdashboard/widgets', # Package dir
- # Package data
- ['templates/*', 'htdocs/*.css'],
- ),
- 'bhdashboard.layouts' : ('bhdashboard/layouts', # Package dir
- # Package data
- ['templates/*'],
- ),
- 'bhdashboard.tests' : ('bhdashboard/tests', # Package dir
- # Package data
- ['data/**'],
- ),
- 'bhdashboard.util' : ('bhdashboard/util', # Package dir
- # Package data
- [],
- ),
- }
+PKG_INFO = {
+ 'bhdashboard': ('bhdashboard', # Package dir
+ ['../CHANGES', '../TODO', '../COPYRIGHT', # Package data
+ '../NOTICE', '../README', '../TESTING_README',
+ 'htdocs/*.*', 'htdocs/css/*.css',
+ 'htdocs/img/*.*', 'htdocs/js/*.js',
+ 'templates/*', 'default-pages/*',
+ 'locale/*/LC_MESSAGES/*.mo'],
+ ),
+ 'bhdashboard.widgets': ('bhdashboard/widgets', # Package dir
+ ['templates/*', 'htdocs/*.css']), # Package data
+ 'bhdashboard.layouts': ('bhdashboard/layouts', # Package dir
+ ['templates/*']), # Package data
+ 'bhdashboard.tests': ('bhdashboard/tests', # Package dir
+ ['data/**']), # Package data
+ 'bhdashboard.util': ('bhdashboard/util', # Package dir
+ []), # Package data
+}
ENTRY_POINTS = r"""
[trac.plugins]
@@ -134,13 +125,14 @@ ENTRY_POINTS = r"""
extra = {}
try:
from trac.util.dist import get_l10n_cmdclass
+
cmdclass = get_l10n_cmdclass()
if cmdclass:
extra['cmdclass'] = cmdclass
extractors = [
- ('**.py', 'trac.dist:extract_python', None),
+ ('**.py', 'trac.dist:extract_python', None),
('**/templates/**.html', 'genshi', None),
- ('**/templates/**.txt', 'genshi', {
+ ('**/templates/**.txt', 'genshi', {
'template_class': 'genshi.template:TextTemplate'
}),
]
@@ -154,20 +146,21 @@ setup(
name=DIST_NM,
version=latest,
description=DESC.split('\n', 1)[0],
- author = "Apache Bloodhound",
- license = "Apache License v2",
- url = "https://bloodhound.apache.org/",
- requires = ['trac'],
- tests_require = ['dutest>=0.2.4', 'TracXMLRPC'],
- package_dir = dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
- packages = PKG_INFO.keys(),
- package_data = dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
+ author="Apache Bloodhound",
+ license="Apache License v2",
+ url="https://bloodhound.apache.org/",
+ requires=['trac'],
+ tests_require=['dutest>=0.2.4', 'TracXMLRPC'] +
+ ['unittest2'] if sys.version_info < (2, 7) else [],
+ package_dir=dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
+ packages=PKG_INFO.keys(),
+ package_data=dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
include_package_data=True,
- provides = ['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
- obsoletes = ['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest) \
- for p in PKG_INFO.keys()],
- entry_points = ENTRY_POINTS,
- classifiers = cats,
- long_description= DESC,
+ provides=['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
+ obsoletes=['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest)
+ for p in PKG_INFO.keys()],
+ entry_points=ENTRY_POINTS,
+ classifiers=cats,
+ long_description=DESC,
**extra
- )
+)
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_multiproduct/setup.py Fri Mar 10 14:52:02 2017
@@ -18,16 +18,16 @@
# specific language governing permissions and limitations
# under the License.
-import sys, codecs
-from pkg_resources import parse_version
-from setuptools import setup
+import codecs
+import sys
+from setuptools import setup
# Force UTF-8 for stdout/err if --utf8 option is specified.
# For some reason python doesn't obey LANG/LC_CTYPE settings
# if output is not a terminal (e.g. pipes don't work).
if __name__ == '__main__':
- for ac,av in enumerate(sys.argv):
+ for ac, av in enumerate(sys.argv):
if av == '--utf8':
sys.stdout = codecs.getwriter('utf8')(sys.stdout)
sys.stderr = codecs.getwriter('utf8')(sys.stderr)
@@ -37,43 +37,46 @@ if __name__ == '__main__':
extra = {}
try:
from trac.util.dist import get_l10n_cmdclass
+except ImportError:
+ pass
+else:
cmdclass = get_l10n_cmdclass()
if cmdclass:
extra['cmdclass'] = cmdclass
extractors = [
- ('**.py', 'trac.dist:extract_python', None),
+ ('**.py', 'trac.dist:extract_python', None),
('**/templates/**.html', 'genshi', None),
- ('**/templates/**.txt', 'genshi', {
+ ('**/templates/**.txt', 'genshi', {
'template_class': 'genshi.template:TextTemplate'
}),
]
extra['message_extractors'] = {
'multiproduct': extractors,
}
-except ImportError:
- pass
+
setup(
- name = 'BloodhoundMultiProduct',
- version = '0.9.0',
- description = "Multiproduct support for Apache(TM) Bloodhound.",
- author = "Apache Bloodhound",
- license = "Apache License v2",
- url = "https://bloodhound.apache.org/",
- packages = ['multiproduct', 'multiproduct.ticket', 'multiproduct.util',
- 'tests',],
- package_data = {'multiproduct' : ['templates/*.html','locale/*/LC_MESSAGES/*.mo']},
- install_requires = ['sqlparse'],
- entry_points = {'trac.plugins': [
- 'multiproduct.model = multiproduct.model',
- 'multiproduct.perm = multiproduct.perm',
- 'multiproduct.product_admin = multiproduct.product_admin',
- 'multiproduct.ticket.batch = multiproduct.ticket.batch',
- 'multiproduct.ticket.query = multiproduct.ticket.query',
- 'multiproduct.ticket.web_ui = multiproduct.ticket.web_ui',
- 'multiproduct.web_ui = multiproduct.web_ui',
- ],},
+ name='BloodhoundMultiProduct',
+ version='0.9.0',
+ description="Multiproduct support for Apache(TM) Bloodhound.",
+ author="Apache Bloodhound",
+ license="Apache License v2",
+ url="https://bloodhound.apache.org/",
+ packages=['multiproduct', 'multiproduct.ticket', 'multiproduct.util',
+ 'tests', ],
+ package_data={
+ 'multiproduct': ['templates/*.html', 'locale/*/LC_MESSAGES/*.mo']},
+ install_requires=['sqlparse'],
+ entry_points={'trac.plugins': [
+ 'multiproduct.model = multiproduct.model',
+ 'multiproduct.perm = multiproduct.perm',
+ 'multiproduct.product_admin = multiproduct.product_admin',
+ 'multiproduct.ticket.batch = multiproduct.ticket.batch',
+ 'multiproduct.ticket.query = multiproduct.ticket.query',
+ 'multiproduct.ticket.web_ui = multiproduct.ticket.web_ui',
+ 'multiproduct.web_ui = multiproduct.web_ui',
+ ], },
test_suite='tests.test_suite',
- tests_require=['unittest2' if parse_version(sys.version) < parse_version('2.7') else ''],
+ tests_require=['unittest2'] if sys.version_info < (2, 7) else [],
**extra
)
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_relations/setup.py Fri Mar 10 14:52:02 2017
@@ -19,11 +19,7 @@
# under the License.
import sys
-from pkg_resources import parse_version
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+from setuptools import setup
DESC = """Ticket relations plugin for Apache(TM) Bloodhound.
@@ -37,65 +33,66 @@ versions = [
(0, 7, 0),
(0, 8, 0),
(0, 9, 0),
- ]
+]
latest = '.'.join(str(x) for x in versions[-1])
status = {
- 'planning' : "Development Status :: 1 - Planning",
- 'pre-alpha' : "Development Status :: 2 - Pre-Alpha",
- 'alpha' : "Development Status :: 3 - Alpha",
- 'beta' : "Development Status :: 4 - Beta",
- 'stable' : "Development Status :: 5 - Production/Stable",
- 'mature' : "Development Status :: 6 - Mature",
- 'inactive' : "Development Status :: 7 - Inactive"
- }
+ 'planning': "Development Status :: 1 - Planning",
+ 'pre-alpha': "Development Status :: 2 - Pre-Alpha",
+ 'alpha': "Development Status :: 3 - Alpha",
+ 'beta': "Development Status :: 4 - Beta",
+ 'stable': "Development Status :: 5 - Production/Stable",
+ 'mature': "Development Status :: 6 - Mature",
+ 'inactive': "Development Status :: 7 - Inactive"
+}
dev_status = status["alpha"]
cats = [
- dev_status,
- "Environment :: Plugins",
- "Environment :: Web Environment",
- "Framework :: Trac",
- "Intended Audience :: Developers",
- "Intended Audience :: Information Technology",
- "Intended Audience :: Other Audience",
- "Intended Audience :: System Administrators",
- "License :: Unknown",
- "Operating System :: OS Independent",
- "Programming Language :: Python",
- "Programming Language :: Python :: 2.5",
- "Programming Language :: Python :: 2.6",
- "Programming Language :: Python :: 2.7",
- "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
- "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
- "Topic :: Internet :: WWW/HTTP :: WSGI",
- "Topic :: Software Development :: Bug Tracking",
- "Topic :: Software Development :: Libraries :: Application Frameworks",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Topic :: Software Development :: User Interfaces",
- ]
+ dev_status,
+ "Environment :: Plugins",
+ "Environment :: Web Environment",
+ "Framework :: Trac",
+ "Intended Audience :: Developers",
+ "Intended Audience :: Information Technology",
+ "Intended Audience :: Other Audience",
+ "Intended Audience :: System Administrators",
+ "License :: Unknown",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2.5",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
+ "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+ "Topic :: Internet :: WWW/HTTP :: WSGI",
+ "Topic :: Software Development :: Bug Tracking",
+ "Topic :: Software Development :: Libraries :: Application Frameworks",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Software Development :: User Interfaces",
+]
# Add the change log to the package description.
chglog = None
try:
from os.path import dirname, join
+
chglog = open(join(dirname(__file__), "CHANGES"))
- DESC+= ('\n\n' + chglog.read())
+ DESC += ('\n\n' + chglog.read())
finally:
if chglog:
chglog.close()
DIST_NM = 'BloodhoundRelationsPlugin'
-PKG_INFO = {'bhrelations': ('bhrelations', # Package dir
+PKG_INFO = {'bhrelations': ('bhrelations', # Package dir
# Package data
['../CHANGES', '../TODO', '../COPYRIGHT',
- '../NOTICE', '../README', '../TESTING_README',
- 'htdocs/*.*', 'htdocs/css/*.css',
- 'htdocs/img/*.*', 'htdocs/js/*.js',
- 'templates/*', 'default-pages/*',
- 'locale/*/LC_MESSAGES/*.mo'],
- ),
+ '../NOTICE', '../README', '../TESTING_README',
+ 'htdocs/*.*', 'htdocs/css/*.css',
+ 'htdocs/img/*.*', 'htdocs/js/*.js',
+ 'templates/*', 'default-pages/*',
+ 'locale/*/LC_MESSAGES/*.mo'],
+ ),
'bhrelations.widgets': (
'bhrelations/widgets', ['templates/*.html']),
'bhrelations.tests': (
@@ -117,13 +114,14 @@ ENTRY_POINTS = {
extra = {}
try:
from trac.util.dist import get_l10n_cmdclass
+
cmdclass = get_l10n_cmdclass()
if cmdclass:
extra['cmdclass'] = cmdclass
extractors = [
- ('**.py', 'trac.dist:extract_python', None),
+ ('**.py', 'trac.dist:extract_python', None),
('**/templates/**.html', 'genshi', None),
- ('**/templates/**.txt', 'genshi', {
+ ('**/templates/**.txt', 'genshi', {
'template_class': 'genshi.template:TextTemplate'
}),
]
@@ -137,21 +135,21 @@ setup(
name=DIST_NM,
version=latest,
description=DESC.split('\n', 1)[0],
- author = "Apache Bloodhound",
- license = "Apache License v2",
- url = "https://bloodhound.apache.org/",
- requires = ['trac'],
- package_dir = dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
- packages = PKG_INFO.keys(),
- package_data = dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
+ author="Apache Bloodhound",
+ license="Apache License v2",
+ url="https://bloodhound.apache.org/",
+ requires=['trac'],
+ package_dir=dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
+ packages=PKG_INFO.keys(),
+ package_data=dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
include_package_data=True,
- provides = ['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
- obsoletes = ['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest) \
- for p in PKG_INFO.keys()],
- entry_points = ENTRY_POINTS,
- classifiers = cats,
- long_description= DESC,
+ provides=['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
+ obsoletes=['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest) \
+ for p in PKG_INFO.keys()],
+ entry_points=ENTRY_POINTS,
+ classifiers=cats,
+ long_description=DESC,
test_suite='bhrelations.tests.test_suite',
- tests_require=['unittest2' if parse_version(sys.version) < parse_version('2.7') else ''],
+ tests_require=['unittest2'] if sys.version_info < (2, 7) else [],
**extra
- )
+)
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_search/setup.py Fri Mar 10 14:52:02 2017
@@ -19,11 +19,7 @@
import sys
-from pkg_resources import parse_version
-try:
- from setuptools import setup
-except ImportError:
- from distutils.core import setup
+from setuptools import setup
DESC = """Search plugin for Apache(TM) Bloodhound.
@@ -37,90 +33,91 @@ versions = [
(0, 7, 0),
(0, 8, 0),
(0, 9, 0),
- ]
+]
latest = '.'.join(str(x) for x in versions[-1])
status = {
- 'planning' : "Development Status :: 1 - Planning",
- 'pre-alpha' : "Development Status :: 2 - Pre-Alpha",
- 'alpha' : "Development Status :: 3 - Alpha",
- 'beta' : "Development Status :: 4 - Beta",
- 'stable' : "Development Status :: 5 - Production/Stable",
- 'mature' : "Development Status :: 6 - Mature",
- 'inactive' : "Development Status :: 7 - Inactive"
- }
+ 'planning': "Development Status :: 1 - Planning",
+ 'pre-alpha': "Development Status :: 2 - Pre-Alpha",
+ 'alpha': "Development Status :: 3 - Alpha",
+ 'beta': "Development Status :: 4 - Beta",
+ 'stable': "Development Status :: 5 - Production/Stable",
+ 'mature': "Development Status :: 6 - Mature",
+ 'inactive': "Development Status :: 7 - Inactive"
+}
dev_status = status["alpha"]
cats = [
- dev_status,
- "Environment :: Plugins",
- "Environment :: Web Environment",
- "Framework :: Trac",
- "Intended Audience :: Developers",
- "Intended Audience :: Information Technology",
- "Intended Audience :: Other Audience",
- "Intended Audience :: System Administrators",
- "License :: Unknown",
- "Operating System :: OS Independent",
- "Programming Language :: Python",
- "Programming Language :: Python :: 2.5",
- "Programming Language :: Python :: 2.6",
- "Programming Language :: Python :: 2.7",
- "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
- "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
- "Topic :: Internet :: WWW/HTTP :: WSGI",
- "Topic :: Software Development :: Bug Tracking",
- "Topic :: Software Development :: Libraries :: Application Frameworks",
- "Topic :: Software Development :: Libraries :: Python Modules",
- "Topic :: Software Development :: User Interfaces",
- ]
+ dev_status,
+ "Environment :: Plugins",
+ "Environment :: Web Environment",
+ "Framework :: Trac",
+ "Intended Audience :: Developers",
+ "Intended Audience :: Information Technology",
+ "Intended Audience :: Other Audience",
+ "Intended Audience :: System Administrators",
+ "License :: Unknown",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python",
+ "Programming Language :: Python :: 2.5",
+ "Programming Language :: Python :: 2.6",
+ "Programming Language :: Python :: 2.7",
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content :: CGI Tools/Libraries",
+ "Topic :: Internet :: WWW/HTTP :: HTTP Servers",
+ "Topic :: Internet :: WWW/HTTP :: WSGI",
+ "Topic :: Software Development :: Bug Tracking",
+ "Topic :: Software Development :: Libraries :: Application Frameworks",
+ "Topic :: Software Development :: Libraries :: Python Modules",
+ "Topic :: Software Development :: User Interfaces",
+]
# Add the change log to the package description.
chglog = None
try:
from os.path import dirname, join
+
chglog = open(join(dirname(__file__), "CHANGES"))
- DESC+= ('\n\n' + chglog.read())
+ DESC += ('\n\n' + chglog.read())
finally:
if chglog:
chglog.close()
DIST_NM = 'BloodhoundSearchPlugin'
-PKG_INFO = {'bhsearch' : ('bhsearch', # Package dir
- # Package data
- ['../CHANGES', '../TODO', '../COPYRIGHT',
- '../NOTICE', '../README', '../TESTING_README',
- 'htdocs/*.*', 'htdocs/css/*.css',
- 'htdocs/img/*.*', 'htdocs/js/*.js',
- 'templates/*', 'default-pages/*',
- 'locale/*/LC_MESSAGES/*.mo'],
- ),
- 'bhsearch.search_resources' : (
- 'bhsearch/search_resources', # Package dir
+PKG_INFO = {'bhsearch': ('bhsearch', # Package dir
+ # Package data
+ ['../CHANGES', '../TODO', '../COPYRIGHT',
+ '../NOTICE', '../README', '../TESTING_README',
+ 'htdocs/*.*', 'htdocs/css/*.css',
+ 'htdocs/img/*.*', 'htdocs/js/*.js',
+ 'templates/*', 'default-pages/*',
+ 'locale/*/LC_MESSAGES/*.mo'],
+ ),
+ 'bhsearch.search_resources': (
+ 'bhsearch/search_resources', # Package dir
[]
- ),
-# 'search.widgets' : ('bhsearch/widgets', # Package dir
-# # Package data
-# ['templates/*', 'htdocs/*.css'],
-# ),
-# 'search.layouts' : ('bhsearch/layouts', # Package dir
-# # Package data
-# ['templates/*'],
-# ),
- 'bhsearch.tests' : ('bhsearch/tests', # Package dir
- # Package data
- ['data/*.*'],
- ),
- 'bhsearch.tests.search_resources' : (
- 'bhsearch/tests/search_resources', # Package dir
- # Package data
- ['data/*.*'],
- ),
- 'bhsearch.utils' : ('bhsearch/utils', # Package dir
- # Package data
- [],
- ),
+ ),
+ # 'search.widgets' : ('bhsearch/widgets', # Package dir
+ # # Package data
+ # ['templates/*', 'htdocs/*.css'],
+ # ),
+ # 'search.layouts' : ('bhsearch/layouts', # Package dir
+ # # Package data
+ # ['templates/*'],
+ # ),
+ 'bhsearch.tests': ('bhsearch/tests', # Package dir
+ # Package data
+ ['data/*.*'],
+ ),
+ 'bhsearch.tests.search_resources': (
+ 'bhsearch/tests/search_resources', # Package dir
+ # Package data
+ ['data/*.*'],
+ ),
+ 'bhsearch.utils': ('bhsearch/utils', # Package dir
+ # Package data
+ [],
+ ),
}
ENTRY_POINTS = {
@@ -141,18 +138,19 @@ ENTRY_POINTS = {
'bhsearch.security = bhsearch.security',
'bhsearch.whoosh_backend = bhsearch.whoosh_backend',
],
- }
+}
extra = {}
try:
from trac.util.dist import get_l10n_cmdclass
+
cmdclass = get_l10n_cmdclass()
if cmdclass:
extra['cmdclass'] = cmdclass
extractors = [
- ('**.py', 'trac.dist:extract_python', None),
+ ('**.py', 'trac.dist:extract_python', None),
('**/templates/**.html', 'genshi', None),
- ('**/templates/**.txt', 'genshi', {
+ ('**/templates/**.txt', 'genshi', {
'template_class': 'genshi.template:TextTemplate'
}),
]
@@ -166,22 +164,22 @@ setup(
name=DIST_NM,
version=latest,
description=DESC.split('\n', 1)[0],
- author = "Apache Bloodhound",
- license = "Apache License v2",
- url = "https://bloodhound.apache.org/",
- requires = ['trac'],
- install_requires = ['whoosh>=2.5.1'],
- package_dir = dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
- packages = PKG_INFO.keys(),
- package_data = dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
+ author="Apache Bloodhound",
+ license="Apache License v2",
+ url="https://bloodhound.apache.org/",
+ requires=['trac'],
+ install_requires=['whoosh>=2.5.1'],
+ package_dir=dict([p, i[0]] for p, i in PKG_INFO.iteritems()),
+ packages=PKG_INFO.keys(),
+ package_data=dict([p, i[1]] for p, i in PKG_INFO.iteritems()),
include_package_data=True,
- provides = ['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
- obsoletes = ['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest) \
- for p in PKG_INFO.keys()],
- entry_points = ENTRY_POINTS,
- classifiers = cats,
- long_description= DESC,
+ provides=['%s (%s)' % (p, latest) for p in PKG_INFO.keys()],
+ obsoletes=['%s (>=%s.0.0, <%s)' % (p, versions[-1][0], latest) \
+ for p in PKG_INFO.keys()],
+ entry_points=ENTRY_POINTS,
+ classifiers=cats,
+ long_description=DESC,
test_suite='bhsearch.tests.test_suite',
- tests_require=['unittest2' if parse_version(sys.version) < parse_version('2.7') else ''],
+ tests_require=['unittest2'] if sys.version_info < (2, 7) else [],
**extra
- )
+)
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
@@ -70,4 +68,4 @@ output_dir = bhtheme/locale
[generate_messages_js]
domain = bhtheme-js
input_dir = bhtheme/locale
-output_dir = bhtheme/htdocs/bloodhound
\ No newline at end of file
+output_dir = bhtheme/htdocs/bloodhound
Modified: bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/bloodhound_theme/setup.py Fri Mar 10 14:52:02 2017
@@ -18,19 +18,21 @@
# specific language governing permissions and limitations
# under the License.
-from setuptools import setup
import sys
+from setuptools import setup
+
extra = {}
try:
from trac.util.dist import get_l10n_js_cmdclass
+
cmdclass = get_l10n_js_cmdclass()
if cmdclass:
extra['cmdclass'] = cmdclass
extractors = [
- ('**.py', 'trac.dist:extract_python', None),
+ ('**.py', 'trac.dist:extract_python', None),
('**/templates/**.html', 'genshi', None),
- ('**/templates/**.txt', 'genshi', {
+ ('**/templates/**.txt', 'genshi', {
'template_class': 'genshi.template:TextTemplate'
}),
]
@@ -41,26 +43,25 @@ except ImportError:
pass
setup(
- name = 'BloodhoundTheme',
- version = '0.9.0',
- description = "Theme for Apache(TM) Bloodhound.",
- author = "Apache Bloodhound",
- license = "Apache License v2",
- url = "https://bloodhound.apache.org/",
- keywords = "trac plugin theme bloodhound",
- packages = ['bhtheme'],
- package_data = {'bhtheme': ['htdocs/*.*', 'htdocs/img/*.*',
+ name='BloodhoundTheme',
+ version='0.9.0',
+ description="Theme for Apache(TM) Bloodhound.",
+ author="Apache Bloodhound",
+ license="Apache License v2",
+ url="https://bloodhound.apache.org/",
+ keywords="trac plugin theme bloodhound",
+ packages=['bhtheme'],
+ package_data={'bhtheme': ['htdocs/*.*', 'htdocs/img/*.*',
'htdocs/js/*.js', 'htdocs/css/*.css',
- 'templates/*.*', 'locale/*/LC_MESSAGES/*.mo']},
- classifiers = [
- 'Framework :: Trac',
+ 'templates/*.*', 'locale/*/LC_MESSAGES/*.mo']},
+ classifiers=[
+ 'Framework :: Trac',
],
- install_requires = ['BloodhoundDashboardPlugin', 'TracThemeEngine'],
- test_suite = 'bhtheme.tests.suite',
- tests_require = ['unittest2'] if sys.version_info < (2, 7) else [],
- entry_points = {
- 'trac.plugins': [
- 'bhtheme.theme = bhtheme.theme',
- ]},
+ install_requires=['BloodhoundDashboardPlugin', 'TracThemeEngine'],
+ test_suite='bhtheme.tests.suite',
+ tests_require=['unittest2'] if sys.version_info < (2, 7) else [],
+ entry_points={
+ 'trac.plugins': ['bhtheme.theme = bhtheme.theme']
+ },
**extra
)
Modified: bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.cfg
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.cfg?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.cfg (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.cfg Fri Mar 10 14:52:02 2017
@@ -17,8 +17,6 @@
[egg_info]
tag_build = dev
-tag_date = 0
-tag_svn_revision = true
[sdist]
formats = gztar,bztar,ztar,tar,zip
Modified: bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.py
URL: http://svn.apache.org/viewvc/bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.py?rev=1786356&r1=1786355&r2=1786356&view=diff
==============================================================================
--- bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.py (original)
+++ bloodhound/branches/bep_0011_batch_create_tickets/installer/setup.py Fri Mar 10 14:52:02 2017
@@ -17,17 +17,13 @@
# specific language governing permissions and limitations
# under the License.
-try:
- from setuptools import setup
-except ImportError:
- from ditutils.core import setup
+from setuptools import setup
DESC = """Installer for Apache Bloodhound
Adds the bloodhound_setup cli command.
"""
-
versions = [
(0, 8, 0),
(0, 9, 0),