diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f2486f398..f16c25c2a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,6 +15,8 @@ jobs: # A list of available CircleCI Docker convenience images are available here: https://circleci.com/developer/images/image/cimg/python docker: - image: cimg/python:3.7 + environment: + DATABASE_URL: postgres://${FECFILE_DB_USERNAME}@${FECFILE_DB_PASSWORD}/${FECFILE_DB_NAME} steps: - checkout @@ -22,7 +24,7 @@ jobs: - run: name: Install python test requirements command: pip install -r requirements-test.txt - working_directory: ~/project/django-backend/ + working_directory: ~/project/ - run: name: Run lint @@ -51,7 +53,7 @@ jobs: - python/install-packages: pkg-manager: pip - app-dir: ~/project/django-backend/ + app-dir: ~/project/ pip-dependency-file: requirements.txt - run: diff --git a/django-backend/requirements-test.txt b/requirements-test.txt similarity index 100% rename from django-backend/requirements-test.txt rename to requirements-test.txt diff --git a/tasks.py b/tasks.py index 30d5921b86..a4b354942d 100644 --- a/tasks.py +++ b/tasks.py @@ -4,9 +4,7 @@ import sys import cfenv -# from invoke import run from invoke import task -# from slacker import Slacker env = cfenv.AppEnv() @@ -76,9 +74,7 @@ def deploy(ctx, space=None, branch=None, login=None): if space is None: return - # Build static assets - # These must be built prior to deploying due to the collectstatic - # functionality of the Python buildpack conflicting with our setup. + # Use production settings ctx.run( 'cd django-backend && DJANGO_SETTINGS_MODULE=fecfiler.settings.production', echo=True