Update / fi submodules, change ports, add more python modules

diff --git a/.gitmodules b/.gitmodules
index 136000fedebe14257165278f5cf21212a3139cc3..a967754214f5ca03998af0e8c4d9f3011dff60c0 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,4 +21,3 @@
        path = lib/grappelli-safe
        url = https://github.com/yomguy/grappelli-safe.git
         branch = dynamic_stacked
-

diff --git a/Dockerfile b/Dockerfile
index e232b3194c121ba64a3df5121067a1bc7142f20f..4ea71c2289298817824146c7e6724d8d25de84f0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,6 @@ FROM python:3
 
 ENV PYTHONUNBUFFERED 1
 
-RUN mkdir /srv/app
-RUN mkdir /srv/lib
 WORKDIR /srv
 
 RUN apt-get update && apt-get install -y apt-transport-https
@@ -29,11 +27,13 @@ COPY lib/mezzanine-organization-themes/Gemfile /srv
 RUN gem install bundler
 RUN bundle install
 
+RUN mkdir /srv/app
 COPY app/requirements.txt /srv/app
 RUN pip install -r app/requirements.txt
 
-COPY lib /srv
+RUN mkdir /srv/lib
+COPY lib /srv/lib
 COPY bin/setup_lib.sh /srv
-RUN setup_lib.sh
+RUN bash setup_lib.sh
 
 WORKDIR /srv/app

diff --git a/Gemfile b/Gemfile
deleted file mode 100644 (file)
index 039d053..0000000
--- a/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-source "https://rubygems.org"
-ruby "2.1.5"
-gem "compass", "<= 1.0.3"
-gem "sass", "<= 3.4.22"

diff --git a/docker-compose.yml b/docker-compose.yml
index 9c7ed5a439bc96f787133398ed287ca4e9ddcca5..7610f4a0928a1a12d592c7f00d4db166bb91ed11 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,7 +52,7 @@ app:
   expose:
     - "8000"
   ports:
-    - "9022:8000"
+    - "9300:8000"
   links:
     - db
   environment:

diff --git a/env/dev.yml b/env/dev.yml
index 58658d2e384501297b32632bac5698ba689192d8..93ebf7b71110701223cc67a90b9ccd3443a6f85d 100644 (file)
--- a/env/dev.yml
+++ b/env/dev.yml
@@ -2,6 +2,6 @@
 app:
   command: /bin/sh bin/app.sh --runserver
   ports:
-    - "9022:8000"
+    - "9400:8000"
   environment:
     - DEBUG=True

diff --git a/lib/grappelli-safe b/lib/grappelli-safe
index 64188e4182af7b348308dcc03849c21fa1a9542e..78bbc0d8d62ec6c99da7a21624595b9af6a582ed 160000 (submodule)
--- a/lib/grappelli-safe
+++ b/lib/grappelli-safe
@@ -1 +1 @@
-Subproject commit 64188e4182af7b348308dcc03849c21fa1a9542e
+Subproject commit 78bbc0d8d62ec6c99da7a21624595b9af6a582ed

diff --git a/lib/mezzanine b/lib/mezzanine
index f14aab9dd054058233f75200adc3bdb24004fd3a..51cf69d973848f08bc482022fd5bdac9a41f8ff9 160000 (submodule)
--- a/lib/mezzanine
+++ b/lib/mezzanine
@@ -1 +1 @@
-Subproject commit f14aab9dd054058233f75200adc3bdb24004fd3a
+Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9

diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 036a5c7e7bd4f744c1cf36fc332fd3ce3f9c9aa7..8fff1fb82efa8de8c209ae219b1209d6a6deabd0 160000 (submodule)
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 036a5c7e7bd4f744c1cf36fc332fd3ce3f9c9aa7
+Subproject commit 8fff1fb82efa8de8c209ae219b1209d6a6deabd0

diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization
index ad4985f566207a3d1a270ee5d9e45865e0eeb72e..b260f3456a97d9612f35cac601ac93cc14971f5d 160000 (submodule)
--- a/lib/mezzanine-organization
+++ b/lib/mezzanine-organization
@@ -1 +1 @@
-Subproject commit ad4985f566207a3d1a270ee5d9e45865e0eeb72e
+Subproject commit b260f3456a97d9612f35cac601ac93cc14971f5d

diff --git a/package.json b/package.json
deleted file mode 100644 (file)
index ab4485c..0000000
--- a/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "mezzo",
-  "description": "mezzo",
-  "version": "1.0.0",
-  "author": {
-    "name": "Bunker Palace",
-    "email": "devs@bunkerpalace.com"
-  },
-  "devDependencies": {
-    "browser-sync": "^2.11.1",
-    "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^3.1.0",
-    "gulp-bower-files": "^0.2.7",
-    "gulp-browserify": "^0.5.1",
-    "gulp-compass": "^2.1.0",
-    "gulp-concat": "^2.6.0",
-    "gulp-copy": "0.0.2",
-    "gulp-cssnano": "^2.1.1",
-    "gulp-favicons": "^2.2.6",
-    "gulp-ignore": "^2.0.1",
-    "gulp-imagemin": "^2.4.0",
-    "gulp-plumber": "^1.1.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-sourcemaps": "^1.6.0",
-    "gulp-uglify": "^1.5.2",
-    "gulp-util": "^3.0.7",
-    "rimraf": "^2.5.2",
-    "run-sequence": "^1.1.5"
-  },
-  "keywords": []
-}

diff --git a/requirements.txt b/requirements.txt
index 3e1e8735279cd9750e92dbe537a756cbe01abe70..11f0d9aef6f5d11eed6c5c01b2fb7c418d6e98e1 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,3 +11,5 @@ ruby
 ruby-dev
 gettext
 python-sphinx
+python-numpy
+python-pandas