Skip to content

Commit

Permalink
Merge pull request #88 from BridgeCityBicycleCoop/infrastructure-simp…
Browse files Browse the repository at this point in the history
…lification

Infrastructure simplification
  • Loading branch information
drwlrsn authored May 20, 2019
2 parents 7b50ba7 + 36df89a commit 4052188
Show file tree
Hide file tree
Showing 31 changed files with 1,199 additions and 400 deletions.
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.6.6
47 changes: 29 additions & 18 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
language: generic
services:
- docker
before_install:
- docker build --build-arg mailchimp_api_key=$MAILCHIMP_API_KEY --build-arg django_secret_key=$DJANGO_SECRET_KEY -t bcbc/workstand:production .
- docker-compose -f docker-compose.yml -f docker-compose.prod.yml run workstand python manage.py test
- docker-compose -f docker-compose.yml -f docker-compose.prod.yml run workstand npm test -- --ci
branches:
only:
- master
after_success:
- BRANCH=${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH}
- echo $BRANCH
- if [ "$BRANCH" == "master" ]; then
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD";
docker push bcbc/workstand:production;
fi
jobs:
include:
- stage: test
name: "Back End Tests"
language: python
python:
- "3.6.6"
cache: pip
install:
- cd bikeshop_project && npm install
- cd ..
- pip install pipenv
- pipenv install --dev
- cd bikeshop_project
script:
- pipenv run ./manage.py test
- stage: test
name: "Front End Tests"
language: node_js
node_js:
- "7.9.0"
cache: npm
install:
- cd bikeshop_project && npm install
script:
- npm test
notifications:
slack:
secure: n2tF/UW/3cnLgqxU0iq6M6mXoYitXgv4x8Iqv9uFuO6AXJktKADVbSeHVmeDVJu7vlyexytpN7BfJ2W0rbMB5Q+yef3TmWhc5P0MWRR3J+QwbLXdqBIP2tku69OK2aUEcxPvoJZLtDKdfNTt9vtQurGC9kbJ+MKmU0Sm+MFrrxrM4D7/74rynbhppMnwcwouVgzdfmJOt0gc0ySZlWqOacUSOVZxhpJ6aqABkFHWbIzO9LHXBwFLJU3oa8poFg51AYx2cuy7PjHfMtEt2i5bHXPR0NkVm4UMbtmkLvvmHLErS1tAHUgWnLAKAL8i7j8hsKWjBc/+0Pwz7t4j5M79+XcF78dS7VQOzmrP/TdyWfsN4rZeUvl+b+owZKLv1uLG6kQhRI332fzCwtK+VejtBtjdoC9nq1KTOIHa6y10aswqGgfsPL4+6UOke/LZsgb9fqfiB44TYkn0dgfh1J/3P+hNtLOsm1Q2IZQvDU97CqdavfAlye4uKC/WlnY3fXeISEMeE57ZAu8Tz4IKrAIbg7mt7qFTmNqxUIvzfWO5ZaMQZhncRfIMajAUigXr9XjRkewo9cxF2cuDwllTVeY5MTrq8hTqlr0g/N5njS72KkLAzaXKUmzyTpfndrGKH5K2XiSGlpgOZ6ao/FOKr3TmzNV5fiOsLEr9Y2+Q3bgknOE=
rooms:
- secure: "n2tF/UW/3cnLgqxU0iq6M6mXoYitXgv4x8Iqv9uFuO6AXJktKADVbSeHVmeDVJu7vlyexytpN7BfJ2W0rbMB5Q+yef3TmWhc5P0MWRR3J+QwbLXdqBIP2tku69OK2aUEcxPvoJZLtDKdfNTt9vtQurGC9kbJ+MKmU0Sm+MFrrxrM4D7/74rynbhppMnwcwouVgzdfmJOt0gc0ySZlWqOacUSOVZxhpJ6aqABkFHWbIzO9LHXBwFLJU3oa8poFg51AYx2cuy7PjHfMtEt2i5bHXPR0NkVm4UMbtmkLvvmHLErS1tAHUgWnLAKAL8i7j8hsKWjBc/+0Pwz7t4j5M79+XcF78dS7VQOzmrP/TdyWfsN4rZeUvl+b+owZKLv1uLG6kQhRI332fzCwtK+VejtBtjdoC9nq1KTOIHa6y10aswqGgfsPL4+6UOke/LZsgb9fqfiB44TYkn0dgfh1J/3P+hNtLOsm1Q2IZQvDU97CqdavfAlye4uKC/WlnY3fXeISEMeE57ZAu8Tz4IKrAIbg7mt7qFTmNqxUIvzfWO5ZaMQZhncRfIMajAUigXr9XjRkewo9cxF2cuDwllTVeY5MTrq8hTqlr0g/N5njS72KkLAzaXKUmzyTpfndrGKH5K2XiSGlpgOZ6ao/FOKr3TmzNV5fiOsLEr9Y2+Q3bgknOE="
on_success: always
31 changes: 0 additions & 31 deletions Dockerfile

This file was deleted.

11 changes: 0 additions & 11 deletions Dockerfile-dev

This file was deleted.

10 changes: 0 additions & 10 deletions Dockerfile-webpack

This file was deleted.

63 changes: 63 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
[[source]]
name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true

[dev-packages]
beautifulsoup4 = "*"
channels = "==1.1.8"
django-fsm = "==2.6.0"
django-haystack = "==2.6.1"
django-libsass = "==0.7"
django-multiselectfield = "==0.1.7"
django-webpack-loader = "*"
django-widget-tweaks = "==1.4.1"
djangorestframework = "*"
djangorestframework-jwt = "==1.11.0"
mailchimp3 = "==2.0.14"
psycopg2 = "==2.7.1"
python-dateutil = "==2.6.0"
pytz = "==2017.2"
requests = "*"
coverage = "*"
mock = "*"
model-mommy = "==1.5.0"
django-debug-toolbar = "*"
django-cors-headers = "*"
flake8 = "*"
django_compressor = "==2.1.1"
Django = "==1.11.20"
PyYAML = "*"
Whoosh = "==2.7.4"
factory-boy = "*"

[packages]
beautifulsoup4 = "*"
channels = "==1.1.8"
django-fsm = "==2.6.0"
django-haystack = "==2.6.1"
django-libsass = "==0.7"
django-multiselectfield = "==0.1.7"
django-webpack-loader = "*"
django-widget-tweaks = "==1.4.1"
djangorestframework = "*"
djangorestframework-jwt = "==1.11.0"
mailchimp3 = "==2.0.14"
psycopg2 = "==2.7.1"
python-dateutil = "==2.6.0"
pytz = "==2017.2"
requests = "*"
coverage = "*"
mock = "*"
gunicorn = "==19.4.5"
rollbar = "==0.13.11"
daphne = "==1.3.0"
django_compressor = "==2.1.1"
Django = "==1.11.20"
PyYAML = "*"
Whoosh = "==2.7.4"
model_mommy = "==1.5.0"
asgi-redis = "*"

[requires]
python_version = "3.6"
Loading

0 comments on commit 4052188

Please sign in to comment.