administrative fixes

.gitignore

@@ -1,6 +1,7 @@
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
+.pytest_cache/
 
 .ipynb_checkpoints
 

.travis.yml

@@ -1,12 +1,10 @@
 language: python
 python:
 - 2.7
-# - 3.4
-# - 3.5
+- 3.6
 install:
-# - pip install tox-travis
+- pip install tox-travis
 - pip install coveralls
-- pip install -r requirements-dev.txt
 deploy:
   provider: pypi
   user: dbarroso
@@ -16,7 +14,7 @@ deploy:
     tags: true
     branch: master
 script:
-- py.test
+- tox test/
 after_success:
 - coveralls
 - if [ $travis_tag ]; then curl -x post https://readthedocs.org/build/napalm; fi

Makefile

@@ -1,12 +1,12 @@
-PYBINDPLUGIN=$(shell /usr/bin/env python -c 'import pyangbind; import os; print "%s/plugin" % os.path.dirname(pyangbind.__file__)')
+PYBINDPLUGIN=$(shell /usr/bin/env python -c 'import pyangbind; import os; print("{}/plugin".format(os.path.dirname(pyangbind.__file__)))')
 
 MODELS_PATH=napalm_yang/models
 
 YANG_OC=yang_oc/release/models
 YANG_IETF=yang_ietf/standard/ietf
 YANG_NAPALM=yang_napalm
 
-PYANGBING=pyang --plugindir $(PYBINDPLUGIN) -f pybind --lax-quote-checks
+PYANGBIND=pyang --plugindir $(PYBINDPLUGIN) -f pybind --lax-quote-checks
 
 
 clean:
@@ -22,7 +22,7 @@ openconfig_tree:
 .PHONY: models_openconfig
 models_openconfig:
 	rm -rf $(MODELS_PATH)/openconfig/
-	$(PYANGBING) \
+	$(PYANGBIND) \
 		--path $(YANG_OC) \
 		--split-class-dir=$(MODELS_PATH)/openconfig/ \
 		$(YANG_OC)/network-instance/openconfig-network-instance.yang \
@@ -35,7 +35,7 @@ models_openconfig:
 # .PHONY: models_ietf
 # models_ietf:
 #     rm -rf $(MODELS_PATH)/ietf/
-#     $(PYANGBING) \
+#     $(PYANGBIND) \
 #         --path $(YANG_IETF)/RFC \
 #         --path $(YANG_IETF)/DRAFT \
 #         --split-class-dir=$(MODELS_PATH)/ietf/ \

requirements-dev.txt

@@ -3,4 +3,5 @@ pytest
 pytest-cov
 pytest-json
 pytest-pythonpath
+tox
 -r requirements.txt

requirements.txt

@@ -4,4 +4,4 @@ jinja2
 xmltodict
 PyYAML
 napalm
--e git://github.com/napalm-automation/pyangbind.git@napalm_custom#egg=pyangbind
+pyangbind>=0.8.0<1.0.0

setup.py

@@ -17,6 +17,11 @@
     classifiers=[
         'Topic :: Utilities',
         'Programming Language :: Python',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
         'Operating System :: POSIX :: Linux',
         'Operating System :: MacOS',
     ],

tox.ini

@@ -1,10 +1,9 @@
 [tox]
-; envlist = py27 # ,py34,py35
-envlist = py27
+envlist = py27,py36
 
 [testenv]
 deps =
     -rrequirements-dev.txt
 
 commands=
-   py.test
+   py.test {posargs}