Merge pull request #1158 from gavindsouza/ci-updates

ci: Dropping tests for < PY3.7

.travis.yml

@@ -15,35 +15,20 @@ addons:
 
 matrix:
   include:
-  - name: "Python 2.7 Basic Setup"
-    python: 2.7
-    env: TEST=bench
-    script: python bench/tests/test_init.py TestBenchInit.basic
-
-  - name: "Python 3.6 Basic Setup"
-    python: 3.6
-    env: TEST=bench
-    script: python bench/tests/test_init.py TestBenchInit.basic
-
   - name: "Python 3.7 Basic Setup"
     python: 3.7
     env: TEST=bench
     script: python bench/tests/test_init.py TestBenchInit.basic
 
-  - name: "Python 3.8 Production Setup"
+  - name: "Python 3.8 Basic Setup"
     python: 3.8
     env: TEST=bench
-    script: python bench/tests/test_setup_production.py TestSetupProduction.production
+    script: python bench/tests/test_init.py TestBenchInit.basic
 
-  - name: "Python 2.7 Production Setup"
-    python: 2.7
+  - name: "Python 3.9 Basic Setup"
+    python: 3.9
     env: TEST=bench
-    script: python bench/tests/test_setup_production.py TestSetupProduction.production
-
-  - name: "Python 3.6 Production Setup"
-    python: 3.6
-    env: TEST=bench
-    script: python bench/tests/test_setup_production.py TestSetupProduction.production
+    script: python bench/tests/test_init.py TestBenchInit.basic
 
   - name: "Python 3.7 Production Setup"
     python: 3.7
@@ -55,20 +40,25 @@ matrix:
     env: TEST=bench
     script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
-  - name: "Python 2.7 Tests"
-    python: 2.7
+  - name: "Python 3.9 Production Setup"
+    python: 3.9
     env: TEST=bench
-    script: python -m unittest -v bench.tests.test_init
+    script: python bench/tests/test_setup_production.py TestSetupProduction.production
 
   - name: "Python 3.7 Tests"
     python: 3.7
     env: TEST=bench
     script: python -m unittest -v bench.tests.test_init
 
-  - name: "Python 3.5 Easy Install"
-    python: 3.5
-    env: TEST=easy_install
-    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
+  - name: "Python 3.8 Tests"
+    python: 3.8
+    env: TEST=bench
+    script: python -m unittest -v bench.tests.test_init
+
+  - name: "Python 3.9 Tests"
+    python: 3.9
+    env: TEST=bench
+    script: python -m unittest -v bench.tests.test_init
 
   - name: "Python 3.7 Easy Install"
     python: 3.7
@@ -80,6 +70,11 @@ matrix:
     env: TEST=easy_install
     script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
 
+  - name: "Python 3.9 Easy Install"
+    python: 3.9
+    env: TEST=easy_install
+    script: sudo python $TRAVIS_BUILD_DIR/install.py --user travis --run-travis --production --verbose
+
 install:
   - pip install urllib3 pyOpenSSL ndg-httpsclient pyasn1
 

bench/app.py

@@ -174,12 +174,12 @@ def install_app(app, bench_path=".", verbose=False, no_cache=False, restart_benc
 	print('\n{0}Installing {1}{2}'.format(color.yellow, app, color.nc))
 	logger.log("installing {}".format(app))
 
-	pip_path = os.path.join(bench_path, "env", "bin", "pip")
+	python_path = os.path.join(bench_path, "env", "bin", "python")
 	quiet_flag = "-q" if not verbose else ""
 	app_path = os.path.join(bench_path, "apps", app)
 	cache_flag = "--no-cache-dir" if no_cache else ""
 
-	exec_cmd("{pip} install {quiet} -U -e {app} {no_cache}".format(pip=pip_path, quiet=quiet_flag, app=app_path, no_cache=cache_flag))
+	exec_cmd("{py_path} -m pip install {quiet} -U -e {app} {no_cache}".format(py_path=python_path, quiet=quiet_flag, app=app_path, no_cache=cache_flag))
 
 	if os.path.exists(os.path.join(app_path, 'package.json')):
 		exec_cmd("yarn install", cwd=app_path)
@@ -208,7 +208,7 @@ def remove_app(app, bench_path='.'):
 
 	app_path = os.path.join(bench_path, 'apps', app)
 	site_path = os.path.join(bench_path, 'sites')
-	pip = os.path.join(bench_path, 'env', 'bin', 'pip')
+	py = os.path.join(bench_path, 'env', 'bin', 'python')
 
 	for site in os.listdir(site_path):
 		req_file = os.path.join(site_path, site, 'site_config.json')
@@ -218,7 +218,7 @@ def remove_app(app, bench_path='.'):
 				print("Cannot remove, app is installed on site: {0}".format(site))
 				sys.exit(1)
 
-	exec_cmd("{0} uninstall -y {1}".format(pip, app), cwd=bench_path)
+	exec_cmd("{0} -m pip uninstall -y {1}".format(py, app), cwd=bench_path)
 	remove_from_appstxt(app, bench_path)
 	shutil.rmtree(app_path)
 	run_frappe_cmd("build", bench_path=bench_path)

bench/cli.py

@@ -109,19 +109,19 @@ def change_uid():
 def old_frappe_cli(bench_path='.'):
 	f = get_frappe(bench_path=bench_path)
 	os.chdir(os.path.join(bench_path, 'sites'))
-	os.execv(f, [f] + sys.argv[2:])
+	os.execve(f, [f] + sys.argv[2:], {})
 
 
 def app_cmd(bench_path='.'):
 	f = get_env_cmd('python', bench_path=bench_path)
 	os.chdir(os.path.join(bench_path, 'sites'))
-	os.execv(f, [f] + ['-m', 'frappe.utils.bench_helper'] + sys.argv[1:])
+	os.execve(f, [f] + ['-m', 'frappe.utils.bench_helper'] + sys.argv[1:], {})
 
 
 def frappe_cmd(bench_path='.'):
 	f = get_env_cmd('python', bench_path=bench_path)
 	os.chdir(os.path.join(bench_path, 'sites'))
-	os.execv(f, [f] + ['-m', 'frappe.utils.bench_helper', 'frappe'] + sys.argv[1:])
+	os.execve(f, [f] + ['-m', 'frappe.utils.bench_helper', 'frappe'] + sys.argv[1:], {})
 
 
 def get_frappe_commands():

bench/commands/make.py

@@ -98,5 +98,5 @@ def pip(ctx, args):
 	"Run pip commands in bench env"
 	import os
 	from bench.utils import get_env_cmd
-	env_pip = get_env_cmd('pip')
-	os.execv(env_pip, (env_pip,) + args)
+	env_py = get_env_cmd('python')
+	os.execv(env_py, (env_py, '-m', 'pip') + args)

bench/tests/test_base.py

@@ -44,7 +44,7 @@ class TestBenchBase(unittest.TestCase):
 		bench_path = os.path.abspath(bench_name)
 		python_path = os.path.abspath(os.path.join(bench_path, "env", "bin", "python"))
 		self.assertTrue(python_path.startswith(bench_path))
-		for subdir in ("bin", "include", "lib", "share"):
+		for subdir in ("bin", "lib", "share"):
 			self.assert_exists(bench_name, "env", subdir)
 
 	def assert_config(self, bench_name):

bench/utils.py

@@ -339,13 +339,13 @@ def get_venv_path():
 
 def setup_env(bench_path='.', python='python3'):
 	frappe = os.path.join(bench_path, "apps", "frappe")
-	pip = os.path.join(bench_path, "env", "bin", "pip")
+	py = os.path.join(bench_path, "env", "bin", "python")
 	virtualenv = get_venv_path()
 
 	exec_cmd('{} -q env -p {}'.format(virtualenv, python), cwd=bench_path)
 
 	if os.path.exists(frappe):
-		exec_cmd('{} install -q -U -e {}'.format(pip, frappe), cwd=bench_path)
+		exec_cmd('{} -m pip install -q -U -e {}'.format(py, frappe), cwd=bench_path)
 
 
 def setup_socketio(bench_path='.'):
@@ -453,12 +453,15 @@ def get_process_manager():
 
 
 def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
+	env = os.environ
 	program = get_process_manager()
+
 	if not program:
 		raise Exception("No process manager found")
-	os.environ['PYTHONUNBUFFERED'] = "true"
+
+	env['PYTHONUNBUFFERED'] = "true"
 	if not no_dev:
-		os.environ['DEV_SERVER'] = "true"
+		env['DEV_SERVER'] = "true"
 
 	command = [program, 'start']
 	if concurrency:
@@ -470,7 +473,7 @@ def start(no_dev=False, concurrency=None, procfile=None, no_prefix=False):
 	if no_prefix:
 		command.extend(['--no-prefix'])
 
-	os.execv(program, command)
+	os.execve(program, command, env=env)
 
 
 def get_git_version():
@@ -555,8 +558,8 @@ def set_default_site(site, bench_path='.'):
 
 
 def update_env_pip(bench_path):
-	env_pip = os.path.join(bench_path, 'env', 'bin', 'pip')
-	exec_cmd("{pip} install -q -U pip".format(pip=env_pip))
+	env_py = os.path.join(bench_path, 'env', 'bin', 'python')
+	exec_cmd("{env_py} -m pip install -q -U pip".format(env_py=env_py))
 
 
 def update_requirements(bench_path='.'):
@@ -571,14 +574,14 @@ def update_requirements(bench_path='.'):
 
 def update_python_packages(bench_path='.'):
 	from bench.app import get_apps
-	pip_path = os.path.join(bench_path, "env", "bin", "pip")
+	env_py = os.path.join(bench_path, "env", "bin", "python")
 	print('Updating Python libraries...')
 
 	update_env_pip(bench_path)
 	for app in get_apps():
 		print('\n{0}Installing python dependencies for {1}{2}'.format(color.yellow, app, color.nc))
 		app_path = os.path.join(bench_path, "apps", app)
-		exec_cmd("{0} install -q -U -e {1}".format(pip_path, app_path), cwd=bench_path)
+		exec_cmd("{0} -m pip install -q -U -e {1}".format(env_py, app_path), cwd=bench_path)
 
 
 def update_node_packages(bench_path='.'):
@@ -965,7 +968,6 @@ def migrate_env(python, backup=False):
 	python = which(python)
 	virtualenv = which('virtualenv')
 	pvenv = os.path.join(path, nvenv)
-	pip = os.path.join(pvenv, 'bin', 'pip')
 
 	# Clear Cache before Bench Dies.
 	try:
@@ -1006,7 +1008,7 @@ def migrate_env(python, backup=False):
 		venv_creation = exec_cmd('{virtualenv} --python {python} {pvenv}'.format(virtualenv=virtualenv, python=python, pvenv=pvenv))
 
 		apps = ' '.join(["-e {}".format(os.path.join("apps", app)) for app in get_apps()])
-		packages_setup = exec_cmd('{0} install -q -U {1}'.format(pip, apps))
+		packages_setup = exec_cmd('{0} -m pip install -q -U {1}'.format(pvenv, apps))
 
 		logger.log('Migration Successful to {}'.format(python))
 	except: