Update Project Structure (PR #225)

[WIP] Update project structure

.dockerignore

@@ -2,3 +2,4 @@
 !.coveragerc
 !.env
 !.pylintrc
+.cache

.editorconfig

@@ -1,28 +1,25 @@
 # http://editorconfig.org
-
 root = true
 
 [*]
 charset = utf-8
 end_of_line = lf
+indent_style = space
+indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{py,rst,ini}]
-indent_style = space
-indent_size = 4
-
 [*.py]
-line_length=120
-known_first_party=geomat
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+indent_size = 4
+line_length=79
+known_first_party=clock
 multi_line_output=3
 default_section=THIRDPARTY
 
-[*.{html,css,scss,json,yml}]
-indent_style = space
-indent_size = 2
-
-[*.md]
+[*.{md}]
+indent_style = ignore
+indent_size = ignore
 trim_trailing_whitespace = false
 
 [Makefile]

.gitignore

@@ -1,12 +1,3 @@
-### OSX ###
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# project files should be checked into the repository, unless a significant
-# proportion of contributors will probably not be using SublimeText
-# *.sublime-project
-
 # Basics
 *.py[cod]
 *.pyc
@@ -30,22 +21,15 @@ htmlcov
 .idea
 
 # Vim
-
 *~
 *.swp
 *.swo
 
-# npm
-node_modules/
-
-# Compass
-.sass-cache
-
 # virtual environments
 .env
 
 # User-uploaded media
 geomat/media/
 
-#Batch-file for starting docker container
-docker_geomat_batch.bat
+# OSX
+.DS_Store

.travis.yml

@@ -1,18 +1,28 @@
 sudo: false
 
+services:
+  - postgresql
+
 language: python
+python:
+  - "3.6"
+
+env:
+  - TRAVIS_CI=True
 
 cache:
   apt: true
+  pip: true
   directories:
     - $HOME/.cache/pip
 
-python:
-  - "3.6"
 install:
-  - "pip install -U setuptools"
-  - "pip install -r requirements/local.txt"
+  - make
+before_script:
+  - psql -c "CREATE DATABASE test_db_app;" -U postgres
+  - psql -c "CREATE USER db_user WITH PASSWORD 'db_pass';" -U postgres
 script:
-  - "py.test --cov=./"
+  - make ci
+#  - make analyze
 after_success:
-  - "codecov"
+  - codecov

Makefile

@@ -0,0 +1,16 @@
+init:
+	pip install pipenv --upgrade
+	pipenv install --dev --skip-lock
+ci:
+	pipenv run pytest --cov=./
+analyze:
+	pipenv run flake8 .
+	pipenv run isort -v
+build:
+	docker-compose build
+rebuild:
+	docker-compose build --force-rm --no-cache
+lang-make:
+	pipenv run python manage.py makemessages --no-location --no-wrap
+lang-compile:
+	pipenv run python manage.py compilemessages

Pipfile

@@ -0,0 +1,53 @@
+[[source]]
+
+url = "https://pypi.python.org/simple"
+verify_ssl = true
+name = "pypi"
+
+
+[packages]
+
+django = "*"
+django-environ = "*"
+whitenoise = "*"
+django-braces = "*"
+django-crispy-forms = "*"
+django-model-utils = "*"
+django-allauth = "*"
+"psycopg2" = "*"
+awesome-slugify = "*"
+pytz = "*"
+django-stdimage = "*"
+djangorestframework = "*"
+pillow = "*"
+markdown = "*"
+django-filter = "*"
+django-stdimage-serializer = "*"
+coreapi = "*"
+pygments = "*"
+django-cors-headers = "*"
+gevent = "*"
+gunicorn = "*"
+django-anymail = "*"
+raven = "*"
+ipython-genutils = "*"
+drf-yasg = "*"
+
+
+[dev-packages]
+
+coverage = "*"
+django-coverage-plugin = "*"
+sphinx = "*"
+django-extensions = "*"
+werkzeug = "*"
+django-test-plus = "*"
+factory-boy = "*"
+django-debug-toolbar = "*"
+ipython = "*"
+ipdb = "*"
+pytest-django = "*"
+pytest-sugar = "*"
+django-rosetta = "*"
+pytest-cov = "*"
+codecov = "*"