Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ git clone [email protected]:vitorfs/colossus.git
Ideally, create a [virtualenv](https://docs.python-guide.org/dev/virtualenvs/) and install the projects dependencies:

```commandline
pip install -r requirements/development.txt
pip install -r requirements-dev.txt
```

Create a local database:
Expand Down Expand Up @@ -82,7 +82,7 @@ message broker compatible with Celery.
The jQuery library is more of a Bootstrap dependency. There is very little JavaScript code in the project. For the most
part the code base is just plain Django and HTML templates.

Complete list of Python dependencies can be found in the requirements files.
Complete list of Python dependencies can be found in `requirements.txt` and `requirements-dev.txt`.

## Documentation

Expand Down
2 changes: 1 addition & 1 deletion colossus/apps/subscribers/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)

import requests
from ratelimit.decorators import ratelimit
from django_ratelimit.decorators import ratelimit

from colossus.apps.campaigns.models import Campaign, Email, Link
from colossus.apps.core.models import Token
Expand Down
5 changes: 5 additions & 0 deletions colossus/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

'debug_toolbar',
'crispy_forms',
'crispy_bootstrap4',

'colossus.apps.accounts',
'colossus.apps.campaigns',
Expand All @@ -39,6 +40,8 @@
'colossus.apps.lists',
'colossus.apps.notifications',
'colossus.apps.subscribers',


]

SITE_ID = 1
Expand All @@ -52,6 +55,8 @@
default=config('DATABASE_URL', default='sqlite:///%s' % os.path.join(BASE_DIR, 'db.sqlite3'))
)
}
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'


INTERNAL_IPS = [
'127.0.0.1',
Expand Down
2 changes: 1 addition & 1 deletion docs/quickstart.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Ideally, create a `virtualenv <https://docs.python-guide.org/dev/virtualenvs/>`_

::

pip install -r requirements/development.txt
pip install -r requirements-dev.txt


Create a local database:
Expand Down
12 changes: 12 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
-r requirements.txt
coverage
factory-boy
flake8
ipython
isort
mypy
Sphinx
pyenchant
sphinxcontrib-spelling
sphinx-rtd-theme
tox
20 changes: 17 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
-r requirements/production.txt

whitenoise==4.1.2
beautifulsoup4
celery
dj-database-url
django
django-crispy-forms
django-debug-toolbar
django-ratelimit
crispy_bootstrap4
geoip2
html2text
gunicorn
psycopg2-binary
python-decouple
pytz
raven
requests
whitenoise
13 changes: 0 additions & 13 deletions requirements/base.txt

This file was deleted.

3 changes: 0 additions & 3 deletions requirements/development.txt

This file was deleted.

4 changes: 0 additions & 4 deletions requirements/docs.txt

This file was deleted.

4 changes: 0 additions & 4 deletions requirements/production.txt

This file was deleted.

8 changes: 0 additions & 8 deletions requirements/tests.txt

This file was deleted.

4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ envlist =
basepython = python3

[testenv:py3]
deps = -r{toxinidir}/requirements/tests.txt
deps = -r{toxinidir}/requirements-dev.txt
commands = coverage run manage.py test --settings=colossus.settings

[testenv:flake8]
Expand All @@ -29,6 +29,6 @@ commands = mypy colossus
[testenv:docs]
usedevelop = false
whitelist_externals = make
deps = -r{toxinidir}/requirements/docs.txt
deps = -r{toxinidir}/requirements-dev.txt
changedir = docs
commands = make spelling