Skip to content

Commit

Permalink
pep8
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Riolo committed Apr 20, 2015
1 parent 28410a0 commit 6c53d2e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 0 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ CHANGES
=================

- compatibility for python 3
- update code to work with python2 and python3
- update doctests to work with python2 and python3
- adjust egg to work with newer version of setuptools
- Fix an encoding issue under Python-2.7 in the doctests.

Expand Down
15 changes: 8 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import os
from setuptools import setup, find_packages


def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()

Expand All @@ -17,7 +18,7 @@ def read(*rnames):

setup(
name='martian',
version = '0.15.dev0',
version='0.15.dev0',
author='Grok project',
author_email='grok-dev@zope.org',
description="""\
Expand All @@ -28,7 +29,7 @@ def read(*rnames):
(http://grok.zope.org)
""",
long_description=long_description,
classifiers= [
classifiers=[
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
Expand All @@ -37,14 +38,14 @@ def read(*rnames):
'Programming Language :: Python :: 3.4',
],
packages=find_packages('src'),
package_dir = {'': 'src'},
include_package_data = True,
package_dir={'': 'src'},
include_package_data=True,
zip_safe=False,
license='ZPL',
test_suite='martian.tests.test_all.test_suite',
install_requires=[
'zope.interface',
'setuptools',
'zope.interface',
'setuptools',
],
extras_require = dict(test=['zope.testing']),
extras_require=dict(test=['zope.testing']),
)

0 comments on commit 6c53d2e

Please sign in to comment.