Compatibility for pip10
- also some spaces and tabs fixes
This commit is contained in:
parent
9385fc32be
commit
a6087cb243
2 changed files with 32 additions and 26 deletions
|
|
@ -267,15 +267,18 @@ def get_data():
|
|||
|
||||
setup_template = """# -*- coding: utf-8 -*-
|
||||
from setuptools import setup, find_packages
|
||||
from pip.req import parse_requirements
|
||||
try: # for pip >= 10
|
||||
from pip._internal.req import parse_requirements
|
||||
except ImportError: # for pip <= 9.0.3
|
||||
from pip.req import parse_requirements
|
||||
import re, ast
|
||||
|
||||
# get version from __version__ variable in {app_name}/__init__.py
|
||||
_version_re = re.compile(r'__version__\s+=\s+(.*)')
|
||||
|
||||
with open('{app_name}/__init__.py', 'rb') as f:
|
||||
version = str(ast.literal_eval(_version_re.search(
|
||||
f.read().decode('utf-8')).group(1)))
|
||||
version = str(ast.literal_eval(_version_re.search(
|
||||
f.read().decode('utf-8')).group(1)))
|
||||
|
||||
requirements = parse_requirements("requirements.txt", session="")
|
||||
|
||||
|
|
|
|||
49
setup.py
49
setup.py
|
|
@ -3,42 +3,45 @@ import os, shutil
|
|||
from distutils.command.clean import clean as Clean
|
||||
|
||||
from setuptools import setup, find_packages
|
||||
from pip.req import parse_requirements
|
||||
try: # for pip >= 10
|
||||
from pip._internal.req import parse_requirements
|
||||
except ImportError: # for pip <= 9.0.3
|
||||
from pip.req import parse_requirements
|
||||
import re, ast
|
||||
|
||||
# get version from __version__ variable in frappe/__init__.py
|
||||
_version_re = re.compile(r'__version__\s+=\s+(.*)')
|
||||
|
||||
with open('frappe/__init__.py', 'rb') as f:
|
||||
version = str(ast.literal_eval(_version_re.search(
|
||||
f.read().decode('utf-8')).group(1)))
|
||||
version = str(ast.literal_eval(_version_re.search(
|
||||
f.read().decode('utf-8')).group(1)))
|
||||
|
||||
requirements = parse_requirements("requirements.txt", session="")
|
||||
|
||||
class CleanCommand(Clean):
|
||||
def run(self):
|
||||
Clean.run(self)
|
||||
def run(self):
|
||||
Clean.run(self)
|
||||
|
||||
basedir = os.path.abspath(os.path.dirname(__file__))
|
||||
basedir = os.path.abspath(os.path.dirname(__file__))
|
||||
|
||||
for relpath in ['build', '.cache', '.coverage', 'dist', 'frappe.egg-info']:
|
||||
abspath = os.path.join(basedir, relpath)
|
||||
if os.path.exists(abspath):
|
||||
if os.path.isfile(abspath):
|
||||
os.remove(abspath)
|
||||
else:
|
||||
shutil.rmtree(abspath)
|
||||
for relpath in ['build', '.cache', '.coverage', 'dist', 'frappe.egg-info']:
|
||||
abspath = os.path.join(basedir, relpath)
|
||||
if os.path.exists(abspath):
|
||||
if os.path.isfile(abspath):
|
||||
os.remove(abspath)
|
||||
else:
|
||||
shutil.rmtree(abspath)
|
||||
|
||||
for dirpath, dirnames, filenames in os.walk(basedir):
|
||||
for filename in filenames:
|
||||
_, extension = os.path.splitext(filename)
|
||||
if extension in ['.pyc']:
|
||||
abspath = os.path.join(dirpath, filename)
|
||||
os.remove(abspath)
|
||||
for dirname in dirnames:
|
||||
if dirname in ['__pycache__']:
|
||||
abspath = os.path.join(dirpath, dirname)
|
||||
shutil.rmtree(abspath)
|
||||
for dirpath, dirnames, filenames in os.walk(basedir):
|
||||
for filename in filenames:
|
||||
_, extension = os.path.splitext(filename)
|
||||
if extension in ['.pyc']:
|
||||
abspath = os.path.join(dirpath, filename)
|
||||
os.remove(abspath)
|
||||
for dirname in dirnames:
|
||||
if dirname in ['__pycache__']:
|
||||
abspath = os.path.join(dirpath, dirname)
|
||||
shutil.rmtree(abspath)
|
||||
|
||||
setup(
|
||||
name='frappe',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue