diff options
| author | Chris Meyers <chris.meyers.fsu@gmail.com> | 2016-03-01 14:22:40 +0100 |
|---|---|---|
| committer | Chris Meyers <chris.meyers.fsu@gmail.com> | 2016-03-01 14:22:40 +0100 |
| commit | 356b9c99b3d521259ab91389df1384e1e797d45d (patch) | |
| tree | 53a6407ef1531c52f13077412e449582b93701e1 /requirements | |
| parent | Add irc requirements dependency (diff) | |
| parent | add postgres Fact model, update views, tests (diff) | |
| download | awx-356b9c99b3d521259ab91389df1384e1e797d45d.tar.xz awx-356b9c99b3d521259ab91389df1384e1e797d45d.zip | |
Merge branch 'mongoectomy_implementation' into devel
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/requirements.txt | 1 | ||||
| -rw-r--r-- | requirements/requirements_dev.txt | 1 | ||||
| -rw-r--r-- | requirements/requirements_jenkins.txt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/requirements/requirements.txt b/requirements/requirements.txt index dea5dc8def..254d3c0237 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -21,6 +21,7 @@ django-auth-ldap==1.2.6 django-celery==3.1.17 django-crum==0.6.1 django-extensions==1.5.9 +git+https://github.com/chrismeyersfsu/django-jsonbfield@fix-sqlite_serialization#egg=django-jsonbfield django-polymorphic==0.7.2 django-radius==1.0.0 djangorestframework==3.3.2 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 0e1fcaa1ba..9131465b10 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -7,3 +7,4 @@ pytest pytest-cov pytest-django pytest-pythonpath +pytest-mock diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt index 7ea9c8642f..b1cdafc250 100644 --- a/requirements/requirements_jenkins.txt +++ b/requirements/requirements_jenkins.txt @@ -13,3 +13,4 @@ pytest pytest-cov pytest-django pytest-pythonpath +pytest-mock |