Skip to content

Commit

Permalink
Switch to pbr for package setup (#160)
Browse files Browse the repository at this point in the history
  • Loading branch information
codingjoe committed Dec 13, 2017
1 parent eff01d7 commit 5891aea
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -16,7 +16,7 @@ atomic = true
multi_line_output = 5
line_length = 80
combine_as_imports = true
skip = wsgi.py,docs,.tox,env
skip = wsgi.py,docs,.tox,env,.eggs
known_first_party = health_check,health_check_cache,health_check_celery,health_check_celery3,health_check_db,health_check_storage,tests
known_third_party = django
not_skip = __init__.py
Expand Down
5 changes: 0 additions & 5 deletions health_check/__init__.py
@@ -1,5 +0,0 @@
# Used by setup.py, so minimize top-level imports.

VERSION = (2, 4, 0)

__version__ = ".".join(str(i) for i in VERSION)
11 changes: 0 additions & 11 deletions requirements-dev.in

This file was deleted.

38 changes: 11 additions & 27 deletions requirements-dev.txt
@@ -1,27 +1,11 @@
#
# This file is autogenerated by pip-compile
# To update, run:
#
# pip-compile --output-file requirements-dev.txt requirements-dev.in
#
amqp==2.2.2 # via kombu
billiard==3.5.0.3 # via celery
celery==4.1.0
coverage==4.4.2
flake8==3.5.0
isort==4.2.15
kombu==4.1.0 # via celery
mccabe==0.6.1
mock==2.0.0
pbr==3.1.1 # via mock
pep8-naming==0.4.1
pep8==1.7.1
py==1.4.34 # via pytest
pycodestyle==2.3.1 # via flake8
pydocstyle==2.1.1
pyflakes==1.6.0 # via flake8
pytest-django==3.1.2
pytest==3.2.3
pytz==2017.3 # via celery
six==1.11.0 # via mock
vine==1.1.4 # via amqp
-e .
celery
coverage
flake8
isort
mccabe
mock
pydocstyle
pep8-naming
pytest
pytest-django
35 changes: 32 additions & 3 deletions setup.cfg
@@ -1,5 +1,33 @@
[metadata]
name = django-health-check
author = Kristian Ollegaard
author-email = kristian@oellegaard.com
summary = Run checks on services like databases, queue servers, celery processes, etc.
description-file = README.rst
description-content-type = text/x-rst; charset=UTF-8
home-page = https://github.com/KristianOellegaard/django-health-check
license = BSD License
classifier =
Development Status :: 5 - Production/Stable
Framework :: Django
Intended Audience :: Developers
License :: OSI Approved :: BSD License
Operating System :: OS Independent
Programming Language :: Python :: 3
Topic :: Software Development :: Quality Assurance
Topic :: System :: Logging
Topic :: System :: Monitoring
Topic :: Utilities
keywords =
django
postgresql

[files]
packages =
health_check

[tool:pytest]
norecursedirs=venv env
norecursedirs=venv env .eggs
DJANGO_SETTINGS_MODULE=tests.testapp.settings
addopts = --tb=short -rxs

Expand All @@ -8,11 +36,11 @@ max-line-length = 119
max-complexity = 10
statistics = true
show-source = true
exclude = */migrations/*,docs/*,env/*,.tox/*
exclude = */migrations/*,docs/*,env/*,.tox/*,.eggs/*

[pydocstyle]
add-ignore = D1
match-dir = (?!tests|env|\.).*
match-dir = (?!tests|env|.eggs|\.).*

[coverage:run]
source = .
Expand All @@ -21,6 +49,7 @@ omit =
*/tests/*
*/test_*.py
.tox
.eggs

[coverage:report]
ignore_errors = True
Expand Down
51 changes: 4 additions & 47 deletions setup.py
@@ -1,50 +1,7 @@

import os

from setuptools import find_packages, setup

from health_check import __version__

# Utility function to read the README file.
# Used for the long_description. It's nice, because now 1) we have a top level
# README file and 2) it's easier to type in the README file than to put a raw
# string in below ...


def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

#!/usr/bin/env python
from setuptools import setup

setup(
name="django-health-check",
version=__version__,
author="Kristian Ollegaard",
author_email="kristian@oellegaard.com",
description=("a pluggable app that runs a full check on the deployment,"
" using a number of plugins to check e.g. database, queue server, celery processes, etc."),
license="BSD",
keywords="django health check monitoring",
url="https://github.com/KristianOellegaard/django-health-check",
packages=find_packages(exclude=['tests', 'docs']),
long_description=read('README.rst'),
classifiers=[
'Development Status :: 5 - Production/Stable',
'Framework :: Django',
'Framework :: Django :: 1.8',
'Framework :: Django :: 1.9',
'Framework :: Django :: 1.10',
'Intended Audience :: Developers',
'License :: OSI Approved :: MIT License',
'License :: Public Domain',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 3',
'Topic :: Software Development :: Quality Assurance',
'Topic :: System :: Logging',
'Topic :: System :: Monitoring',
'Topic :: Utilities',
],
install_requires=[],
include_package_data=True,
zip_safe=False,
setup_requires=['pbr'],
pbr=True,
)

0 comments on commit 5891aea

Please sign in to comment.