From 80e92712093b9beb917bcc70e768c2f6b716224b Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Fri, 29 Mar 2019 16:55:46 +0100 Subject: [PATCH] UPD: improved setup.py --- setup.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 9427f18..f397e0e 100644 --- a/setup.py +++ b/setup.py @@ -24,12 +24,14 @@ class SetupPythonEnvironment(MyCommand): python_ver = sys.version_info.major if python_ver == 2: path = os.path.join('env', 'python2') + symlink_path = os.path.join('env', 'python') venv_module = 'virtualenv' - prompt = '(dav) ' + prompt = '(py2-dav) ' elif python_ver == 3: path = os.path.join('env', 'python3') + symlink_path = os.path.join('env', 'python') venv_module = 'venv' - prompt = 'dav3' + prompt = 'py3-dav' else: sys.stderr.write('Python %d is not supported.\n' % python_ver) sys.exit(posix.EX_USAGE) @@ -41,6 +43,11 @@ class SetupPythonEnvironment(MyCommand): venv_module=venv_module, prompt=prompt)) os.system(cmd) + if symlink_path and not os.path.exists(symlink_path): + symlink_dir = os.path.dirname(symlink_path) + relpath = os.path.relpath(path, symlink_dir) + os.symlink(relpath, symlink_path) + print('') print('Depending on your operating system or command shell,') print('you should activate the new environment for this shell session') @@ -59,7 +66,8 @@ class QuickSetup(MyCommand): mgmt_script = os.path.join(django_project_path, 'manage.py') sys.stdout.write('Install distribution in development mode...\n') - self.run_command('develop') + cmd = 'pip install -e .' + os.system(cmd) sys.stdout.write('Setup django project in {}...\n'.format(django_project_path)) cmd = 'django-dav-admin setup {}'.format(django_project_path)