Skip to content

Commit

Permalink
Merge pull request #78 from schbetsy/lib-versions
Browse files Browse the repository at this point in the history
Require library versions up-to-date with cfgov-refresh
  • Loading branch information
schbetsy authored Sep 19, 2018
2 parents f4247aa + f2c3fbf commit 9e579a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 23 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ python manage.py runserver

## API Docs

[Documentation](https://cfpb.github.io/ccdb5-api/) for this repository is rendered via GitHub pages and [Swagger](https://swagger.io/docs/). They can be edited in the `docs/` directory, but to view or deploy them, you'll need to install the dependencies listed in the `requirements_docs.txt` file:
[Documentation](https://cfpb.github.io/ccdb5-api/) for this repository is rendered via GitHub pages and [Swagger](https://swagger.io/docs/). They can be edited in the `docs/` directory, but to view or deploy them, you'll need to install the dependencies listed in the `docs_extras` section of `setup.py`:

```
pip install -r requirements_docs.txt
pip install -e '.[docs]'
```

You can then preview your changes locally by running `mkdocs serve` and then reviewing <http://127.0.0.1:8000/>
Expand Down
15 changes: 0 additions & 15 deletions requirements_docs.txt

This file was deleted.

17 changes: 11 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,24 @@

install_requires = [
'Django>=1.8,<1.12',
'djangorestframework==3.6.4', # Latest version that supports both Django 1.8 and 1.11
'djangorestframework==3.6.4', # Latest version that supports both Django 1.8 and 1.11
'elasticsearch>=2.4.1,<3',
'requests>=2.14,<2.15',
'urllib3>=1.21,<1.22',
'django-localflavor>=1.5,<1.6',
'wagtail-flags>=2.0.5,<2.2',
'requests>=2.18.4,<2.20',
'django-localflavor>=1.1,<2',
'django-flags>=3.0.2,<4',
]

testing_extras = [
'coverage==4.5.1',
'coverage>=4.5.1,<5',
'mock==2.0.0',
'deep==0.10',
]

docs_extras = [
'mkdocs==0.17.5',
'mkDOCter==1.0.5',
]


setup(
name='ccdb5-api',
Expand All @@ -48,6 +52,7 @@
setup_requires=['setuptools-git-version==1.0.3'],
install_requires=install_requires,
extras_require={
'docs': docs_extras,
'testing': testing_extras,
}
)

0 comments on commit 9e579a4

Please sign in to comment.