Skip to content
Closed
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
3 changes: 2 additions & 1 deletion runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ def createTracEnvironment(cls, **kwargs):
conf.set('git', 'cached_repository', 'true')
conf.set('git', 'persistent_cache', 'true')

conf.add_section('github')
if not conf.has_section('github'):
conf.add_section('github')
client_id = '01234567890123456789'
if 'client_id' in kwargs:
client_id = kwargs['client_id']
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# This software is licensed as described in the file LICENSE, which
# you should have received as part of this distribution.

from setuptools import setup
from setuptools import setup, find_packages

setup(
name='trac-github',
Expand All @@ -14,7 +14,8 @@
url='https://github.com/trac-hacks/trac-github',
description='Trac - GitHub integration',
download_url='https://pypi.python.org/pypi/trac-github',
packages=['tracext'],
packages=find_packages(),
namespace_packages=['tracext'],
platforms='all',
license='BSD',
extras_require={'oauth': ['requests_oauthlib >= 0.5']},
Expand Down
1 change: 1 addition & 0 deletions tracext/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
__import__('pkg_resources').declare_namespace(__name__)
2 changes: 1 addition & 1 deletion tracext/github.py → tracext/github/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def _oauth_session(self, req, state=None):



class GitHubMixin(Component):
class GitHubMixin(object):

webhook_secret = Option('github', 'webhook_secret', '',
doc="""GitHub webhook secret token.
Expand Down