Merge pull request #8 from Juniper/21.7

21.7

BUILD.md

@@ -10,12 +10,12 @@ git clone <repo_url>
 To generate a .deb package file for the instalation of the Yaml-to-Excel on a Debian based system you can run the *build-1.0.0-1.sh* script file found under the *packaging* folder:
 ```bash
 cd packaging
-./build-1.0.0-1.sh
+./build-21.7.0-1.sh
 ```
 
 ## Centos/RedHat Package
 To generate a .rpm package file for the instalation of the Yaml-to-Excel on a Centos based system you can run the *build-1.0.0-1.sh* script file found under the *packaging_redhat* folder:
 ```bash
 cd packaging_redhat
-./build-1.0.0-1.sh
+./build-21.7.0-1.sh
 ```

CHANGES.txt

@@ -1,7 +1,7 @@
 Revision 0.8
 ---------------
 Updated pyyaml to 5.4.1
-Updated xls2yaml.py script to use openpyxl rather than xlrd. Old version for XLS source files only is xls2yaml-xlrd.py but should not be used for xlsx files.
+Updated xls2yaml.py script to use openpyxl rather than xlrd. 
 
 Revision 0.7
 ---------------

Pipfile

@@ -5,10 +5,8 @@ name = "pypi"
 
 [packages]
 pyaml = "*"
-xlwt = "*"
 openpyxl = "*"
 pyyaml = "*"
-xlrd = "*"
 
 [dev-packages]
 pylint = "*"

README.md

@@ -1,10 +1,13 @@
-# yaml-to-excel
+# yaml-to-excel 21.7
+
+Welcome to NITA 21.7
+
 This project consists of the tools required for manipulating YAML files
 and Microsoft excel spreadsheet files.
 
 # Copyright
 
-Copyright 2020, Juniper Networks, Inc.
+Copyright 2021, Juniper Networks, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
@@ -36,13 +39,13 @@ If you do not have the the required package files for your system, .deb for Ubun
 If you have been provided with the .deb package file run the following command:
 
 ```bash
-sudo apt-get install ./yaml-to-excel-1.0.0-1.deb
+sudo apt-get install ./yaml-to-excel-21.7.0-1.deb
 ```
 
 ### Centos
 
 If you have been provided with the .rpm package file run the following command:
 
 ```bash
-sudo yum install ./yaml-to-excel-1.0.0-1.rpm
+sudo yum install ./yaml-to-excel-21.7.0-1.rpm
 ```

VERSION.txt

@@ -1 +1 @@
-1.0.0
+21.7.0

packaging/build-1.0.0-1.sh → packaging/build-21.7.0-1.sh

@@ -3,9 +3,9 @@
 # ********************************************************
 #
 # Project: nita-yaml-to-excel
-# Version: 20.10
+# Version: 21.7
 #
-# Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 #
 # Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 #
@@ -19,7 +19,7 @@
 set -e
 
 PACKAGE=yaml-to-excel
-VERSION="1.0.0-1"
+VERSION="21.7.0-1"
 
 # cleanup version if the directory name is used
 VTMP="${VERSION#$PACKAGE-}"
@@ -44,6 +44,6 @@ pip3 uninstall -y ${PACKAGE} || true
 mkdir -p ${PACKAGE}-${VERSION}/usr/local
 mv ${PACKAGE}-${VERSION}/bin ${PACKAGE}-${VERSION}/usr/local
 mv ${PACKAGE}-${VERSION}/lib ${PACKAGE}-${VERSION}/usr/local
-mv ${PACKAGE}-${VERSION}/usr/local/lib/python3.6/site-packages ${PACKAGE}-${VERSION}/usr/local/lib/python3.6/dist-packages
+mv ${PACKAGE}-${VERSION}/usr/local/lib/python3.8/site-packages ${PACKAGE}-${VERSION}/usr/local/lib/python3.8/dist-packages
 
 dpkg-deb --build ${PACKAGE}-${VERSION}

packaging/yaml-to-excel-1.0.0-1/DEBIAN/control → packaging/yaml-to-excel-21.7.0-1/DEBIAN/control

@@ -1,11 +1,11 @@
 Package: yaml-to-excel
-Version: 1.0.0-1
+Version: 21.7.0-1
 Source: yaml-to-excel
 Section: contrib/python
 Priority: extra
 Maintainer: Ashley Burston
-Build-Depends: python3,python3-setuptools,python3-yaml,python3-xlrd,python3-openpyxl
+Build-Depends: python3,python3-setuptools,python3-yaml,python3-openpyxl
 Architecture: all
 Pre-Depends: dpkg,python3
-Depends: python3-yaml,python3-xlrd,python3-openpyxl
+Depends: python3-yaml,python3-openpyxl
 Description: Tool for converting excel spreadsheets to and from yaml

packaging_redhat/build-1.0.0-1.sh → packaging_redhat/build-21.7.0-1.sh

@@ -3,9 +3,9 @@
 # ********************************************************
 #
 # Project: nita-yaml-to-excel
-# Version: 20.10
+# Version: 21.7
 #
-# Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 #
 # Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 #
@@ -24,7 +24,7 @@
 set -e
 
 PACKAGE=yaml-to-excel
-VERSION="1.0.0"
+VERSION="21.7.0"
 RELEASE="1"
 
 #yum install -yy epel-release

packaging_redhat/yaml-to-excel-1.0.0-1/SOURCES/yaml-to-excel-1.0.0/etc/profile.d/yaml-to-excel.sh → packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/yaml-to-excel-21.7.0/etc/profile.d/yaml-to-excel.sh

@@ -2,9 +2,9 @@
 # ********************************************************
 #
 # Project: nita-yaml-to-excel
-# Version: 20.10
+# Version: 21.7
 #
-# Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 #
 # Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 #

packaging_redhat/yaml-to-excel-1.0.0-1/SPECS/yaml-to-excel.spec → packaging_redhat/yaml-to-excel-21.7.0-1/SPECS/yaml-to-excel.spec

@@ -1,9 +1,9 @@
 # ********************************************************
 #
 # Project: nita-yaml-to-excel
-# Version: 20.10
+# Version: 21.7
 #
-# Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 #
 # Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 #
@@ -18,7 +18,7 @@
 %define        __os_install_post %{_dbpath}/brp-compress
 
 Name:           yaml-to-excel
-Version:        1.0.0
+Version:        21.7.0
 Release:        1
 Summary:        Tool for converting excel spreadsheets to and from yaml
 Group:          Development/Tools
@@ -64,6 +64,8 @@ rm -rf %{buildroot}
 %{_sysconfdir}/profile.d/yaml-to-excel.sh
 
 %changelog
+* Fri Aug 13 2021 Ashley Burston 21.7.0-1
+  - Got rid of xlwt and xlrd
 * Wed Jul 29 2020 Hugo Ribeiro 1.0.0-1
   - Bug fixes
 * Wed May 6 2020 Ashley Burston 0.9.0-1

setup.py

@@ -3,9 +3,9 @@
 # ********************************************************
 #
 # Project: nita-yaml-to-excel
-# Version: 20.10
+# Version: 21.7
 #
-# Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+# Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 #
 # Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 #
@@ -22,12 +22,12 @@
 
 config = {
     'description': 'Bidirectional conversion of YAML files to Microsoft Excel.',
-    'author': 'Dinesh Sekar',
-    'url': 'https://ps-network-automation.visualstudio.com/NITA/_git/yaml-to-excel',
-    'download_url': 'https://artifactory.aslab.juniper.net/artifactory/api/pypi/ps-pypi/simple/yaml-to-excel/',
-    'author_email': 'dsek@juniper.net',
-    'version': '1.0.0',
-    'install_requires': ['PyYAML', 'xlrd', 'xlwt', 'openpyxl'],
+    'author': 'Juniper Networks',
+    'url': 'https://github.com/Juniper/nita-yaml-to-excel',
+    'download_url': 'https://github.com/Juniper/nita-yaml-to-excel/archive/refs/heads/21.7.zip',
+    'author_email': 'aburston@juniper.net',
+    'version': '21.7.0',
+    'install_requires': ['PyYAML', 'openpyxl'],
     'packages': ['yamltoexcel'],
     'scripts': ['yamltoexcel/xls2yaml.py', 'yamltoexcel/yaml2xls.py'],
     'name': 'yaml-to-excel'

tests/__init__.py

@@ -1,9 +1,9 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
-Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 
 Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 

tests/test_methods.py

@@ -1,9 +1,9 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
-Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 
 Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 

tests/test_parser.py

@@ -1,9 +1,9 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
-Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 
 Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 

yamltoexcel/__init__.py

@@ -1,9 +1,9 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
-Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 
 Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 

yamltoexcel/xls2yaml.py

@@ -3,7 +3,7 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 

yamltoexcel/yaml2xls.py

@@ -3,9 +3,9 @@
 """ ********************************************************
 
 Project: nita-yaml-to-excel
-Version: 20.10
+Version: 21.7
 
-Copyright (c) Juniper Networks, Inc., 2020. All rights reserved.
+Copyright (c) Juniper Networks, Inc., 2021. All rights reserved.
 
 Notice and Disclaimer: This code is licensed to you under the Apache 2.0 License (the "License"). You may not use this code except in compliance with the License. This code is not an official Juniper product. You can obtain a copy of the License at https://www.apache.org/licenses/LICENSE-2.0.html
 
@@ -16,7 +16,6 @@
 ******************************************************** """
 
 import yaml
-#import xlwt
 import sys
 import os
 from collections import OrderedDict