Skip to content
This repository has been archived by the owner on Oct 25, 2019. It is now read-only.

Commit

Permalink
Minor setup changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ralph089 committed Feb 9, 2017
1 parent b551180 commit da1362e
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 27 deletions.
42 changes: 41 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,44 @@ atlassian-ide-plugin.xml
# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
crashlytics-build.properties
### Vagrant template
.vagrant/
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml

# Sensitive or high-churn files:
.idea/dataSources/
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# Gradle:
.idea/gradle.xml
.idea/libraries

# Mongo Explorer plugin:
.idea/mongoSettings.xml

## File-based project format:

## Plugin-specific files:

# IntelliJ

# mpeltonen/sbt-idea plugin

# JIRA plugin

# Crashlytics plugin (for Android Studio and IntelliJ)
fabric.properties

*.log
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,24 @@ help:
@echo "dist - package"
@echo "install - install the package to the active Python's site-packages"

clean: clean-build clean-pyc clean-test
clean: clean-build clean-pyc clean-test ## remove all build, test, coverage and Python artifacts

clean-build:
clean-build: ## remove build artifacts
rm -fr build/
rm -fr dist/
rm -fr .eggs/
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -fr {} +
find . -name '*.egg' -exec rm -f {} +

clean-pyc:
clean-pyc: ## remove Python file artifacts
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +
find . -name '__pycache__' -exec rm -fr {} +

clean-test:
clean-test: ## remove test and coverage artifacts
rm -fr .tox/
rm -f .coverage
rm -fr .cache
rm -fr htmlcov/

lint:
Expand Down Expand Up @@ -75,4 +75,4 @@ dist: clean
ls -l dist

install: clean
python setup.py install
pip install -r requirements.txt
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[bdist_wheel]
universal=1

[flake8]
exclude = docs
23 changes: 5 additions & 18 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
# -*- coding: utf-8 -*-


try:
from setuptools import setup
except ImportError:
from distutils.core import setup
from setuptools import setup

with open('README.rst') as readme_file:
readme = readme_file.read()
Expand All @@ -27,7 +24,8 @@

setup(name='check_paloalto',
version='0.1.6',
description="check_paloalto is a Nagios/Icinga plugin for Palo Alto Next Generation Firewalls. It is written in Python and based on the PA REST API.",
description="check_paloalto is a Nagios/Icinga plugin for Palo Alto Next Generation Firewalls. It is written in "
"Python and based on the PA REST API.",
long_description=readme + '\n\n' + history,
author="Ralph Offinger",
author_email='ralph.offinger@gmail.com',
Expand All @@ -41,31 +39,20 @@
},
license="CC BY-ND 4.0",
classifiers=[
# 3 - Alpha
# 4 - Beta
# 5 - Production/Stable
'Development Status :: 4 - Beta',

# Indicate who your project is intended for
'Intended Audience :: Developers',
'Intended Audience :: System Administrators',

'Topic :: System :: Monitoring',

# Pick your license as you wish (should match "license" above)
'License :: OSI Approved :: Common Public License',

# Specify the Python versions you support here. In particular, ensure
# that you indicate whether you support Python 2, Python 3 or both.
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
],

# What does your project relate to?
keywords='paloalto icinga nagios check',
zip_safe=False,
test_suite='tests',
tests_require=test_requirements,
)
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py33, py34
envlist = py27, py33, py34, py35
toxworkdir={homedir}

[testenv]
Expand All @@ -8,6 +8,7 @@ setenv =
deps =
-r{toxinidir}/requirements.txt
commands =
pip install -U pip
py.test --basetemp={envtmpdir}

[testenv:style]
Expand Down

0 comments on commit da1362e

Please sign in to comment.