Update Python 3 requirements

* Remove requirements-py3.txt: it's not more needed, all libraries in
  requirements.txt are compatible with Python 3
* Synchronize test-requirements-py3.txt with test-requirements.txt, add:

  - gabbi
  - psycopg2
  - pylint
  - requests-aws

* Update tox.ini to use requirements.txt instead of requirements-py3.txt

Change-Id: I7c89313663849165e985ae2dac6e05251d003f66

requirements-py3.txt

@@ -1,42 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
-alembic>=0.7.2
-croniter>=0.3.4 # MIT License
-eventlet>=0.17.3
-iso8601>=0.1.9
-jsonpath-rw>=1.2.0,<2.0
-jsonschema>=2.0.0,<3.0.0
-lxml>=2.3
-msgpack-python>=0.4.0
-oslo.concurrency>=1.8.0         # Apache-2.0
-oslo.config>=1.9.3  # Apache-2.0
-oslo.context>=0.2.0                     # Apache-2.0
-oslo.db>=1.7.0  # Apache-2.0
-oslo.i18n>=1.5.0  # Apache-2.0
-PasteDeploy>=1.5.0
-pbr>=0.6,!=0.7,<1.0
-pecan>=0.8.0
-posix_ipc
-oslo.messaging>=1.8.0  # Apache-2.0
-oslo.middleware>=1.0.0                  # Apache-2.0
-oslo.utils>=1.4.0                       # Apache-2.0
-pysnmp>=4.2.1,<5.0.0
-python-ceilometerclient>=1.0.13
-python-glanceclient>=0.15.0
-python-keystoneclient>=1.1.0
-python-neutronclient>=2.3.11,<3
-python-novaclient>=2.22.0
-python-swiftclient>=2.2.0
-pytz>=2013.6
-PyYAML>=3.1.0
-requests>=2.2.0,!=2.4.0
-six>=1.9.0
-SQLAlchemy>=0.9.7,<=0.9.99
-sqlalchemy-migrate>=0.9.5
-stevedore>=1.3.0  # Apache-2.0
-tooz>=0.13.1 # Apache-2.0
-WebOb>=1.2.3
-WSME>=0.6

test-requirements-py3.txt

@@ -14,6 +14,8 @@ mock>=1.0
 # Docs Requirements
 oslosphinx>=2.5.0  # Apache-2.0
 oslotest>=1.5.1  # Apache-2.0
+psycopg2
+pylint>=1.3.0  # GNU GPL v2
 pymongo>=2.6.3,<3.0
 python-subunit>=0.0.18
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
@@ -23,3 +25,5 @@ sphinxcontrib-pecanwsme>=0.8
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.36,!=1.2.0
+gabbi>=0.12.0  # Apache-2.0
+requests-aws>=0.1.4    # BSD License (3 clause)

tox.ini

@@ -28,7 +28,7 @@ commands =
    bash -x {toxinidir}/setup-test-env-elastic.sh python setup.py testr --slowest --testr-args="{posargs}"
 
 [testenv:py34]
-deps = -r{toxinidir}/requirements-py3.txt
+deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements-py3.txt
 commands = python -m testtools.run \
          ceilometer.tests.test_utils