fix tox pep8 issues (#9)

* fix tox pep8 issues

* fix test-requirements.txt files

* remove stestr dir and add it to .gitignore

* Delete test-requirements.txt.bak
This commit is contained in:
Andrew McLeod 2019-11-12 06:55:13 +01:00 committed by Frode Nordahl
parent 282e30948f
commit 7329e9a03e
4 changed files with 24 additions and 40 deletions

2
.gitignore vendored
View File

@ -2,7 +2,9 @@ bin
.coverage
.testrepository
.tox
.stestr
*.sw[nop]
*.py[oc]
*.pyc
build
func-results.json

View File

@ -1,7 +1,11 @@
from __future__ import absolute_import
import charms.reactive as reactive
import charms_openstack
import charm.openstack.cinder_backup_swift
# This charm's library contains all of the handler code associated with
# cinder-backup-swift -- we need to import it to get the definitions
# for the charm.
import charm.openstack.cinder_backup_swift # noqa
import charms.reactive.flags as flags
from charms.reactive.relations import (
endpoint_from_flag,

View File

@ -1,22 +1,8 @@
# 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.
charm-tools>=2.4.4
coverage>=3.6
mock>=1.2
flake8>=2.2.4,<=2.4.1
stestr>=2.2.0
requests>=2.18.4
# Unit test requirements
charms.reactive
git+https://github.com/openstack/charms.openstack#egg=charms.openstack
# NOTE: workaround for 14.04 pip/tox
pytz
pyudev # for ceph-* charm unit tests (not mocked?)
# For functional tests
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
git+https://github.com/openstack/charms.openstack#egg=charms.openstack
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
# This file is managed centrally by release-tools and should not be modified
# within individual charm repos. See the 'global' dir contents for available
# choices of *requirements.txt files for OpenStack Charms:
# https://github.com/openstack-charmers/release-tools
#
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack

View File

@ -1,22 +1,14 @@
# 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.
charm-tools>=2.4.4
coverage>=3.6
mock>=1.2
# This file is managed centrally. If you find the need to modify this as a
# one-off, please don't. Intead, consult #openstack-charms and ask about
# requirements management in charms via bot-control. Thank you.
#
# Lint and unit test requirements
flake8>=2.2.4,<=2.4.1
stestr>=2.2.0
requests>=2.18.4
# Unit test requirements
charms.reactive
git+https://github.com/openstack/charms.openstack#egg=charms.openstack
mock>=1.2
nose>=1.3.7
coverage>=3.6
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
# NOTE: workaround for 14.04 pip/tox
pytz
pyudev # for ceph-* charm unit tests (not mocked?)
# For functional tests
git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
git+https://github.com/openstack/charms.openstack#egg=charms.openstack
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack