From 59823fe6d742984c122c80a08d892b88002b24ff Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:00:13 +0200 Subject: [PATCH 1/9] chore: update package version --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index bc3179b..ebd2764 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = httpaste-victorykit -version = 1.0.0-alpha.1 +version = 1.0.0-alpha author = Tiara Rodney author_email = t.rodney@victoryk.it description = a versatile HTTP pastebin From b3273ee9e29eb2a283a561a4715befdcc87dde60 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:15:31 +0200 Subject: [PATCH 2/9] chore: update setup.cfg classifiers --- setup.cfg | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index ebd2764..a74a667 100644 --- a/setup.cfg +++ b/setup.cfg @@ -10,10 +10,14 @@ url = https://victorykit.bitbucket.io/httpaste project_urls = Bug Tracker = https://bitbucket.org/victorykit/httpaste/jira classifiers = - topic = : Software Development :: Libraries :: Python Modules - Programming Language :: Python :: 3 + Development Status :: 3 - Alpha + Intended Audience :: Developers + Topic :: Internet :: WWW/HTTP :: WSGI :: Server + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Operating System :: OS Independent - License :: Other/Proprietary License + License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+) [options] install_requires = From e670f0be274310301d88f59a3dac36a2f7b81d35 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:35:20 +0200 Subject: [PATCH 3/9] fix(helper): initialize module chore: upgrade version --- setup.cfg | 2 +- src/httpaste/helper/__init__.py | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/httpaste/helper/__init__.py diff --git a/setup.cfg b/setup.cfg index a74a667..d330606 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = httpaste-victorykit -version = 1.0.0-alpha +version = 1.0.1-alpha author = Tiara Rodney author_email = t.rodney@victoryk.it description = a versatile HTTP pastebin diff --git a/src/httpaste/helper/__init__.py b/src/httpaste/helper/__init__.py new file mode 100644 index 0000000..e69de29 From 678935bd0e8b45c528c80a97ddb8551ec3428187 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:51:05 +0200 Subject: [PATCH 4/9] fix: catch standalone command exception gevent will not be installed by default, therefore print a message explaining required steps --- src/httpaste/__main__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/httpaste/__main__.py b/src/httpaste/__main__.py index 399417f..24763f9 100644 --- a/src/httpaste/__main__.py +++ b/src/httpaste/__main__.py @@ -30,7 +30,14 @@ def command_standalone(**kwargs): """ from httpaste import load_config, get_flask_app - from gevent.pywsgi import WSGIServer + + try: + from gevent.pywsgi import WSGIServer + except ImportError as e: + raise ImportError(' '.join(( + 'gevent is currently not installed.', + 'Please install it by running \'python3 -m pip install gevent\'.' + ))) from e config, server_config = load_config(kwargs.get('config_path')) From 50af1a4587d1a6f965e1fbdb60601755857cfebb Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:51:52 +0200 Subject: [PATCH 5/9] fix(__main__): require command argument --- src/httpaste/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/httpaste/__main__.py b/src/httpaste/__main__.py index 24763f9..7b6de2f 100644 --- a/src/httpaste/__main__.py +++ b/src/httpaste/__main__.py @@ -103,7 +103,7 @@ def parser(): p = argparse.ArgumentParser(description='Process some integers.') - sp = p.add_subparsers(dest='command') + sp = p.add_subparsers(dest='command', required=True) p_standalone = sp.add_parser('standalone', help=command_standalone.__doc__) p_standalone.add_argument('--config-path', '-c', required=True) From c88e3ab17ee0672236794735ea28793a467fd130 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:51:05 +0200 Subject: [PATCH 6/9] fix: catch standalone command exception gevent will not be installed by default, therefore print a message explaining required steps --- src/httpaste/__main__.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/httpaste/__main__.py b/src/httpaste/__main__.py index 4a6aae4..f019a95 100644 --- a/src/httpaste/__main__.py +++ b/src/httpaste/__main__.py @@ -30,7 +30,14 @@ def command_standalone(**kwargs): """ from httpaste import load_config, get_flask_app - from gevent.pywsgi import WSGIServer + + try: + from gevent.pywsgi import WSGIServer + except ImportError as e: + raise ImportError(' '.join(( + 'gevent is currently not installed.', + 'Please install it by running \'python3 -m pip install gevent\'.' + ))) from e config, server_config = load_config(kwargs.get('config_path')) From 6bef30f1f345f4b66b1d0044bb68b66e820ff0ea Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 19:51:52 +0200 Subject: [PATCH 7/9] fix(__main__): require command argument --- src/httpaste/__main__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/httpaste/__main__.py b/src/httpaste/__main__.py index f019a95..436a46c 100644 --- a/src/httpaste/__main__.py +++ b/src/httpaste/__main__.py @@ -117,7 +117,7 @@ def parser(): p = argparse.ArgumentParser(description='Process some integers.') - sp = p.add_subparsers(dest='command') + sp = p.add_subparsers(dest='command', required=True) p_standalone = sp.add_parser('standalone', help=command_standalone.__doc__) p_standalone.add_argument('--config-path', '-c', required=True) From d367d43524c07501dba679fceaebcf38be1da812 Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 20:06:44 +0200 Subject: [PATCH 8/9] fix(schema): initialize module chore: upgrade version --- setup.cfg | 2 +- src/httpaste/schema/__init__.py | 0 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/httpaste/schema/__init__.py diff --git a/setup.cfg b/setup.cfg index d330606..f081dbf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = httpaste-victorykit -version = 1.0.1-alpha +version = 1.0.3-alpha author = Tiara Rodney author_email = t.rodney@victoryk.it description = a versatile HTTP pastebin diff --git a/src/httpaste/schema/__init__.py b/src/httpaste/schema/__init__.py new file mode 100644 index 0000000..e69de29 From dfff5f15237e6ffb05941d7a67597714fadf12cb Mon Sep 17 00:00:00 2001 From: Tiara Rodney Date: Sat, 2 Apr 2022 20:20:09 +0200 Subject: [PATCH 9/9] fix(setup.cfg): add schema data path --- setup.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.cfg b/setup.cfg index f081dbf..802dfa7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -37,3 +37,6 @@ console_scripts = [options.packages.find] where = src + +[options.package_data] +schema = src/httpaste/schema/httpaste.openapi.json \ No newline at end of file