From e6ba40aa913089e6fd057dce5ad34879ee4303ce Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 27 Sep 2018 18:07:38 +0200 Subject: [PATCH] Removed pyangbind and pyang deb pkg from Makefile Change-Id: Ieffffab055de33f8e51762fd204736556ca2f823 Signed-off-by: garciadeblas --- Makefile | 24 +++--------------------- setup.py | 3 --- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 4faeb5f..22df56d 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ # Copyright 2017 Sandvine +# Copyright 2017-2018 Telefonica # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -36,7 +37,7 @@ Q?=@ PYANG_OPTIONS := -Werror -all: $(PYTHON_MODELS) pyangbind trees +all: $(PYTHON_MODELS) trees $(MAKE) package trees: $(YANG_DESC_TREES) $(YANG_DESC_JSTREES) $(YANG_RECORD_TREES) $(YANG_RECORD_JSTREES) @@ -87,27 +88,8 @@ package: tox -e build3 ./build-docs.sh - -pyangbind: pyang - git clone https://github.com/alf-tierno/pyangbind - cd pyangbind; git checkout issue151; \ - python setup.py --command-packages=stdeb.command bdist_deb; \ - python3 setup.py --command-packages=stdeb.command bdist_deb; \ - cd .. - mkdir -p deb_dist - cp pyangbind/deb_dist/*.deb deb_dist - -pyang: - git clone https://github.com/mbj4668/pyang - cd pyang; \ - python setup.py --command-packages=stdeb.command bdist_deb; \ - python3 setup.py --command-packages=stdeb.command bdist_deb; \ - cd .. - mkdir -p deb_dist - cp pyang/deb_dist/*.deb deb_dist - pyang-json-schema-plugin: git clone https://github.com/cmoberg/pyang-json-schema-plugin clean: - $(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang pyangbind pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR) + $(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR) diff --git a/setup.py b/setup.py index b08ea17..cda4c73 100644 --- a/setup.py +++ b/setup.py @@ -9,9 +9,6 @@ setup( author_email='mmarchetti@sandvine.com', packages=find_packages(), include_package_data=True, - install_requires=[ - 'pyangbind' - ], setup_requires=['setuptools-version-command'], test_suite='nose.collector', ) -- 2.25.1