diff --git a/.travis.yml b/.travis.yml index aa532e7..ee958ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: python python: - "2.7" env: - - DJANGO=1.8 + - DJANGO=1.11.14 install: - pip install -r dev/requirements.txt --use-mirrors script: diff --git a/Dockerfile b/Dockerfile index 3bfae3c..3ed8af4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN echo 'APT::Get::Clean=always;' >> /etc/apt/apt.conf.d/99AutomaticClean RUN apt-get update -qqy RUN DEBIAN_FRONTEND=noninteractive apt-get -qyy install \ -o APT::Install-Suggests=false \ - git python-virtualenv python-dev libxml2-dev libvirt-dev zlib1g-dev nginx libsasl2-modules + git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev nginx libsasl2-modules ADD . /srv/webvirtcloud RUN chown -R www-data:www-data /srv/webvirtcloud diff --git a/README.md b/README.md index 62fbc5f..cb68cc2 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ print(''.join([random.SystemRandom().choice(haystack) for _ in range(50)])) ### Install WebVirtCloud panel (Ubuntu) ```bash -sudo apt-get -y install git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev nginx supervisor libsasl2-modules gcc pkg-config +sudo apt-get -y install git python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev nginx supervisor libsasl2-modules gcc pkg-config python-guestfs git clone https://github.com/retspen/webvirtcloud cd webvirtcloud cp webvirtcloud/settings.py.template webvirtcloud/settings.py @@ -67,7 +67,7 @@ wget -O - https://clck.ru/9V9fH | sudo sh ### Install WebVirtCloud panel (CentOS) ```bash -sudo yum -y install python-virtualenv python-devel libvirt-devel glibc gcc nginx supervisor libxml2 libxml2-devel git +sudo yum -y install python-virtualenv python-devel libvirt-devel glibc gcc nginx supervisor python-lxml git python-libguestfs ``` #### Creating directories and cloning repo @@ -230,8 +230,10 @@ datasource: ### How To Update ```bash +sudo virtualenv venv +sudo source venv/bin/activate git pull -pip install Django==1.11.14 +pip install -U -r conf/requirements.txt python manage.py migrate sudo service supervisor restart ``` diff --git a/Vagrantfile b/Vagrantfile index 539468d..a92a1ab 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,7 @@ Vagrant.configure(2) do |config| sudo sed -i 's/auth_tcp = \"sasl\"/auth_tcp = \"none\"/g' /etc/libvirt/libvirtd.conf sudo service libvirt-bin restart sudo adduser vagrant libvirtd - sudo apt-get -y install python-virtualenv python-dev libxml2-dev libvirt-dev zlib1g-dev + sudo apt-get -y install python-virtualenv python-dev python-lxml libvirt-dev zlib1g-dev virtualenv /vagrant/venv source /vagrant/venv/bin/activate pip install -r /vagrant/dev/requirements.txt diff --git a/accounts/urls.py b/accounts/urls.py index 00bdefe..c0ea4f1 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -1,5 +1,4 @@ from django.conf.urls import url -from django.contrib import auth from django.contrib.auth import views as auth_views from . import views diff --git a/conf/requirements.txt b/conf/requirements.txt index d395575..c47d4dc 100644 --- a/conf/requirements.txt +++ b/conf/requirements.txt @@ -1,6 +1,5 @@ Django==1.11.14 websockify==0.8.0 gunicorn==19.9.0 -libvirt-python==4.4.0 -libxml2-python3==2.9.5 lxml==4.2.3 +libvirt-python==4.4.0 \ No newline at end of file diff --git a/dev/requirements.txt b/dev/requirements.txt index ce7c957..0f0118d 100644 --- a/dev/requirements.txt +++ b/dev/requirements.txt @@ -1,4 +1,4 @@ -r ../conf/requirements.txt -pep8==1.6.2 -pyflakes==0.8.1 -pylint==1.4.3 +pep8==1.7.1 +pyflakes==2.0.0 +pylint==1.9.2 diff --git a/instances/templates/instances.html b/instances/templates/instances.html index f87d582..c59abf4 100644 --- a/instances/templates/instances.html +++ b/instances/templates/instances.html @@ -32,7 +32,7 @@