diff options
| author | Matthew Jones <mat@matburt.net> | 2015-09-03 21:46:10 +0200 |
|---|---|---|
| committer | Matthew Jones <mat@matburt.net> | 2015-09-03 21:46:10 +0200 |
| commit | 5727d722b6b878a0f1a34704051fdb447c9f3725 (patch) | |
| tree | 7c32f24e54df17a53eddc6abe5d25a5ab0c4141c /requirements | |
| parent | Merge pull request #401 from jlmitch5/unique_select2 (diff) | |
| parent | Merge pull request #402 from chrismeyersfsu/feature-config_check_local_machin... (diff) | |
| download | awx-5727d722b6b878a0f1a34704051fdb447c9f3725.tar.xz awx-5727d722b6b878a0f1a34704051fdb447c9f3725.zip | |
Merge remote-tracking branch 'upstream/release_2.3' into devel
* upstream/release_2.3: (91 commits)
Include python-{paramiko,ecdsa} dependencies
Remove extra epel testing stanzas
Unit test for ec2 credentialless inventory
Fix issue with ec2 iam sync with no credential.
Use the htpasswd command instead the ansible module
Pip is no longer needed
check local user root or not in ./configure
Remove unneeded when check for super user addition
Improve distro detection in setup.sh
Fix superuser check on upgrade
Minor improvements to setup.sh
Remove ansible prerequisite check from configure
Attempt to install ansible within setup.sh
Allow munin processes to access postgres
Move up base package dependency install
fixes jenkins failures
Proper flake8 fix
fixes executing processes with correct PYTHONPATH will pickup .pth files
Show the repo for bundled package file dump
Proper flake8 fix
...
Diffstat (limited to 'requirements')
| -rw-r--r-- | requirements/requirements.txt | 1 | ||||
| -rw-r--r-- | requirements/requirements_dev.txt | 2 | ||||
| -rw-r--r-- | requirements/requirements_jenkins.txt | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 3764e1fd6d..f51512da0d 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -35,6 +35,7 @@ git+https://github.com/chrismeyersfsu/gevent-socketio.git@tower_0.3.6#egg=socket git+https://github.com/chrismeyersfsu/python-ipy.git@master#egg=ipy git+https://github.com/chrismeyersfsu/python-keystoneclient.git@1.3.0#egg=keystoneclient-1.3.0 git+https://github.com/chrismeyersfsu/shade.git@tower_0.5.0#egg=shade-tower_0.5.0 +git+https://github.com/chrismeyersfsu/sitecustomize.git#egg=sitecustomize greenlet==0.4.7 httplib2==0.9 idna==2.0 diff --git a/requirements/requirements_dev.txt b/requirements/requirements_dev.txt index 956ee56403..9c0d7f83ae 100644 --- a/requirements/requirements_dev.txt +++ b/requirements/requirements_dev.txt @@ -2,3 +2,5 @@ django-devserver django-debug-toolbar unittest2 +pep8 +flake8 diff --git a/requirements/requirements_jenkins.txt b/requirements/requirements_jenkins.txt index b26f2fb92f..8ded2f06cd 100644 --- a/requirements/requirements_jenkins.txt +++ b/requirements/requirements_jenkins.txt @@ -1,3 +1,4 @@ +-r requirements.txt ansible django-jenkins coverage |