From 4760ccec4e0d518e1f897a135958ea8e31f1087b Mon Sep 17 00:00:00 2001 From: Jacob Rief Date: Thu, 29 Sep 2016 17:40:00 +0200 Subject: [PATCH] updated dependencies --- docker/Dockerfile => Dockerfile | 0 {docker => docker-files}/elasticsearch.ini | 0 {docker => docker-files}/redis.conf | 0 {docker => docker-files}/redis.ini | 0 {docker => docker-files}/requirements.txt | 0 {docker => docker-files}/uwsgi.ini | 0 docker/README.md | 10 ---------- example/{docker/polymorphic => }/Dockerfile | 0 .../{docker/polymorphic => docker-files}/README.md | 0 .../{docker/polymorphic => docker-files}/myshop.ini | 0 requirements/common.txt | 12 ++++++------ 11 files changed, 6 insertions(+), 16 deletions(-) rename docker/Dockerfile => Dockerfile (100%) rename {docker => docker-files}/elasticsearch.ini (100%) rename {docker => docker-files}/redis.conf (100%) rename {docker => docker-files}/redis.ini (100%) rename {docker => docker-files}/requirements.txt (100%) rename {docker => docker-files}/uwsgi.ini (100%) delete mode 100644 docker/README.md rename example/{docker/polymorphic => }/Dockerfile (100%) rename example/{docker/polymorphic => docker-files}/README.md (100%) rename example/{docker/polymorphic => docker-files}/myshop.ini (100%) diff --git a/docker/Dockerfile b/Dockerfile similarity index 100% rename from docker/Dockerfile rename to Dockerfile diff --git a/docker/elasticsearch.ini b/docker-files/elasticsearch.ini similarity index 100% rename from docker/elasticsearch.ini rename to docker-files/elasticsearch.ini diff --git a/docker/redis.conf b/docker-files/redis.conf similarity index 100% rename from docker/redis.conf rename to docker-files/redis.conf diff --git a/docker/redis.ini b/docker-files/redis.ini similarity index 100% rename from docker/redis.ini rename to docker-files/redis.ini diff --git a/docker/requirements.txt b/docker-files/requirements.txt similarity index 100% rename from docker/requirements.txt rename to docker-files/requirements.txt diff --git a/docker/uwsgi.ini b/docker-files/uwsgi.ini similarity index 100% rename from docker/uwsgi.ini rename to docker-files/uwsgi.ini diff --git a/docker/README.md b/docker/README.md deleted file mode 100644 index f0566a7b8..000000000 --- a/docker/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# uWSGI serving a django-shop application - -This Dockerfile builds the base image for all projects using **djangoSHOP**: - -``` -docker build -t uwsgi-django-shop . -``` - -This image requires **fedora-uwsgi-python** and provides a base image for the merchant's -implementation. diff --git a/example/docker/polymorphic/Dockerfile b/example/Dockerfile similarity index 100% rename from example/docker/polymorphic/Dockerfile rename to example/Dockerfile diff --git a/example/docker/polymorphic/README.md b/example/docker-files/README.md similarity index 100% rename from example/docker/polymorphic/README.md rename to example/docker-files/README.md diff --git a/example/docker/polymorphic/myshop.ini b/example/docker-files/myshop.ini similarity index 100% rename from example/docker/polymorphic/myshop.ini rename to example/docker-files/myshop.ini diff --git a/requirements/common.txt b/requirements/common.txt index 79617d293..c79087f1b 100644 --- a/requirements/common.txt +++ b/requirements/common.txt @@ -17,14 +17,14 @@ django-parler==1.6.4 django-polymorphic==1.0.1 django-post-office==2.0.8 django-rest-auth==0.5.0 -django-sass-processor==0.4.4 -django-sekizai==0.9.0 -django-select2==5.5.0 +django-sass-processor==0.5.0 +django-sekizai==0.10.0 +Django-Select2==5.8.9 djangoshop-stripe==0.2.0 django-treebeard==4.0 djangocms-bootstrap3==0.1.1 djangocms-cascade==0.10.1 -djangocms-text-ckeditor==3.0.0 +djangocms-text-ckeditor==3.0.1 djangorestframework==3.2.5 drf-haystack==1.5.6 easy-thumbnails==2.3 @@ -33,7 +33,7 @@ html5lib==0.9999999 jsonfield==1.0.3 libsass==0.8.3 oauthlib==1.0.3 -Pillow==3.2.0 +Pillow==3.3.0 pluggy==0.3.1 py==1.4.30 Pygments==2.0.2 @@ -42,7 +42,7 @@ pytz==2015.7 requests==2.7.0 requests-oauthlib==0.5.0 six==1.9.0 -stripe==1.27.1 +stripe==1.37.0 Unidecode==0.4.18 urllib3==1.12 virtualenv==13.1.2