From 7d6ed28221f9f85a1d15b0b151e0bec2cae60aa4 Mon Sep 17 00:00:00 2001 From: aburston Date: Thu, 18 Aug 2022 15:35:24 +0000 Subject: [PATCH 1/2] updated versions + removed packagign code --- Pipfile.lock | 214 ------------------ README.md | 22 +- VERSION.txt | 2 +- packaging/.gitignore | 3 - packaging/build-21.7.0-1.sh | 49 ---- .../yaml-to-excel-21.7.0-1/DEBIAN/control | 11 - packaging_redhat/.rpmmacros | 3 - packaging_redhat/build-21.7.0-1.sh | 69 ------ .../yaml-to-excel-21.7.0-1/BUILD/.gitignore | 2 - .../BUILDROOT/.gitignore | 2 - .../yaml-to-excel-21.7.0-1/RPMS/.gitignore | 2 - .../yaml-to-excel-21.7.0-1/SOURCES/.gitignore | 2 - .../etc/profile.d/yaml-to-excel.sh | 22 -- .../SPECS/yaml-to-excel.spec | 72 ------ .../yaml-to-excel-21.7.0-1/SRPMS/.gitignore | 2 - .../yaml-to-excel-21.7.0-1/TMP/.gitignore | 2 - setup.py | 5 +- tests/__init__.py | 1 - tests/test_methods.py | 1 - tests/test_parser.py | 1 - yamltoexcel/__init__.py | 1 - yamltoexcel/xls2yaml.py | 1 - yamltoexcel/yaml2xls.py | 1 - 23 files changed, 7 insertions(+), 483 deletions(-) delete mode 100644 Pipfile.lock delete mode 100644 packaging/.gitignore delete mode 100644 packaging/build-21.7.0-1.sh delete mode 100644 packaging/yaml-to-excel-21.7.0-1/DEBIAN/control delete mode 100644 packaging_redhat/.rpmmacros delete mode 100644 packaging_redhat/build-21.7.0-1.sh delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/BUILD/.gitignore delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/BUILDROOT/.gitignore delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/RPMS/.gitignore delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/.gitignore delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/yaml-to-excel-21.7.0/etc/profile.d/yaml-to-excel.sh delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/SPECS/yaml-to-excel.spec delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/SRPMS/.gitignore delete mode 100644 packaging_redhat/yaml-to-excel-21.7.0-1/TMP/.gitignore diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 2ac6f24..0000000 --- a/Pipfile.lock +++ /dev/null @@ -1,214 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "7e941f2842ef3f17733fa5cf1a627f16fa1f4998be15762206235f5f170b1e98" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.7" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "et-xmlfile": { - "hashes": [ - "sha256:8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c", - "sha256:a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada" - ], - "markers": "python_version >= '3.6'", - "version": "==1.1.0" - }, - "openpyxl": { - "hashes": [ - "sha256:46af4eaf201a89b610fcca177eed957635f88770a5462fb6aae4a2a52b0ff516", - "sha256:6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251" - ], - "index": "pypi", - "version": "==3.0.7" - }, - "pyaml": { - "hashes": [ - "sha256:29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71", - "sha256:67081749a82b72c45e5f7f812ee3a14a03b3f5c25ff36ec3b290514f8c4c4b99" - ], - "index": "pypi", - "version": "==20.4.0" - }, - "pyyaml": { - "hashes": [ - "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf", - "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696", - "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393", - "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77", - "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922", - "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5", - "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8", - "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10", - "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc", - "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018", - "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e", - "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253", - "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347", - "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183", - "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541", - "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb", - "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185", - "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc", - "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db", - "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa", - "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46", - "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122", - "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b", - "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63", - "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df", - "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc", - "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247", - "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6", - "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0" - ], - "index": "pypi", - "version": "==5.4.1" - }, - "xlrd": { - "hashes": [ - "sha256:83a1d2f1091078fb3f65876753b5302c5cfb6a41de64b9587b74cefa75157148", - "sha256:8a21885513e6d915fe33a8ee5fdfa675433b61405ba13e2a69e62ee36828d7e2" - ], - "index": "pypi", - "version": "==1.1.0" - }, - "xlwt": { - "hashes": [ - "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e", - "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88" - ], - "index": "pypi", - "version": "==1.3.0" - } - }, - "develop": { - "astroid": { - "hashes": [ - "sha256:4db03ab5fc3340cf619dbc25e42c2cc3755154ce6009469766d7143d1fc2ee4e", - "sha256:8a398dfce302c13f14bab13e2b14fe385d32b73f4e4853b9bdfb64598baa1975" - ], - "markers": "python_version ~= '3.6'", - "version": "==2.5.6" - }, - "ddt": { - "hashes": [ - "sha256:39a8bfe0a8a75ebd209a5abd0da7895532548c9f6d7bd97714d2d5d2bfa6d844", - "sha256:64a67366a2715e636b88694cc6075cc02db292f01098b8e385397c894d395378" - ], - "index": "pypi", - "version": "==1.4.2" - }, - "isort": { - "hashes": [ - "sha256:0a943902919f65c5684ac4e0154b1ad4fac6dcaa5d9f3426b732f1c8b5419be6", - "sha256:2bb1680aad211e3c9944dbce1d4ba09a989f04e238296c87fe2139faa26d655d" - ], - "markers": "python_version >= '3.6' and python_version < '4.0'", - "version": "==5.8.0" - }, - "lazy-object-proxy": { - "hashes": [ - "sha256:17e0967ba374fc24141738c69736da90e94419338fd4c7c7bef01ee26b339653", - "sha256:1fee665d2638491f4d6e55bd483e15ef21f6c8c2095f235fef72601021e64f61", - "sha256:22ddd618cefe54305df49e4c069fa65715be4ad0e78e8d252a33debf00f6ede2", - "sha256:24a5045889cc2729033b3e604d496c2b6f588c754f7a62027ad4437a7ecc4837", - "sha256:410283732af311b51b837894fa2f24f2c0039aa7f220135192b38fcc42bd43d3", - "sha256:4732c765372bd78a2d6b2150a6e99d00a78ec963375f236979c0626b97ed8e43", - "sha256:489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726", - "sha256:4f60460e9f1eb632584c9685bccea152f4ac2130e299784dbaf9fae9f49891b3", - "sha256:5743a5ab42ae40caa8421b320ebf3a998f89c85cdc8376d6b2e00bd12bd1b587", - "sha256:85fb7608121fd5621cc4377a8961d0b32ccf84a7285b4f1d21988b2eae2868e8", - "sha256:9698110e36e2df951c7c36b6729e96429c9c32b3331989ef19976592c5f3c77a", - "sha256:9d397bf41caad3f489e10774667310d73cb9c4258e9aed94b9ec734b34b495fd", - "sha256:b579f8acbf2bdd9ea200b1d5dea36abd93cabf56cf626ab9c744a432e15c815f", - "sha256:b865b01a2e7f96db0c5d12cfea590f98d8c5ba64ad222300d93ce6ff9138bcad", - "sha256:bf34e368e8dd976423396555078def5cfc3039ebc6fc06d1ae2c5a65eebbcde4", - "sha256:c6938967f8528b3668622a9ed3b31d145fab161a32f5891ea7b84f6b790be05b", - "sha256:d1c2676e3d840852a2de7c7d5d76407c772927addff8d742b9808fe0afccebdf", - "sha256:d7124f52f3bd259f510651450e18e0fd081ed82f3c08541dffc7b94b883aa981", - "sha256:d900d949b707778696fdf01036f58c9876a0d8bfe116e8d220cfd4b15f14e741", - "sha256:ebfd274dcd5133e0afae738e6d9da4323c3eb021b3e13052d8cbd0e457b1256e", - "sha256:ed361bb83436f117f9917d282a456f9e5009ea12fd6de8742d1a4752c3017e93", - "sha256:f5144c75445ae3ca2057faac03fda5a902eff196702b0a24daf1d6ce0650514b" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", - "version": "==1.6.0" - }, - "mccabe": { - "hashes": [ - "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" - ], - "version": "==0.6.1" - }, - "pylint": { - "hashes": [ - "sha256:0a049c5d47b629d9070c3932d13bff482b12119b6a241a93bc460b0be16953c8", - "sha256:792b38ff30903884e4a9eab814ee3523731abd3c463f3ba48d7b627e87013484" - ], - "index": "pypi", - "version": "==2.8.3" - }, - "toml": { - "hashes": [ - "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", - "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" - ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.10.2" - }, - "typed-ast": { - "hashes": [ - "sha256:01ae5f73431d21eead5015997ab41afa53aa1fbe252f9da060be5dad2c730ace", - "sha256:067a74454df670dcaa4e59349a2e5c81e567d8d65458d480a5b3dfecec08c5ff", - "sha256:0fb71b8c643187d7492c1f8352f2c15b4c4af3f6338f21681d3681b3dc31a266", - "sha256:1b3ead4a96c9101bef08f9f7d1217c096f31667617b58de957f690c92378b528", - "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6", - "sha256:209596a4ec71d990d71d5e0d312ac935d86930e6eecff6ccc7007fe54d703808", - "sha256:2c726c276d09fc5c414693a2de063f521052d9ea7c240ce553316f70656c84d4", - "sha256:398e44cd480f4d2b7ee8d98385ca104e35c81525dd98c519acff1b79bdaac363", - "sha256:52b1eb8c83f178ab787f3a4283f68258525f8d70f778a2f6dd54d3b5e5fb4341", - "sha256:5feca99c17af94057417d744607b82dd0a664fd5e4ca98061480fd8b14b18d04", - "sha256:7538e495704e2ccda9b234b82423a4038f324f3a10c43bc088a1636180f11a41", - "sha256:760ad187b1041a154f0e4d0f6aae3e40fdb51d6de16e5c99aedadd9246450e9e", - "sha256:777a26c84bea6cd934422ac2e3b78863a37017618b6e5c08f92ef69853e765d3", - "sha256:95431a26309a21874005845c21118c83991c63ea800dd44843e42a916aec5899", - "sha256:9ad2c92ec681e02baf81fdfa056fe0d818645efa9af1f1cd5fd6f1bd2bdfd805", - "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c", - "sha256:aee0c1256be6c07bd3e1263ff920c325b59849dc95392a05f258bb9b259cf39c", - "sha256:af3d4a73793725138d6b334d9d247ce7e5f084d96284ed23f22ee626a7b88e39", - "sha256:b36b4f3920103a25e1d5d024d155c504080959582b928e91cb608a65c3a49e1a", - "sha256:b9574c6f03f685070d859e75c7f9eeca02d6933273b5e69572e5ff9d5e3931c3", - "sha256:bff6ad71c81b3bba8fa35f0f1921fb24ff4476235a6e94a26ada2e54370e6da7", - "sha256:c190f0899e9f9f8b6b7863debfb739abcb21a5c054f911ca3596d12b8a4c4c7f", - "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075", - "sha256:cae53c389825d3b46fb37538441f75d6aecc4174f615d048321b716df2757fb0", - "sha256:dd4a21253f42b8d2b48410cb31fe501d32f8b9fbeb1f55063ad102fe9c425e40", - "sha256:dde816ca9dac1d9c01dd504ea5967821606f02e510438120091b84e852367428", - "sha256:f2362f3cb0f3172c42938946dbc5b7843c2a28aec307c49100c8b38764eb6927", - "sha256:f328adcfebed9f11301eaedfa48e15bdece9b519fb27e6a8c01aa52a17ec31b3", - "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f", - "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65" - ], - "markers": "python_version < '3.8' and implementation_name == 'cpython'", - "version": "==1.4.3" - }, - "wrapt": { - "hashes": [ - "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" - ], - "version": "==1.12.1" - } - } -} diff --git a/README.md b/README.md index 7c7484d..689357d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# yaml-to-excel 21.7 +# yaml-to-excel 22.8 -Welcome to NITA 21.7 +Welcome to NITA 22.8 This project consists of the tools required for manipulating YAML files and Microsoft excel spreadsheet files. @@ -32,20 +32,6 @@ This tool is especially useful when used together with Ansible playbooks in orde # Installation -If you do not have the the required package files for your system, .deb for Ubuntu or .rpm for Centos refer to [BUILD.md](./BUILD.md) file for instructions on how to generate these files. +Using pip3: -### Ubuntu - -If you have been provided with the .deb package file run the following command: - -```bash -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-21.7.0-1.rpm -``` +`pip3 install nita-yaml-to-excel/` diff --git a/VERSION.txt b/VERSION.txt index ff1c240..9d67327 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -21.7.0 +22.8.0 diff --git a/packaging/.gitignore b/packaging/.gitignore deleted file mode 100644 index 5e3aff9..0000000 --- a/packaging/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -yaml-to-excel-*/etc -yaml-to-excel-*/usr -*.deb diff --git a/packaging/build-21.7.0-1.sh b/packaging/build-21.7.0-1.sh deleted file mode 100644 index e19d483..0000000 --- a/packaging/build-21.7.0-1.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-yaml-to-excel -# Version: 21.7 -# -# 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 -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -# stop the script if a command fails -set -e - -PACKAGE=yaml-to-excel -VERSION="21.7.0-1" - -# cleanup version if the directory name is used -VTMP="${VERSION#$PACKAGE-}" -VERSION=${VTMP%/} - - -if [[ "x$VERSION" == "x" ]]; then - echo "Must provide package version" - exit 1 -fi - -if [ ! -d ${PACKAGE}-${VERSION} ]; then - echo "Directory ${PACKAGE}-${VERSION} does not exist" -fi - -rm -rf ${PACKAGE}-${VERSION}/etc -rm -rf ${PACKAGE}-${VERSION}/usr -rm -rf ${PACKAGE}-${VERSION}/lib -pip3 uninstall -y ${PACKAGE} || true -(cd ../..; PYTHONUSERBASE=$PWD/nita-${PACKAGE}/packaging/${PACKAGE}-${VERSION} pip3 install --user nita-${PACKAGE}/) - -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.8/site-packages ${PACKAGE}-${VERSION}/usr/local/lib/python3.8/dist-packages - -dpkg-deb --build ${PACKAGE}-${VERSION} diff --git a/packaging/yaml-to-excel-21.7.0-1/DEBIAN/control b/packaging/yaml-to-excel-21.7.0-1/DEBIAN/control deleted file mode 100644 index 0c6d0f0..0000000 --- a/packaging/yaml-to-excel-21.7.0-1/DEBIAN/control +++ /dev/null @@ -1,11 +0,0 @@ -Package: yaml-to-excel -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-openpyxl -Architecture: all -Pre-Depends: dpkg,python3 -Depends: python3-yaml,python3-openpyxl -Description: Tool for converting excel spreadsheets to and from yaml diff --git a/packaging_redhat/.rpmmacros b/packaging_redhat/.rpmmacros deleted file mode 100644 index df63b0b..0000000 --- a/packaging_redhat/.rpmmacros +++ /dev/null @@ -1,3 +0,0 @@ -%_topdir %(echo $RPM_BUILD_DIR) - -%_tmppath %{_topdir}/TMP \ No newline at end of file diff --git a/packaging_redhat/build-21.7.0-1.sh b/packaging_redhat/build-21.7.0-1.sh deleted file mode 100644 index a886864..0000000 --- a/packaging_redhat/build-21.7.0-1.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash - -# ******************************************************** -# -# Project: nita-yaml-to-excel -# Version: 21.7 -# -# 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 -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -#if [ $UID != 0 ]; then -# echo "This script must be run as root" -# exit 1 -#fi - -# stop the script if a command fails -set -e - -PACKAGE=yaml-to-excel -VERSION="21.7.0" -RELEASE="1" - -#yum install -yy epel-release -sudo yum install -yy python3 #python36-PyYAML python3-pip -sudo yum install -yy rpm-build - -# cleanup version if the directory name is used -VTMP="${VERSION#$PACKAGE-}" -VERSION=${VTMP%/} - - -if [[ "x$VERSION" == "x" ]]; then - echo "Must provide package version" - exit 1 -fi - -if [ ! -d ${PACKAGE}-${VERSION}-${RELEASE} ]; then - echo "Directory ${PACKAGE}-${VERSION}-${RELEASE} does not exist" -fi - -export SOURCE_DIR=${PACKAGE}-${VERSION}-${RELEASE}/SOURCES - -# clear the source dir of /usr (leave /etc) -rm -rf ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr -pip3 uninstall -y ${PACKAGE} || true -(cd ../..; PYTHONUSERBASE=$PWD/nita-${PACKAGE}/packaging_redhat/${SOURCE_DIR}/${PACKAGE}-${VERSION} pip3 install --user nita-${PACKAGE}/) - -mkdir -p ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local -mv ${SOURCE_DIR}/${PACKAGE}-${VERSION}/bin ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local -mv ${SOURCE_DIR}/${PACKAGE}-${VERSION}/lib ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local -#mv ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local/lib/python3.6/site-packages ${SOURCE_DIR}/${PACKAGE}-${VERSION}/usr/local/lib/python3.6/dist-packages - -# Create a tarball of with source -( - cd ${SOURCE_DIR} - tar czf ${PACKAGE}-${VERSION}.tar.gz ${PACKAGE}-${VERSION} -) - -# Build rpm file -export RPM_BUILD_DIR="${PWD}/${PACKAGE}-${VERSION}-${RELEASE}" -cp .rpmmacros ~ -rpmbuild -ba ${PACKAGE}-${VERSION}-${RELEASE}/SPECS/${PACKAGE}.spec diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/BUILD/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/BUILD/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/BUILD/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/BUILDROOT/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/BUILDROOT/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/BUILDROOT/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/RPMS/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/RPMS/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/RPMS/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/.gitignore deleted file mode 100644 index b437b25..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -yaml-to-excel-*/usr -*.tar.gz diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/yaml-to-excel-21.7.0/etc/profile.d/yaml-to-excel.sh b/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/yaml-to-excel-21.7.0/etc/profile.d/yaml-to-excel.sh deleted file mode 100644 index 1339201..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/SOURCES/yaml-to-excel-21.7.0/etc/profile.d/yaml-to-excel.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# ******************************************************** -# -# Project: nita-yaml-to-excel -# Version: 21.7 -# -# 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 -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** -if [ -z "$PYTHONPATH" ]; then - PYTHONPATH=/usr/local/lib/python3.6/dist-packages -else - PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/dist-packages -fi - -export PYTHONPATH diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/SPECS/yaml-to-excel.spec b/packaging_redhat/yaml-to-excel-21.7.0-1/SPECS/yaml-to-excel.spec deleted file mode 100644 index 476fd71..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/SPECS/yaml-to-excel.spec +++ /dev/null @@ -1,72 +0,0 @@ -# ******************************************************** -# -# Project: nita-yaml-to-excel -# Version: 21.7 -# -# 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 -# -# SPDX-License-Identifier: Apache-2.0 -# -# Third-Party Code: This code may depend on other components under separate copyright notice and license terms. Your use of the source code for those components is subject to the terms and conditions of the respective license as noted in the Third-Party source code file. -# -# ******************************************************** - -%define __spec_install_post %{nil} -%define debug_package %{nil} -%define __os_install_post %{_dbpath}/brp-compress - -Name: yaml-to-excel -Version: 21.7.0 -Release: 1 -Summary: Tool for converting excel spreadsheets to and from yaml -Group: Development/Tools -BuildArch: x86_64 -License: Apache License, Version 2.0, http://www.apache.org/licenses/LICENSE-2.0 -URL: https://www.juniper.net -Source0: %{name}-%{version}.tar.gz -Requires: python3 - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - -%description -Tool for converting excel spreadsheets to and from yaml. Includes yaml2xls.py and xls2yaml.py. - -%pre -# Empty section. - -%prep -%setup -q - -%build -# Empty section. - -%install -rm -rf %{buildroot} -mkdir -p %{buildroot} -# in builddir -cp -a * %{buildroot} - -%clean -rm -rf %{buildroot} - -%post -# Empty section. - -%preun -# Empty section. - -%files -%defattr(-,root,root,-) -%{_prefix}/local/bin/* -%{_prefix}/local/lib/* -%{_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 - - Initial rpm release diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/SRPMS/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/SRPMS/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/SRPMS/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/packaging_redhat/yaml-to-excel-21.7.0-1/TMP/.gitignore b/packaging_redhat/yaml-to-excel-21.7.0-1/TMP/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/packaging_redhat/yaml-to-excel-21.7.0-1/TMP/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/setup.py b/setup.py index 4cdeeb5..40eb8f9 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ # ******************************************************** # # Project: nita-yaml-to-excel -# Version: 21.7 # # Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. # @@ -24,9 +23,9 @@ 'description': 'Bidirectional conversion of YAML files to Microsoft Excel.', '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', + 'download_url': 'https://github.com/Juniper/nita-yaml-to-excel/archive/refs/heads/22.8.zip', 'author_email': 'aburston@juniper.net', - 'version': '21.7.0', + 'version': '22.8.0', 'install_requires': ['PyYAML', 'openpyxl'], 'packages': ['yamltoexcel'], 'scripts': ['yamltoexcel/xls2yaml.py', 'yamltoexcel/yaml2xls.py'], diff --git a/tests/__init__.py b/tests/__init__.py index 8edf997..9f1a7c4 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,7 +1,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. diff --git a/tests/test_methods.py b/tests/test_methods.py index d8a1287..b7b81fc 100644 --- a/tests/test_methods.py +++ b/tests/test_methods.py @@ -1,7 +1,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. diff --git a/tests/test_parser.py b/tests/test_parser.py index 55eb2c4..1104c52 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -1,7 +1,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. diff --git a/yamltoexcel/__init__.py b/yamltoexcel/__init__.py index 8edf997..9f1a7c4 100644 --- a/yamltoexcel/__init__.py +++ b/yamltoexcel/__init__.py @@ -1,7 +1,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. diff --git a/yamltoexcel/xls2yaml.py b/yamltoexcel/xls2yaml.py index 1e88562..1ff5261 100644 --- a/yamltoexcel/xls2yaml.py +++ b/yamltoexcel/xls2yaml.py @@ -3,7 +3,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. diff --git a/yamltoexcel/yaml2xls.py b/yamltoexcel/yaml2xls.py index 0003ee0..83e64a5 100644 --- a/yamltoexcel/yaml2xls.py +++ b/yamltoexcel/yaml2xls.py @@ -3,7 +3,6 @@ """ ******************************************************** Project: nita-yaml-to-excel -Version: 21.7 Copyright (c) Juniper Networks, Inc., 2021. All rights reserved. From 6e656b96519343e0cdf97810379c09e7609416d6 Mon Sep 17 00:00:00 2001 From: aburston Date: Thu, 18 Aug 2022 15:36:45 +0000 Subject: [PATCH 2/2] updated versions + removed packagign code --- BUILD.md | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 BUILD.md diff --git a/BUILD.md b/BUILD.md deleted file mode 100644 index a1ea34e..0000000 --- a/BUILD.md +++ /dev/null @@ -1,21 +0,0 @@ -For the building purpose of a **Package** it is recommended to first clone the repo: -``` -git clone -``` - -# Package Build - -## Debian/Ubuntu Package - -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-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-21.7.0-1.sh -```