renew-workaround

reuirements fix + sshkey_patch

circle/circle/settings/local.py

@@ -73,6 +73,7 @@ CACHES = {
 ########## ROSETTA CONFIGURATION
 ########## ROSETTA CONFIGURATION
 INSTALLED_APPS += (
 INSTALLED_APPS += (
     'rosetta',
     'rosetta',
+    'template_debug',
 )
 )
 ########## END ROSETTA CONFIGURATION
 ########## END ROSETTA CONFIGURATION
 
 
@@ -122,4 +123,6 @@ PIPELINE["COMPILERS"] = (
 
 
 ADMIN_ENABLED = False
 ADMIN_ENABLED = False
 
 
+TEMPLATE_DEBUG = True
+
 ALLOWED_HOSTS = ['*']
 ALLOWED_HOSTS = ['*']

circle/dashboard/templates/dashboard/_vm-renew.html

 {% extends "dashboard/operate.html" %}
 {% extends "dashboard/operate.html" %}
 
 
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block formbuttons %}
-<div class="pull-right">
-  <a class="btn btn-default" href="{{object.get_absolute_url}}" data-dismiss="modal">
-    {% trans "Cancel" %}
-  </a>
-  {% if object.active and lease_types and not request.token_user %}
-  <a class="btn btn-primary" id="vm-renew-request-lease-button"
-   href="{% url "request.views.request-lease" vm_pk=object.pk %}">
-    <i class="fa fa-forward"></i>
-    {% trans "Request longer lease" %}
-  </a>
-  {% endif %}
-  <button class="btn btn-{{ opview.effect }} btn-op-form-send" type="submit" id="op-form-send">
-    {% if opview.icon %}<i class="fa fa-fw fa-{{opview.icon}}"></i> {% endif %}{{ op.name|capfirst }}
-  </button>
-</div>
-{% endblock %}
-
-{% block extra %}
-<div class="clearfix"></div>
-<div id="vm-renew-request-lease">
-  <hr />
-  {% include "request/_request-lease-form.html" with form=lease_request_form vm=object %}
-</div>
-{% endblock %}

requirements/base.txt

-cryptography
-amqp
-anyjson
-arrow
-billiard
-bpython
+2to3==1.0
+cryptography==36.0.1
+amqp==1.4.9
+anyjson==0.3.3
+arrow==1.2.1
+billiard==3.3.0.23
+bpython==0.22.1
 celery==3.1.18
 celery==3.1.18
-Django
-django-appconf
-django-autocomplete-light
-django-braces
-django-crispy-forms
-django-model-utils
-django-pipeline
-django-sizefield
-django-statici18n
-django-tables2
-django-taggit
-djangosaml2
-git+https://git.ik.bme.hu/circle/django-sshkey.git
-docutils
-Jinja2
-jsonfield
-kombu
-logutils
-MarkupSafe
-netaddr
-pip-tools
-psycopg2
-Pygments
-pylibmc
-python-dateutil
-pyinotify
-pyotp
-pytz
-requests
-salt
-shutilwhich
-simplejson
-six
-slimit
-sqlparse
-pika
-Fabric
-lxml
-python-memcached
-enum34
-ipaddress
-
+Django==3.2.3
+django-appconf==1.0.5
+django-autocomplete-light==3.8.2
+django-braces==1.15.0
+django-crispy-forms==1.13.0
+django-model-utils==4.2.0
+django-pipeline==2.0.7
+django-simplesshkey==1.1.0
+django-sizefield==2.0.0
+django-statici18n==2.2.0
+django-tables2==2.4.1
+django-taggit==2.0.0
+django-utils-six==2.0
+djangosaml2==1.3.5
+django-sshkey @ git+https://git.ik.bme.hu/circle/django-sshkey.git
+docutils==0.18.1
+Jinja2==3.0.3
+jsonfield==3.1.0
+kombu==3.0.30
+logutils==0.3.5
+MarkupSafe==2.0.1
+netaddr==0.8.0
+pip-tools==6.4.0
+psycopg2==2.9.2
+Pygments==2.10.0
+pylibmc==1.6.1
+python-dateutil==2.8.2
+pyinotify==0.9.6
+pyotp==2.6.0
+pytz==2021.3
+requests==2.26.0
+salt==3004
+shutilwhich==1.1.0
+simplejson==3.17.6
+six==1.16.0
+slimit==0.8.1
+sqlparse==0.4.2
+pika==1.2.0
+fabric==2.6.0
+lxml==4.7.1
+python-memcached==1.59
+enum34==1.1.10
+ipaddress==1.0.23

requirements/freeze

+2to3==1.0
+amqp==1.4.9
+anyjson==0.3.3
+arrow==1.2.1
+asgiref==3.4.1
+backports.cached-property==1.0.1
+backports.entry-points-selectable==1.1.1
+bcrypt==3.2.0
+billiard==3.3.0.23
+blessings==1.7
+bpython==0.22.1
+celery==3.1.18
+certifi==2021.10.8
+cffi==1.15.0
+charset-normalizer==2.0.9
+click==8.0.3
+contextvars==2.4
+cryptography==36.0.1
+curtsies==0.3.10
+cwcwidth==0.1.5
+dataclasses==0.8
+defusedxml==0.7.1
+distlib==0.3.4
+distro==1.6.0
+Django==3.2.3
+django-appconf==1.0.5
+django-autocomplete-light==3.8.2
+django-braces==1.15.0
+django-crispy-forms==1.13.0
+django-model-utils==4.2.0
+django-pipeline==2.0.7
+django-rosetta==0.9.8
+django-simplesshkey==1.1.0
+django-sizefield==2.0.0
+django-sshkey @ git+https://git.ik.bme.hu/circle/django-sshkey.git@c03c40304dafff9e25342bc6988d453810d5b7ad
+django-statici18n==2.2.0
+django-tables2==2.4.1
+django-taggit==2.0.0
+django-template-debug==0.3.5
+django-utils-six==2.0
+djangosaml2==1.3.5
+docutils==0.18.1
+elementpath==2.4.0
+enum34==1.1.10
+fabric==2.6.0
+filelock==3.4.1
+gitdb==4.0.9
+greenlet==1.1.2
+idna==3.3
+immutables==0.16
+importlib-metadata==4.8.3
+importlib-resources==5.4.0
+invoke==1.6.0
+ipaddress==1.0.23
+Jinja2==3.0.3
+jsonfield==3.1.0
+kombu==3.0.30
+logutils==0.3.5
+lxml==4.7.1
+MarkupSafe==2.0.1
+msgpack==1.0.3
+netaddr==0.8.0
+paramiko==2.9.1
+pathlib2==2.3.6
+pbr==5.8.0
+pep517==0.12.0
+pika==1.2.0
+pip-tools==6.4.0
+pkg_resources==0.0.0
+platformdirs==2.4.0
+ply==3.11
+polib==1.1.1
+psutil==5.8.0
+psycopg2==2.9.2
+pyasn1==0.4.8
+pycparser==2.21
+pycryptodomex==3.12.0
+Pygments==2.10.0
+pyinotify==0.9.6
+pylibmc==1.6.1
+PyNaCl==1.4.0
+pyOpenSSL==21.0.0
+pyotp==2.6.0
+pysaml2==7.1.0
+python-dateutil==2.8.2
+python-memcached==1.59
+pytz==2021.3
+pyxdg==0.27
+PyYAML==6.0
+pyzmq==21.0.2
+requests==2.26.0
+salt==3004
+shutilwhich==1.1.0
+simplejson==3.17.6
+six==1.16.0
+slimit==0.8.1
+smmap==5.0.0
+sqlparse==0.4.2
+stevedore==3.5.0
+tomli==1.2.3
+typing==3.7.4.3
+typing_extensions==4.0.1
+urllib3==1.26.7
+vine==5.0.0
+virtualenv==20.10.0
+virtualenv-clone==0.5.7
+virtualenvwrapper==4.8.4
+xmlschema==1.9.2
+zipp==3.6.0

requirements/local.txt

 # Local development dependencies go here
 # Local development dependencies go here
 -r base.txt
 -r base.txt
-coverage==3.7.1
-django-debug-toolbar==1.8
-django-rosetta==0.7.13
-Sphinx==1.3.1
+coverage
+django-debug-toolbar
+django-rosetta
+django-template-debug
+Sphinx

requirements/simplesshkey.patch

+--- orig/lib/python3.6/site-packages/simplesshkey/models.py	2022-01-13 19:21:30.504520293 +0000
++++ circle/lib/python3.6/site-packages/simplesshkey/models.py	2022-01-03 16:49:07.888746364 +0000
+@@ -32,7 +32,7 @@
+ 
+ from __future__ import unicode_literals
+ 
+-from django.utils.encoding import python_2_unicode_compatible
++from six import python_2_unicode_compatible
+ from django.db import models
+ from django.conf import settings as django_settings
+ from django.core.exceptions import ValidationError