Merge pull request #490 from eregs/django110111

Django 1.10 and 1.11 support (Django 1.11 PR #3)

.dockerignore

@@ -0,0 +1,86 @@
+# Compiled source #
+###################
+*.com
+*.class
+*.dll
+*.exe
+*.o
+*.so
+
+# Packages #
+############
+# it's better to unpack these files and commit the raw source
+# git has its own built in compression methods
+*.7z
+*.dmg
+*.gz
+*.iso
+*.jar
+*.rar
+*.tar
+*.zip
+
+# Logs and databases #
+######################
+*.log
+*.sql
+*.sqlite
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# Grunt.js #
+############
+node_modules/
+oldphantomjs/
+.grunt/
+
+# Minified assets #
+###############
+*.min.js
+*.min.css
+
+# Floobits #
+###############
+.floo
+.flooignore
+.sublime-project
+
+# Custom #
+##########
+*.py[co]
+eregsip/
+*.swp
+dev_local_settings.py
+config.json
+src/
+_SpecRunner.html
+head/public/fonts
+regulations/static/regulations/docs/*
+regulations/static/regulations/js/source/require.config.js
+regulations/static/regulations/js/source/lib/
+regulations/static/regulations/js/tests/browser/test.config.js
+regulations/static/regulations/js/unittests/coverage/
+regulations/static/regulations/js/built/*
+regulations/static/regulations/js/built/regulations.js
+regulations/static/regulations/css/style.css
+docs/Makefile
+docs/make.bat
+regulations-core/
+style.css.map
+.coverage
+regulations.egg-info
+.tox
+
+
+# docs output
+docs/_build
+

.gitignore

@@ -79,6 +79,7 @@ regulations-core/
 style.css.map
 .coverage
 regulations.egg-info
+.tox
 
 
 # docs output

.travis.yml

@@ -10,36 +10,27 @@ matrix:
     - python: '2.7'
     - python: '3.4'
     - python: '3.5'
+    - python: '3.6'
     - python: '2.7'
       addons:
         sauce_connect: true
       env:
         - secure: "bYazvj8ja2k7vG9dy/gckKfzzzk3fVaHKp2tcDO0Io7ESqaDrKgpYsmGPXKv6Lm/Kp8C9R9+/Ir8qhYV60GxQSq12rFCnwWgDZQD98i7/Bw1H/Hd8ou9fUw+7UO6OCQMI677W4tMyd7JlOdUU2rFjE+nt/WXJv3RgFKGdLOsHTU="
         - secure: "WB+NApjaJTjEjcC09R9vKWvnDcNeOhfDtc4l2jKpAYpR6NYcoF12xrsV8KlNeLb3uXgopPQsguv9dtv8x+oF7zv5NKmbDhmr2QmQxDGbuEAVrvKfk5T6F487o9Q5xKiTup1upCBvRbU7BhgKCovexlj+PwWCWOzIyeSjUtT8d3c="
-    - python: '3.4'
-      addons:
-        sauce_connect: true
-      env:
-        - secure: "bYazvj8ja2k7vG9dy/gckKfzzzk3fVaHKp2tcDO0Io7ESqaDrKgpYsmGPXKv6Lm/Kp8C9R9+/Ir8qhYV60GxQSq12rFCnwWgDZQD98i7/Bw1H/Hd8ou9fUw+7UO6OCQMI677W4tMyd7JlOdUU2rFjE+nt/WXJv3RgFKGdLOsHTU="
-        - secure: "WB+NApjaJTjEjcC09R9vKWvnDcNeOhfDtc4l2jKpAYpR6NYcoF12xrsV8KlNeLb3uXgopPQsguv9dtv8x+oF7zv5NKmbDhmr2QmQxDGbuEAVrvKfk5T6F487o9Q5xKiTup1upCBvRbU7BhgKCovexlj+PwWCWOzIyeSjUtT8d3c="
-    - python: '3.5'
+    - python: '3.6'
       addons:
         sauce_connect: true
       env:
         - secure: "bYazvj8ja2k7vG9dy/gckKfzzzk3fVaHKp2tcDO0Io7ESqaDrKgpYsmGPXKv6Lm/Kp8C9R9+/Ir8qhYV60GxQSq12rFCnwWgDZQD98i7/Bw1H/Hd8ou9fUw+7UO6OCQMI677W4tMyd7JlOdUU2rFjE+nt/WXJv3RgFKGdLOsHTU="
         - secure: "WB+NApjaJTjEjcC09R9vKWvnDcNeOhfDtc4l2jKpAYpR6NYcoF12xrsV8KlNeLb3uXgopPQsguv9dtv8x+oF7zv5NKmbDhmr2QmQxDGbuEAVrvKfk5T6F487o9Q5xKiTup1upCBvRbU7BhgKCovexlj+PwWCWOzIyeSjUtT8d3c="
 before_install:
-  - pip install -U pip wheel
-  - rm -rf ~/.nvm
   - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.30.2/install.sh | bash
   - source ~/.nvm/nvm.sh
   - nvm install 6.9.2
   - nvm use 6.9.2
 install:
-  - pip install -r requirements.txt
-  - pip install -r requirements_test.txt
+  - pip install tox-travis
   - npm install -g grunt-cli
-  - ./frontendbuild.sh
 script:
-  - if [ -z "$SAUCE_ACCESS_KEY" ]; then ./unit-tests.sh; fi
-  - if [ ! -z "$SAUCE_ACCESS_KEY" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./integration-tests.sh; fi
+  - ./frontendbuild.sh
+  - if [ ! -z "$SAUCE_ACCESS_KEY" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then ./devops/integration-tests.sh; else tox; fi

Dockerfile

@@ -0,0 +1,23 @@
+FROM node:6
+ARG PYTHON3=3
+ENV PIP_PACKAGE=python${PYTHON3}-pip \
+    PIP_CMD=pip$PYTHON3 \
+    PYTHON_CMD=python$PYTHON3
+
+RUN apt-get update \
+    && apt-get install -y $PIP_PACKAGE \
+    && rm -rf /var/lib/apt/lists/*
+RUN $PIP_CMD install --upgrade pip
+RUN npm install --quiet -g grunt-cli
+
+COPY ["manage.py", "package.json", "example-config.json", "setup.py", "frontendbuild.sh", "Gruntfile.js", ".babelrc", ".eslintignore", ".eslintrc", "/app/src/"]
+COPY ["regulations", "/app/src/regulations"]
+COPY ["fr_notices", "/app/src/fr_notices"]
+WORKDIR /app/src/
+RUN ./frontendbuild.sh
+RUN $PIP_CMD install --no-cache-dir -e . \
+    && $PYTHON_CMD manage.py migrate
+
+ENV PYTHONUNBUFFERED="1"
+EXPOSE 8000
+CMD $PYTHON_CMD manage.py runserver 0.0.0.0:8000