Merge pull request #37 from sansible/GITHUB-19-merge-to-original

Updates to work with the latest NR changes

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+
+[*.py]
+indent_style = space
+indent_size = 4

.gitignore

@@ -15,11 +15,11 @@ htmlcov/
 
 # Python egg metadata, regenerated from source files by setuptools.
 /*.egg-info
-/*.egg
+/*.eggs
 
 # Virtualenv
 env/
-venv/
+.venv/
 
 # OSX
 .DS_Store

.travis.yml

@@ -1,14 +1,21 @@
-sudo: false
+---
+
+sudo: required
+dist: xenial
+
 language: python
 python:
   - '2.7'
-  - '3.3'
-  - '3.4'
-install:
-  - pip install coveralls nose flake8
-  - python setup.py install
+  - '3.6'
+  - '3.7'
+
+branches:
+  only:
+    - develop
+    - master
+
 script:
-  - flake8 .
-  - python setup.py nosetests
+  - make test
+
 after_success:
   coveralls

Makefile

@@ -0,0 +1,32 @@
+PATH := $(PWD)/.venv/bin:$(shell printenv PATH)
+SHELL := env PATH=$(PATH) /bin/bash
+VENV_DIR=.venv
+
+.PHONY: clean
+## Destroy docker instances, remove virtualenv, molecule temp, .pyc files
+clean:
+	rm -rf .venv
+
+.PHONY: deps
+## Create virtualenv, install dependencies
+deps:
+	test -d ${VENV_DIR} || virtualenv ${VENV_DIR}
+	${VENV_DIR}/bin/pip install -r requirements/main.txt
+	virtualenv --relocatable ${VENV_DIR}
+	python setup.py install
+
+.PHONY: help
+help:
+	@awk -v skip=1 \
+		'/^##/ { sub(/^[#[:blank:]]*/, "", $$0); doc_h=$$0; doc=""; skip=0; next } \
+		 skip  { next } \
+		 /^#/  { doc=doc "\n" substr($$0, 2); next } \
+		 /:/   { sub(/:.*/, "", $$0); \
+		 printf "\033[34m%-30s\033[0m\033[1m%s\033[0m %s\n\n", $$0, doc_h, doc; skip=1 }' \
+		$(MAKEFILE_LIST)
+
+.PHONY: test
+## Run tests
+test: deps
+	flake8 newrelic_api
+	python setup.py nosetests

newrelic_api/__init__.py

@@ -2,10 +2,14 @@
 from .version import __version__
 
 from .alert_policies import AlertPolicies
+from .alert_conditions import AlertConditions
+from .alert_conditions_infra import AlertConditionsInfra
+from .alert_conditions_nrql import AlertConditionsNRQL
 from .applications import Applications
 from .application_hosts import ApplicationHosts
 from .application_instances import ApplicationInstances
 from .components import Components
+from .dashboards import Dashboards
 from .key_transactions import KeyTransactions
 from .notification_channels import NotificationChannels
 from .plugins import Plugins