Merge "Remove useless additional requirement file"
This commit is contained in:
		| @@ -1,3 +0,0 @@ | |||||||
| # AMQP 1.0 support depends on the Qpid Proton AMQP 1.0 |  | ||||||
| # development libraries. |  | ||||||
| pyngus>=1.3.1;python_version=='2.7'  # Apache-2.0 |  | ||||||
| @@ -32,3 +32,7 @@ coverage>=3.6 | |||||||
| # this is required for the docs build jobs | # this is required for the docs build jobs | ||||||
| sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 | sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 | ||||||
| oslosphinx>=2.5.0 # Apache-2.0 | oslosphinx>=2.5.0 # Apache-2.0 | ||||||
|  |  | ||||||
|  | # AMQP 1.0 support depends on the Qpid Proton AMQP 1.0 | ||||||
|  | # development libraries. | ||||||
|  | pyngus>=1.3.1;python_version=='2.7'  # Apache 2.0 License | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								tox.ini
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								tox.ini
									
									
									
									
									
								
							| @@ -7,7 +7,6 @@ setenv = | |||||||
|     OS_TEST_TIMEOUT=30 |     OS_TEST_TIMEOUT=30 | ||||||
| deps = -r{toxinidir}/requirements.txt | deps = -r{toxinidir}/requirements.txt | ||||||
|        -r{toxinidir}/test-requirements.txt |        -r{toxinidir}/test-requirements.txt | ||||||
|        -r{toxinidir}/amqp1-requirements.txt |  | ||||||
| commands = python setup.py testr --slowest --testr-args='{posargs}' | commands = python setup.py testr --slowest --testr-args='{posargs}' | ||||||
|  |  | ||||||
| [testenv:pep8] | [testenv:pep8] | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jenkins
					Jenkins