Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 282d6e4..94e291a 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.21'
+__version__ = '10.1.22'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/setup.py b/setup.py
index 5dd87ab..c293fb8 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,17 @@
# -*- 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 erpnext/__init__.py
_version_re = re.compile(r'__version__\s+=\s+(.*)')
with open('erpnext/__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="")