Merge pull request #1285 from pdvyas/hotfix-installer
fix branching, pip version and mysql-python version pinning in install_erpnext
This commit is contained in:
commit
f2b46635b5
@ -19,7 +19,7 @@ requirements = [
|
|||||||
"jinja2",
|
"jinja2",
|
||||||
"markdown2",
|
"markdown2",
|
||||||
"markupsafe",
|
"markupsafe",
|
||||||
"mysql-python",
|
"mysql-python==1.2.4",
|
||||||
"pygeoip",
|
"pygeoip",
|
||||||
"python-dateutil",
|
"python-dateutil",
|
||||||
"python-memcached",
|
"python-memcached",
|
||||||
@ -148,13 +148,13 @@ def install_python_modules():
|
|||||||
print "Installing Python Modules: (This may take some time)"
|
print "Installing Python Modules: (This may take some time)"
|
||||||
print "-"*80
|
print "-"*80
|
||||||
|
|
||||||
if not exec_in_shell("which pip"):
|
if not exec_in_shell("which pip-2.7"):
|
||||||
exec_in_shell("easy_install pip")
|
exec_in_shell("easy_install-2.7 pip")
|
||||||
|
|
||||||
exec_in_shell("pip install --upgrade pip")
|
exec_in_shell("pip-2.7 install --upgrade pip")
|
||||||
exec_in_shell("pip install --upgrade setuptools")
|
exec_in_shell("pip-2.7 install --upgrade setuptools")
|
||||||
exec_in_shell("pip install --upgrade virtualenv")
|
exec_in_shell("pip-2.7 install --upgrade virtualenv")
|
||||||
exec_in_shell("pip install {}".format(' '.join(requirements)))
|
exec_in_shell("pip-2.7 install {}".format(' '.join(requirements)))
|
||||||
|
|
||||||
def install_erpnext(install_path):
|
def install_erpnext(install_path):
|
||||||
print
|
print
|
||||||
@ -200,7 +200,7 @@ def setup_folders(install_path):
|
|||||||
app = os.path.join(install_path, "app")
|
app = os.path.join(install_path, "app")
|
||||||
if not os.path.exists(app):
|
if not os.path.exists(app):
|
||||||
print "Cloning erpnext"
|
print "Cloning erpnext"
|
||||||
exec_in_shell("cd %s && git clone https://github.com/webnotes/erpnext.git app" % install_path)
|
exec_in_shell("cd %s && git clone --branch master https://github.com/webnotes/erpnext.git app" % install_path)
|
||||||
exec_in_shell("cd app && git config core.filemode false")
|
exec_in_shell("cd app && git config core.filemode false")
|
||||||
if not os.path.exists(app):
|
if not os.path.exists(app):
|
||||||
raise Exception, "Couldn't clone erpnext repository"
|
raise Exception, "Couldn't clone erpnext repository"
|
||||||
@ -208,7 +208,7 @@ def setup_folders(install_path):
|
|||||||
lib = os.path.join(install_path, "lib")
|
lib = os.path.join(install_path, "lib")
|
||||||
if not os.path.exists(lib):
|
if not os.path.exists(lib):
|
||||||
print "Cloning wnframework"
|
print "Cloning wnframework"
|
||||||
exec_in_shell("cd %s && git clone https://github.com/webnotes/wnframework.git lib" % install_path)
|
exec_in_shell("cd %s && git clone --branch master https://github.com/webnotes/wnframework.git lib" % install_path)
|
||||||
exec_in_shell("cd lib && git config core.filemode false")
|
exec_in_shell("cd lib && git config core.filemode false")
|
||||||
if not os.path.exists(lib):
|
if not os.path.exists(lib):
|
||||||
raise Exception, "Couldn't clone wnframework repository"
|
raise Exception, "Couldn't clone wnframework repository"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user