Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.

[RFR] Fix travis distutils #10311

Merged
merged 1 commit into from
Sep 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 9 additions & 29 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# https://docs.travis-ci.com/user/languages/python/#python-37-and-higher
dist: xenial
dist: bionic
addons:
apt:
packages:
- python3-venv
- python3
- gcc
- gnutls-dev
- postgresql
Expand Down Expand Up @@ -34,44 +34,24 @@ jobs:
- stage: linting
python: '3.7'
env:
before_install:
- sudo apt-get update
install:
- pip install pre-commit flake8
- pip install pre-commit flake8
script:
- pre-commit clean
- pre-commit run --all-files
- pre-commit clean
- pre-commit run --all-files
after_failure:
- git diff
- git diff

- stage: test
python: '3.7'
dist: xenial
addons:
apt:
packages:
- python3-venv
- gcc
- gnutls-dev
- postgresql
- libxml2-dev
- libxslt1-dev
- libzmq3-dev
- libcurl4-openssl-dev
- g++
- openssl
- libffi-dev
- python3-dev
- libtesseract-dev
- libpng-dev
- libfreetype6-dev
- libssl-dev
- python3-dbg
- git
env:
# work around travis being missconfigured
- BOTO_CONFIG=/dev/null
install:
- pip3 install -U setuptools pip
- python3 -m cfme.scripting.quickstart
- python3 -m cfme.scripting.quickstart --mk-virtualenv $HOME/virtualenv/python3.7
# use templates for conf files necessary for collecting
- cp conf/cfme_data.yaml.template conf/cfme_data.yaml
- cp conf/env.yaml.template conf/env.yaml
Expand Down
14 changes: 8 additions & 6 deletions cfme/scripting/disable_bytecode.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/usr/bin/env python3
import distutils
from os import path

from cfme.utils.log import logger


DISABLE_BYTECODE = "import sys\nsys.dont_write_bytecode = True\n"

Expand All @@ -21,10 +22,11 @@ def ensure_file_contains(target, content):

if __name__ == '__main__':
try:
site_packages = distutils.sysconfig_get_python_lib()
except AttributeError:
import site
site_packages = site.getsitepackages()[0]
print(site_packages)
target = path.join(site_packages, 'sitecustomize.py')
ensure_file_contains(target, content=DISABLE_BYTECODE)
print(site_packages)
target = path.join(site_packages, 'sitecustomize.py')
ensure_file_contains(target, content=DISABLE_BYTECODE)
except AttributeError:
logger.warning('bytecode NOT disabled, site.getsitepackages not found.'
'Something is wrong with the site module, due to virtualenv creation.')
2 changes: 0 additions & 2 deletions cfme/scripting/quickstart/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
print("ERROR: quickstart only runs in python 3.7+")
sys.exit(2)


IN_VENV = os.path.exists(os.path.join(sys.prefix, 'pyvenv.cfg'))
IN_LEGACY_VIRTUALENV = getattr(sys, 'real_prefix', None) is not None

IN_VIRTUAL_ENV = IN_VENV or IN_LEGACY_VIRTUALENV


Expand Down
2 changes: 1 addition & 1 deletion cfme/scripting/quickstart/system.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@


DEB_PKGS = (
" python3-venv python3-virtualenv gcc gnutls-dev postgresql libxml2-dev"
" python3-venv gcc gnutls-dev postgresql libxml2-dev"
" libxslt1-dev libzmq3-dev libcurl4-openssl-dev"
" g++ openssl libffi-dev python3-dev libtesseract-dev"
" libpng-dev libfreetype6-dev libssl-dev python3-dbg git"
Expand Down
1 change: 0 additions & 1 deletion requirements/frozen.txt
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,6 @@ tzlocal==2.0.0
uritemplate==3.0.0
urllib3==1.25.8
varmeth==0.0.2
virtualenv==16.4.3
vspk==5.3.2
wait-for==1.1.3
warlock==1.3.0
Expand Down