diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | pytest.ini | 4 | ||||
| -rw-r--r-- | requirements/requirements.in | 2 | ||||
| -rw-r--r-- | requirements/requirements.txt | 7 | ||||
| -rw-r--r-- | requirements/requirements_ansible.in | 1 | ||||
| -rw-r--r-- | requirements/requirements_ansible.txt | 5 | ||||
| -rw-r--r-- | requirements/requirements_git.txt | 2 | ||||
| -rwxr-xr-x | tools/clusterdevel/bootstrap_minishift.sh | 2 | ||||
| -rw-r--r-- | tools/docker-compose/Dockerfile | 16 | ||||
| -rwxr-xr-x | tools/docker-compose/start_tests.sh | 2 | ||||
| -rw-r--r-- | tools/docker-compose/unit-tests/entrypoint.sh | 2 |
11 files changed, 20 insertions, 27 deletions
@@ -356,7 +356,7 @@ check: flake8 pep8 # pyflakes pylint awx-link: cp -R /tmp/awx.egg-info /awx_devel/ || true sed -i "s/placeholder/$(shell git describe --long | sed 's/\./\\./g')/" /awx_devel/awx.egg-info/PKG-INFO - cp -f /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link + cp -f /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests @@ -547,7 +547,7 @@ docker-isolated: TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml create docker start tools_awx_1 docker start tools_isolated_1 - echo "__version__ = '`git describe --long | cut -d - -f 1-1`'" | docker exec -i tools_isolated_1 /bin/bash -c "cat > /venv/awx/lib/python2.7/site-packages/awx.py" + echo "__version__ = '`git describe --long | cut -d - -f 1-1`'" | docker exec -i tools_isolated_1 /bin/bash -c "cat > /venv/awx/lib/python3.6/site-packages/awx.py" CURRENT_UID=$(shell id -u) TAG=$(COMPOSE_TAG) DEV_DOCKER_TAG_BASE=$(DEV_DOCKER_TAG_BASE) docker-compose -f tools/docker-compose.yml -f tools/docker-isolated-override.yml up # Docker Compose Development environment diff --git a/pytest.ini b/pytest.ini index 91e4c9a95a..3bf2ea1b52 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,7 +1,7 @@ [pytest] DJANGO_SETTINGS_MODULE = awx.settings.development -python_paths = /venv/tower/lib/python2.7/site-packages -site_dirs = /venv/tower/lib/python2.7/site-packages +python_paths = /venv/tower/lib/python3.6/site-packages +site_dirs = /venv/tower/lib/python3.6/site-packages python_files = *.py addopts = --reuse-db --nomigrations --tb=native markers = diff --git a/requirements/requirements.in b/requirements/requirements.in index 4ebc1338dc..a28a629bce 100644 --- a/requirements/requirements.in +++ b/requirements/requirements.in @@ -6,7 +6,7 @@ channels==1.1.8 celery==4.2.1 daphne==1.3.0 # Last before backwards-incompatible channels 2 upgrade Django==1.11.16 -django-auth-ldap==1.2.8 +django-auth-ldap==1.7.0 django-crum==0.7.2 django-extensions==2.0.0 django-jsonfield==1.0.1 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index d22f81d5d5..40eeeff1fa 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -13,7 +13,6 @@ asn1crypto==0.24.0 # via cryptography attrs==17.4.0 # via automat, service-identity autobahn==18.3.1 # via daphne automat==0.6.0 # via twisted -backports.functools-lru-cache==1.5 # via jaraco.functools baron==0.6.6 # via redbaron billiard==3.5.0.4 # via celery boto==2.47.0 @@ -24,7 +23,7 @@ constantly==15.1.0 # via twisted cryptography==2.3.1 # via requests daphne==1.3.0 defusedxml==0.4.1 # via python-saml -django-auth-ldap==1.2.8 +django-auth-ldap==1.7.0 django-crum==0.7.2 django-extensions==2.0.0 django-jsonfield==1.0.1 @@ -40,8 +39,6 @@ djangorestframework-yaml==1.0.3 djangorestframework==3.7.7 docutils==0.14 # via botocore enum34==1.1.6 # via cryptography -functools32==3.2.3.post2 # via jsonschema -futures==3.2.0 # via requests-futures hyperlink==18.0.0 # via twisted idna==2.6 # via cryptography, hyperlink, requests incremental==17.5.0 # via twisted @@ -78,7 +75,7 @@ pyjwt==1.6.0 # via social-auth-core, twilio pyparsing==2.2.0 pyrad==1.2 # via django-radius python-dateutil==2.7.2 -python-ldap==2.5.2 # via django-auth-ldap +python-ldap==3.1.0 # via django-auth-ldap python-logstash==0.4.6 python-memcached==1.59 python-openid==2.2.5 # via social-auth-core diff --git a/requirements/requirements_ansible.in b/requirements/requirements_ansible.in index 5ad10c8579..005c3a91f3 100644 --- a/requirements/requirements_ansible.in +++ b/requirements/requirements_ansible.in @@ -45,7 +45,6 @@ psutil==5.4.3 # same as AWX requirement setuptools==36.0.1 pip==9.0.1 # VMware -psphere==0.5.2 pyvmomi==6.5 # WinRM backports.ssl-match-hostname==3.5.0.1 diff --git a/requirements/requirements_ansible.txt b/requirements/requirements_ansible.txt index a2b9c9e1d1..99fb6c32a3 100644 --- a/requirements/requirements_ansible.txt +++ b/requirements/requirements_ansible.txt @@ -51,7 +51,6 @@ docutils==0.14 # via botocore dogpile.cache==0.6.5 # via openstacksdk entrypoints==0.2.3 # via keyring enum34==1.1.6 # via cryptography, knack, msrest, ovirt-engine-sdk-python -futures==3.2.0 # via openstacksdk, s3transfer humanfriendly==4.8 # via azure-cli-core idna==2.6 # via cryptography, requests ipaddress==1.0.19 # via cryptography, openstacksdk @@ -81,7 +80,6 @@ packaging==17.1 paramiko==2.4.0 # via azure-cli-core, ncclient pbr==3.1.1 # via keystoneauth1, openstacksdk, os-service-types, shade, stevedore pexpect==4.6.0 -psphere==0.5.2 psutil==5.4.3 ptyprocess==0.5.2 # via pexpect pyasn1==0.4.2 # via paramiko @@ -97,7 +95,7 @@ python-dateutil==2.6.1 # via adal, azure-storage, botocore python-memcached==1.59 pyvmomi==6.5 pywinrm[kerberos]==0.3.0 -pyyaml==3.12 # via azure-cli-core, knack, openstacksdk, os-client-config, psphere +pyyaml==3.12 # via azure-cli-core, knack, openstacksdk, os-client-config requests-credssp==0.1.0 requests-kerberos==0.12.0 # via pywinrm requests-ntlm==1.1.0 # via pywinrm @@ -110,7 +108,6 @@ selectors2==2.0.1 # via ncclient shade==1.27.0 six==1.11.0 # via azure-cli-core, bcrypt, cryptography, isodate, keystoneauth1, knack, munch, ncclient, ntlm-auth, openstacksdk, ovirt-engine-sdk-python, packaging, pynacl, pyopenssl, python-dateutil, python-memcached, pyvmomi, pywinrm, stevedore stevedore==1.28.0 # via keystoneauth1 -suds==0.4 # via psphere tabulate==0.7.7 # via azure-cli-core, knack urllib3==1.24 # via requests wheel==0.30.0 # via azure-cli-core diff --git a/requirements/requirements_git.txt b/requirements/requirements_git.txt index 3b65bbc4b3..24083287d6 100644 --- a/requirements/requirements_git.txt +++ b/requirements/requirements_git.txt @@ -1,4 +1,4 @@ git+https://github.com/ansible/ansiconv.git@tower_1.0.0#egg=ansiconv git+https://github.com/ansible/django-qsstats-magic.git@tower_0.7.2#egg=django-qsstats-magic -git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding +git+https://github.com/ryanpetrello/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding git+https://github.com/ansible/django-jsonbfield@fix-sqlite_serialization#egg=jsonbfield diff --git a/tools/clusterdevel/bootstrap_minishift.sh b/tools/clusterdevel/bootstrap_minishift.sh index 4b7265d852..5f25838f53 100755 --- a/tools/clusterdevel/bootstrap_minishift.sh +++ b/tools/clusterdevel/bootstrap_minishift.sh @@ -16,7 +16,7 @@ fi #make awx-link python setup.py develop -ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python2.7/site-packages/rdb.py || true +ln -s /awx_devel/tools/rdb.py /venv/awx/lib/python3.6/site-packages/rdb.py || true yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /supervisor.conf # AWX bootstrapping diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile index 7fd18c5d19..56382ee0d5 100644 --- a/tools/docker-compose/Dockerfile +++ b/tools/docker-compose/Dockerfile @@ -11,19 +11,19 @@ RUN yum -y localinstall http://download.postgresql.org/pub/repos/yum/9.4/redhat/ RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash - RUN yum -y update && yum -y install openssh-server ansible mg vim tmux \ - git2u-core mercurial subversion python-devel python-psycopg2 make postgresql \ + git2u-core mercurial subversion python36 python36-devel python-psycopg2 make postgresql \ postgresql-devel nginx nodejs python-psutil libxml2-devel libxslt-devel \ libstdc++.so.6 gcc cyrus-sasl-devel cyrus-sasl openldap-devel libffi-devel \ - zeromq-devel python-pip xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 \ + xmlsec1-devel swig krb5-devel xmlsec1-openssl xmlsec1 \ xmlsec1-openssl-devel libtool-ltdl-devel rabbitmq-server bubblewrap \ - zanata-python-client gettext gcc-c++ libcurl-devel python-pycurl bzip2 \ - python-crypto rsync + zanata-python-client gettext gcc-c++ libcurl-devel bzip2 \ + rsync -RUN pip install virtualenv +RUN python36 -m ensurepip +RUN pip3 install virtualenv RUN /usr/bin/ssh-keygen -q -t rsa -N "" -f /root/.ssh/id_rsa RUN mkdir -p /data/db -RUN pip2 install honcho -RUN pip2 install supervisor +RUN pip3 install honcho ADD requirements/requirements.txt \ requirements/requirements_git.txt \ @@ -64,5 +64,5 @@ RUN for dir in /var/lib/awx/ /projects /.ansible /var/log/nginx /var/lib/nginx / do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done RUN for file in /etc/passwd /etc/supervisord.conf \ - /venv/awx/lib/python2.7/site-packages/awx.egg-link /var/run/nginx.pid; \ + /venv/awx/lib/python3.6/site-packages/awx.egg-link /var/run/nginx.pid; \ do touch $file; chmod -R g+rwx $file; chgrp -R root $file; done diff --git a/tools/docker-compose/start_tests.sh b/tools/docker-compose/start_tests.sh index 627d9be111..972de85b1d 100755 --- a/tools/docker-compose/start_tests.sh +++ b/tools/docker-compose/start_tests.sh @@ -11,7 +11,7 @@ cd /awx_devel make clean cp -R /tmp/awx.egg-info /awx_devel/ || true sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO -cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link +cp /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link cp awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py make "${1:-test}" diff --git a/tools/docker-compose/unit-tests/entrypoint.sh b/tools/docker-compose/unit-tests/entrypoint.sh index 0ff29d946b..351434b1ff 100644 --- a/tools/docker-compose/unit-tests/entrypoint.sh +++ b/tools/docker-compose/unit-tests/entrypoint.sh @@ -3,7 +3,7 @@ # Code duplicated from start_development.sh cp -R /tmp/awx.egg-info /awx_devel/ || true sed -i "s/placeholder/$(cat /awx_devel/VERSION)/" /awx_devel/awx.egg-info/PKG-INFO -cp /tmp/awx.egg-link /venv/awx/lib/python2.7/site-packages/awx.egg-link +cp /tmp/awx.egg-link /venv/awx/lib/python3.6/site-packages/awx.egg-link cp -f awx/settings/local_settings.py.docker_compose awx/settings/local_settings.py |