From 95069d7bedb6ae02def3fccce22169b412d08eac Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Tue, 23 Nov 2021 11:38:17 +0100 Subject: [PATCH] Few insignificant updates to be able to rebase existing branches which are already on top of main. --- README.md | 15 ++++++--------- hello_world/__init__.py | 27 +++------------------------ setup.cfg | 4 +++- setup.py | 23 ++--------------------- 4 files changed, 14 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 0b43e71c..b9e343ce 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,14 @@ The simplest python CLI tool used to demonstrate packit service functionality. It will make your day. -``` -$ hello world! -Hello world! -``` - + $ hello world! + Hello world! ## How to? -Just open a pull request on this repository and packit service will build your changes and provide an RPM repository using your pull request as a source. +Just open a pull request on this repository and packit service will build your changes +and provide an RPM repository using your pull request as a source. Follow the steps provided by the packit service and then install this tool like this: -```bash -$ dnf install hello -``` + + $ dnf install hello diff --git a/hello_world/__init__.py b/hello_world/__init__.py index d39a17dd..dac3d3bb 100644 --- a/hello_world/__init__.py +++ b/hello_world/__init__.py @@ -1,26 +1,7 @@ #!/usr/bin/python3 -# MIT License -# -# Copyright (c) 2018-2019 Red Hat, 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: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. +# Copyright Contributors to the Packit project. +# SPDX-License-Identifier: MIT __version__ = "0.1.0" @@ -36,9 +17,7 @@ def usage(): def main(): args_n = len(sys.argv) - if args_n <= 1: - usage() - elif args_n > 2: + if args_n <= 1 or args_n > 2: usage() print(f"Hello {sys.argv[1]}") diff --git a/setup.cfg b/setup.cfg index 49b92a42..f2c439e3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = hello version = 0.1.0 -url = https://github.com/packit-service/hello +url = https://github.com/packit/hello description = Nice and a polite tool long_description = file: README.md long_description_content_type = text/markdown @@ -17,6 +17,8 @@ classifiers = Programming Language :: Python Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 keywords = hello diff --git a/setup.py b/setup.py index f1f301a0..de4f1079 100644 --- a/setup.py +++ b/setup.py @@ -1,26 +1,7 @@ #!/usr/bin/python3 -# MIT License -# -# Copyright (c) 2018-2019 Red Hat, 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: -# -# The above copyright notice and this permission notice shall be included in all -# copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -# SOFTWARE. +# Copyright Contributors to the Packit project. +# SPDX-License-Identifier: MIT from setuptools import setup