Skip to content

Commit

Permalink
Migrate to pbr from find_packages
Browse files Browse the repository at this point in the history
We need to migrate to pbr because this is a library for managing setuptools
packaging in Openstack projects.

Change-Id: I077bbe91fc56aa218e1b2be063e456ef3e87f8cd
  • Loading branch information
esikachev authored and Sergei Chipiga committed Nov 30, 2016
1 parent b9bbc5a commit 963f2f5
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 20 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -11,3 +11,4 @@ test_results
build
.tox
report.xml
.eggs
3 changes: 0 additions & 3 deletions c-requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion doc/source/index.rst
Expand Up @@ -45,7 +45,7 @@ Make following commands in terminal::
virtualenv .venv
. .venv/bin/activate
pip install -U pip
pip install -r requirements.txt -r c-requirements.txt
pip install -e .[libvirt]

----------------
How to run tests
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
Expand Up @@ -21,6 +21,7 @@ pyaml==16.9.0
python-dateutil==2.5.3
prettytable==0.7.2
dpkt==1.8.8
os-faults>=0.1.7,<0.2.0

# ui testing
attrdict==2.0.0
Expand Down
32 changes: 32 additions & 0 deletions setup.cfg
@@ -0,0 +1,32 @@
[metadata]
name = stepler
summary = Stepler framework
description-file = readme.rst
license = Apache Software License
classifiers =
Programming Language :: Python
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Environment :: OpenStack
Intended Audience :: Information Technology
Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
author = mirantis
author-email = mos-qa@mirantis.com
home-page = http://stepler.readthedocs.io/

[global]
setup-hooks = pbr.hooks.setup_hook

[files]
packages =
stepler

[build_sphinx]
all_files = 1
source-dir = doc/source

[extras]
libvirt =
libvirt-python>=1.2.5
7 changes: 3 additions & 4 deletions setup.py
Expand Up @@ -17,10 +17,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.

from setuptools import setup, find_packages # noqa
from setuptools import setup # noqa

setup(
name='stepler',
packages=find_packages(),
url='https://github.com/Mirantis/stepler'
setup_requires=['pbr==1.8'],
pbr=True
)
17 changes: 5 additions & 12 deletions tox.ini
Expand Up @@ -48,17 +48,15 @@ commands=
basepython =
python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.
commands =
py.test stepler --steps-check-only --force-destructive

[testenv:py27-idempotent-ids-checker]
basepython =
python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.
commands =
py.test stepler/ --check-idempotent_id --force-destructive

Expand All @@ -67,8 +65,6 @@ basepython =
python2.7
deps =
pytest-capturelog
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.
commands =
py.test unittests -v
Expand All @@ -78,8 +74,7 @@ passenv = *
basepython =
python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.[libvirt]
commands =
py.test stepler/cinder

Expand All @@ -88,8 +83,7 @@ passenv = *
basepython =
python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.[libvirt]
commands =
py.test stepler/nova

Expand All @@ -98,7 +92,6 @@ passenv = *
basepython =
python2.7
deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/c-requirements.txt
-e.[libvirt]
commands =
py.test stepler/heat

0 comments on commit 963f2f5

Please sign in to comment.