Django 2.0 - (incomplete)

.buildpacks

@@ -0,0 +1,3 @@
+https://github.com/heroku/heroku-buildpack-python.git#v70
+https://github.com/cyberdelia/heroku-geo-buildpack.git#1.3
+https://github.com/heroku/heroku-buildpack-python.git#v70

.circleci/config.yml

@@ -0,0 +1,58 @@
+# Javascript Node CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-javascript/ for more details
+#
+#
+version: 2
+jobs:
+  build:
+    docker:
+      - image: modulitos/api:release-1.11.2
+        auth:
+          username: $DOCKERHUB_USERNAME
+          password: $DOCKERHUB_PASSWORD
+        environment:
+          PASS: test1234
+          USERNAME: testuser
+          DB_NAME: test_db
+          HOST: localhost
+          PORT: 5432
+      - image: kartoza/postgis:9.6-2.4
+        environment:
+          POSTGRES_PASS: test1234
+          POSTGRES_USER: testuser
+          POSTGRES_DBNAME: test_db
+          ALLOW_IP_RANGE: 0.0.0.0/0
+    working_directory: /api
+    steps:
+      - checkout
+        # TODO(luke): add this to the container itself:
+      - run: apt-get install netcat-openbsd
+      - run:
+          name: Waiting for Postgres to be ready
+          command: |
+            for i in `seq 1 15`;
+            do
+            nc -z localhost 5432 && echo Success && exit 0
+            echo -n .
+            sleep 1
+            done
+            echo Failed waiting for Postgres && exit 1
+      - run:
+          # TODO(luke): handle race condition where postgres is up,
+          # but DB is not yet ready
+          name: Waiting for Postgres DB creation
+          command: |
+            sleep 5
+      - run:
+          name: Run our code formatting tests
+          command: |
+            black --check . 
+      - run:
+          name: Migrate DB
+          command: |
+            ./src/manage.py migrate
+      - run:
+          name: Run our app tests
+          command: |
+            ./src/manage.py test

.gitignore

@@ -0,0 +1,44 @@
+# user-specific
+db/*.sqlite3
+log/*.log
+debug*
+.idea
+*.sw*
+.vscode
+
+# tmp
+tmp/
+.sass-cache/
+profiling/
+attachments/
+build/
+
+# cover_me generated
+coverage
+coverage.data
+.coverage
+
+# junk
+.DS_Store
+*~
+*flymake.html
+*flymake.py
+
+# compiled files
+*.py[co]
+staticfiles
+
+# environment
+env*
+.env/
+.env
+
+# Local project settings
+# src/project/local_settings.py
+
+# IDE project file
+.project
+*.pydevproject
+
+setup.cfg
+notes.org

CHANGELOG.md

@@ -0,0 +1,60 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.6.8] - 2017-08-24
+### Added
+ - Google OAuth login option
+### Changed
+ - Fix Facebook OAuth login
+
+## [0.6.7] - 2017-03-03
+### Added
+ - Landmarks dataset migration script for 'vision' and 'restoration' datasets
+ - HTML Sanitizer for use with submitted fields containing raw html, rendered on client
+
+## [0.6.6] - 2017-02-10
+### Changed
+ - Updates for `smartercleanup` -> `mapseed` organization rename
+
+## [0.6.5] - 2016-11-20
+### Added
+ - Add Sentry logging to config
+ - Add `updateDatasetDevCreds` to Django mgmt commands to conveniently update dev-api creds from db dump.
+
+## [0.6.4] - 2016-11-05
+### Added
+ - Django loginas from upstream
+### Changed
+ - Django 1.7.1 -> 1.7.11
+
+## [0.6.3] - 2016-10-01
+### Added
+ - Added CHANGELOG
+### Changed
+ - Dockerfile updates
+
+## [0.6.2] - 2016-03-06
+### Changed
+ - Dependency updates
+ - Migration for attachments model
+
+## [0.6.1] - 2016-03-03
+### Added
+ - Dockerfile updates
+
+## [0.6.0] - 2016-03-02
+
+## 0.5.0 - 2015-09-25
+
+[0.6.8]: https://github.com/mapseed/api/compare/0.6.7...0.6.8
+[0.6.7]: https://github.com/mapseed/api/compare/0.6.6...0.6.7
+[0.6.6]: https://github.com/mapseed/api/compare/0.6.5...0.6.6
+[0.6.5]: https://github.com/mapseed/api/compare/0.6.4...0.6.5
+[0.6.4]: https://github.com/mapseed/api/compare/0.6.3...0.6.4
+[0.6.3]: https://github.com/mapseed/api/compare/0.6.2...0.6.3
+[0.6.2]: https://github.com/mapseed/api/compare/0.6.1...0.6.2
+[0.6.1]: https://github.com/mapseed/api/compare/0.6.0...0.6.1
+[0.6.0]: https://github.com/mapseed/api/compare/0.5.0...0.6.0

Dockerfile

@@ -0,0 +1,73 @@
+# Set up private key using multi-stage Dockerfile:
+# https://vsupalov.com/build-docker-image-clone-private-repo-ssh-key/
+
+# this is our first build stage, it will not persist in the final image
+FROM ubuntu as intermediate
+
+# install git
+RUN apt-get update
+RUN apt-get install -y git
+
+# add credentials on build
+ARG SSH_PRIVATE_KEY
+RUN mkdir /root/.ssh/
+RUN echo "${SSH_PRIVATE_KEY}" > /root/.ssh/id_rsa
+RUN chmod 0600 /root/.ssh/id_rsa
+
+# make sure your domain is accepted
+RUN touch /root/.ssh/known_hosts
+RUN ssh-keyscan github.com >> /root/.ssh/known_hosts
+
+RUN git clone [email protected]:jalMogo/api.git
+RUN cd api && git checkout jalmogo/python3
+
+
+###########################################################
+# Dockerfile to build Python WSGI Application Containers
+# Based on Debian
+############################################################
+
+# Set the base image to Debian
+FROM python:3.7.5-stretch
+
+# File Author / Maintainer
+MAINTAINER Luke Swart <[email protected]>
+
+# Update the sources list
+RUN apt-get update
+
+# Install basic applications
+RUN apt-get install -y tar curl wget dialog net-tools build-essential gettext
+
+# Install Python and Basic Python Tools
+RUN apt-get install -y python-dev python-distribute python-pip
+
+# Install Postgres/PostGIS dependencies:
+RUN apt-get install -y python-psycopg2 postgresql libpq-dev postgresql-9.6-postgis-2.3 postgis postgresql-9.6
+
+
+# Move the repo from our intermediate image into our final image:
+COPY --from=intermediate /api /api
+
+# # for local testing, cd into project root and uncomment this line:
+# ADD . api
+
+# Get pip to download and install requirements:
+RUN pip install -r /api/requirements.txt
+
+# Expose ports
+EXPOSE 8010
+
+# Set the default directory where CMD will execute
+WORKDIR /api
+
+RUN mkdir static
+VOLUME /api/static
+
+# Set the default command to execute
+# when creating a new container
+# ex:
+# CMD python server.py
+# or:
+# CMD sh -c "python src/manage.py collectstatic --noinput && gunicorn wsgi:application -w 3 -b 0.0.0.0:8010"
+CMD /api/start.sh

Procfile

@@ -0,0 +1,2 @@
+web: newrelic-admin run-program gunicorn project.wsgi --pythonpath src --workers $WORKERS --config gunicorn.conf.py
+worker: src/manage.py celery worker

README.md

@@ -0,0 +1,46 @@
+[![Build Status](https://circleci.com/gh/jalmogo/api.svg?style=shield&circle-token=:circle-token)](https://circleci.com/gh/jalmogo/api.svg?style=shield&circle-token=:circle-token)
+
+Mapseed API
+===============
+
+The Mapseed API is the data storage and data management component that
+powers the Mapseed web application.
+It is a REST API for flexibly storing data about places and an UI for managing
+and exporting your data.
+
+## Prereq's
+
+ * python 3.7
+ * virtualenv
+   * virtualenv can be made with the following command: `mkvirtualenv --python=python3.7 ms-api`
+ * Docker
+ * docker-compose
+
+
+## Installation
+
+### pip install deps
+
+```
+pip install -r requirements.txt
+```
+
+Note that on MacOS, if you are having error building psycopg2, you may need the following:
+
+```
+env LDFLAGS="-I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib" pip install psycopg2
+```
+https://stackoverflow.com/a/39244687
+
+
+might also need to run `pip install gitversion` so that our fork of django-closuretree can build. See here: 
+https://github.com/ocadotechnology/django-closuretree/pull/52 and here: 
+https://github.com/ocadotechnology/django-closuretree/pull/49
+
+## contributing
+
+We use [Black](https://github.com/psf/black) as our code formatter, along with [isort](https://pypi.org/project/isort/). Editor integration is encouraged.
+
+You can format the entire project in one command with `black .` from the project root. Tests will be check by running `black --check .` from the project root.
+
+*TOOD: consider using pre-commit hook as described [here](https://dev.to/notsag/python-code-formatting-using-black-2fe1) and [here](https://adamj.eu/tech/2019/06/20/all-is-turned-to-black/)*

app.json

@@ -0,0 +1,31 @@
+{
+  "name": "Mapseed Data Server",
+  "description": "A standalone Mapseed data API server.",
+  "repository": "https://github.com/mapseed",
+
+  "scripts": {
+    "postdeploy": "scripts/postdeploy"
+  },
+
+  "addons": [
+    "heroku-postgresql:standard-0",
+    "rediscloud"
+  ],
+
+  "env": {
+    "SHAREABOUTS_AWS_BUCKET":      {"required": false, "description": "Where should uploaded attachments go?"},
+    "SHAREABOUTS_AWS_KEY":         {"required": false, "description": ""},
+    "SHAREABOUTS_AWS_SECRET":      {"required": false, "description": ""},
+    "SHAREABOUTS_FACEBOOK_KEY":    {"required": false, "description": ""},
+    "SHAREABOUTS_FACEBOOK_SECRET": {"required": false, "description": ""},
+    "SHAREABOUTS_TWITTER_KEY":     {"required": false, "description": ""},
+    "SHAREABOUTS_TWITTER_SECRET":  {"required": false, "description": ""},
+
+    "BUILDPACK_URL": "https://github.com/ddollar/heroku-buildpack-multi.git",
+    "WORKERS": "4",
+    "SECRET_TOKEN": {
+      "description": "A secret key for verifying the integrity of signed cookies.",
+      "generator": "secret"
+    }
+  }
+}

dotcloud.yml

@@ -0,0 +1,12 @@
+www:
+  type: python
+  config:
+    python_version: v2.7
+  systempackages:
+    - gdal-bin
+    - libgdal1-dev
+db:
+  type: postgis
+
+cache:
+  type: redis

gunicorn.conf.py

@@ -0,0 +1,6 @@
+# Allow all traffic to be forwarded to https
+forwarded_allow_ips = "*"
+x_forwarded_for_header = "X-FORWARDED-FOR"
+secure_scheme_headers = {
+    "X-FORWARDED-PROTO": "https",
+}

hooks/build

@@ -0,0 +1,4 @@
+#!/bin/bash
+# https://forums.docker.com/t/docker-cloud-build-environment-variables-not-being-passed-to-the-auto-build/24010/9
+
+docker build -t $IMAGE_NAME . --build-arg SSH_PRIVATE_KEY="$SSH_PRIVATE_KEY"