diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 561bbad31..2f858fb9b 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -3,20 +3,17 @@ django-haystack==2.8.1 django-filter==2.0.0 djangorestframework==3.9.0 dj-database-url==0.5.0 -django-bower==5.2.0 django-braces==1.9.0 django-crispy-forms==1.7.2 django-floppyforms==1.7.0 django-extra-views==0.12.0 django-model-utils==3.1.2 -django-sass-processor==0.7.2 django-reversion==3.0.2 django-reversion-compare==0.8.6 django-speedinfo==1.4.0 django-extensions==2.1.4 django-image-cropping==1.2 easy-thumbnails==2.5 -libsass==0.17.0 python-decouple==3.1 psycopg2-binary==2.7.6.1 pyyaml==4.2b1 @@ -35,4 +32,8 @@ git+git://github.com/interlegis/trml2pdf.git git+git://github.com/jasperlittle/django-rest-framework-docs git+git://github.com/rubgombar1/django-admin-bootstrapped.git -django-compressor==2.2 \ No newline at end of file +#django-compressor==2.2 +#django-bootstrap3==11.0.0 +#django-bower==5.2.0 +#django-sass-processor==0.7.2 +#libsass==0.17.0 diff --git a/sapl/settings.py b/sapl/settings.py index 119783e9b..b522eb99b 100755 --- a/sapl/settings.py +++ b/sapl/settings.py @@ -77,10 +77,8 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django_extensions', - 'djangobower', 'crispy_forms', 'floppyforms', - 'sass_processor', 'rest_framework', 'django_filters', @@ -270,8 +268,6 @@ STATICFILES_DIRS = (BASE_DIR.child("static"),) STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'djangobower.finders.BowerFinder', - 'sass_processor.finders.CssFinder', ) MEDIA_ROOT = PROJECT_DIR.child("media") @@ -281,29 +277,11 @@ FILE_UPLOAD_PERMISSIONS = 0o644 DAB_FIELD_RENDERER = \ 'django_admin_bootstrapped.renderers.BootstrapFieldRenderer' -CRISPY_TEMPLATE_PACK = 'bootstrap3' -CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' +CRISPY_TEMPLATE_PACK = 'bootstrap4' +CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap4' CRISPY_FAIL_SILENTLY = not DEBUG FLOPPY_FORMS_USE_GIS = False -BOWER_COMPONENTS_ROOT = PROJECT_DIR.child("bower") -BOWER_INSTALLED_APPS = ( - 'jquery#3.1.1', - 'bootstrap-sass#3.3.7', - 'components-font-awesome#4.5.0', - 'tinymce#4.3.8', - 'jquery-ui#1.12.1', - 'jQuery-Mask-Plugin#1.14.0', - 'jsdiff#2.2.2', - 'https://github.com/interlegis/drunken-parrot-flat-ui.git', - 'jquery-query-object#2.2.3', -) - -# Additional search paths for SASS files when using the @import statement -SASS_PROCESSOR_INCLUDE_DIRS = (BOWER_COMPONENTS_ROOT.child( - 'bower_components', 'bootstrap-sass', 'assets', 'stylesheets'), -) - # suprime texto de ajuda default do django-filter FILTERS_HELP_TEXT_FILTER = False diff --git a/setup.py b/setup.py index 59bcbffb0..34226633d 100644 --- a/setup.py +++ b/setup.py @@ -14,20 +14,17 @@ install_requires = [ 'django-filter==2.0.0', 'djangorestframework==3.9.0', 'dj-database-url==0.5.0', - 'django-bower==5.2.0', 'django-braces==1.9.0', 'django-crispy-forms==1.7.2', 'django-floppyforms==1.7.0', 'django-extra-views==0.12.0', 'django-model-utils==3.1.2', - 'django-sass-processor==0.7.2', 'django-reversion==3.0.2', 'django-reversion-compare==0.8.6' 'django-speedinfo==1.4.0', 'django-extensions==2.1.4', 'django-image-cropping==1.2.0', 'easy-thumbnails==2.5', - 'libsass==0.17.0', 'python-decouple==3.1', 'psycopg2-binary==2.7.6.1', 'pyyaml==4.2b1', @@ -47,6 +44,10 @@ install_requires = [ # 'git+git://github.com/rubgombar1/django-admin-bootstrapped.git'' #'django-compressor==2.2', + #'django-bootstrap3==11.0.0', + #'django-bower==5.2.0', + #'django-sass-processor==0.7.2', + #'libsass==0.17.0', ] setup( name='interlegis-sapl',