Skip to content

Commit

Permalink
fix to __doc__ use in setup.py to make -O0 installation mode working
Browse files Browse the repository at this point in the history
  • Loading branch information
elie committed Oct 10, 2015
1 parent 52f4244 commit 35eec0d
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 16 deletions.
5 changes: 5 additions & 0 deletions CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
Revision 0.0.9, released XX-XX-2015
-----------------------------------

* Fix to __doc__ use in setup.py to make -O0 installation mode working.

Revision 0.0.8, released 28-09-2015
-----------------------------------

Expand Down
2 changes: 1 addition & 1 deletion pyasn1_modules/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# http://www.python.org/dev/peps/pep-0396/
__version__ = '0.0.8'
__version__ = '0.0.9'
30 changes: 15 additions & 15 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,21 @@ def howto_install_setuptools():
if sys.version_info[:2] > (2, 4):
params['requires'] = [ 'pyasn1(>=0.1.8)' ]

doclines = [ x.strip() for x in __doc__.split('\n') if x ]
doclines = [x.strip() for x in (__doc__ or '').split('\n') if x]

params.update( {
'name': 'pyasn1-modules',
'version': open('pyasn1_modules/__init__.py').read().split('\'')[1],
'description': doclines[0],
'long_description': ' '.join(doclines[1:]),
'maintainer': 'Ilya Etingof <[email protected]>',
'author': 'Ilya Etingof',
'author_email': '[email protected]',
'url': 'http://sourceforge.net/projects/pyasn1/',
'platforms': ['any'],
'classifiers': [ x for x in classifiers.split('\n') if x ],
'license': 'BSD',
'packages': [ 'pyasn1_modules' ]
} )
params.update(
{'name': 'pyasn1-modules',
'version': open('pyasn1_modules/__init__.py').read().split('\'')[1],
'description': doclines[0],
'long_description': ' '.join(doclines[1:]),
'maintainer': 'Ilya Etingof <[email protected]>',
'author': 'Ilya Etingof',
'author_email': '[email protected]',
'url': 'http://sourceforge.net/projects/pyasn1/',
'platforms': ['any'],
'classifiers': [x for x in classifiers.split('\n') if x],
'license': 'BSD',
'packages': ['pyasn1_modules']}
)

setup(**params)

0 comments on commit 35eec0d

Please sign in to comment.