mirror of
				https://github.com/nvbn/thefuck.git
				synced 2025-10-30 22:54:14 +00:00 
			
		
		
		
	#311 Fix installation without pandoc
This commit is contained in:
		| @@ -1,5 +1,6 @@ | |||||||
| #!/usr/bin/env python | #!/usr/bin/env python | ||||||
| from subprocess import call | from subprocess import call | ||||||
|  | import os | ||||||
| import re | import re | ||||||
|  |  | ||||||
|  |  | ||||||
| @@ -28,4 +29,7 @@ call('git commit -am "Bump to {}"'.format(version), shell=True) | |||||||
| call('git tag {}'.format(version), shell=True) | call('git tag {}'.format(version), shell=True) | ||||||
| call('git push', shell=True) | call('git push', shell=True) | ||||||
| call('git push --tags', shell=True) | call('git push --tags', shell=True) | ||||||
| call('python setup.py sdist bdist_wheel upload', shell=True) |  | ||||||
|  | env = os.environ | ||||||
|  | env['CONVERT_README'] = 'true' | ||||||
|  | call('python setup.py sdist bdist_wheel upload', shell=True, env=env) | ||||||
|   | |||||||
							
								
								
									
										9
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										9
									
								
								setup.py
									
									
									
									
									
								
							| @@ -1,13 +1,14 @@ | |||||||
| #!/usr/bin/env python | #!/usr/bin/env python | ||||||
| from setuptools import setup, find_packages | from setuptools import setup, find_packages | ||||||
| import sys | import sys | ||||||
|  | import os | ||||||
|  |  | ||||||
| try: | if os.environ.get('CONVERT_README'): | ||||||
|     import pypandoc |     import pypandoc | ||||||
|  |  | ||||||
|     long_description = pypandoc.convert('README.md', 'rst') |     long_description = pypandoc.convert('README.md', 'rst') | ||||||
| except: | else: | ||||||
|     long_description = open('README.md').read() |     long_description = '' | ||||||
|  |  | ||||||
| version = sys.version_info[:2] | version = sys.version_info[:2] | ||||||
| if version < (2, 7): | if version < (2, 7): | ||||||
| @@ -19,7 +20,7 @@ elif (3, 0) < version < (3, 3): | |||||||
|           ' ({}.{} detected).'.format(*version)) |           ' ({}.{} detected).'.format(*version)) | ||||||
|     sys.exit(-1) |     sys.exit(-1) | ||||||
|  |  | ||||||
| VERSION = '2.5.4' | VERSION = '2.5.6' | ||||||
|  |  | ||||||
| install_requires = ['psutil', 'colorama', 'six'] | install_requires = ['psutil', 'colorama', 'six'] | ||||||
| extras_require = {':python_version<"3.4"': ['pathlib']} | extras_require = {':python_version<"3.4"': ['pathlib']} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user