From 879321a157162293c0b650c94456143d75d1f3d2 Mon Sep 17 00:00:00 2001 From: Laurent Hory Date: Thu, 14 May 2020 22:13:01 +0200 Subject: [PATCH 1/3] create a real package --- setup.cfg | 28 ++++++++++++++++++++++ setup.py | 40 ++----------------------------- xmpp_http_upload/__init__.py | 0 xhu.py => xmpp_http_upload/xhu.py | 0 4 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 setup.cfg create mode 100644 xmpp_http_upload/__init__.py rename xhu.py => xmpp_http_upload/xhu.py (100%) diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..ff3ead8 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,28 @@ +[metadata] +name = xmpp-http-upload +version = 0.4.0 +description = "Flask-based HTTP service to handle XMPP HTTP upload requests from Prosody mod_http_upload_external" +long_description = file: README.rst +url = https://github.com/horazont/xmpp-http-upload +author = Jonas Wielicki +author_email = jonas@wielicki.name +license = GPLv3+ +keywords = xmpp, http +classifiers = + "Development Status :: 3 - Alpha" + "Intended Audience :: Developers" + "Operating System :: POSIX" + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)" + "Programming Language :: Python :: 3 :: Only" + "Programming Language :: Python :: 3.3" + "Programming Language :: Python :: 3.4" + "Topic :: Communications :: Chat" + "Topic :: Internet :: WWW/HTTP" + "Topic :: Internet :: XMPP" + +[options] +include_package_data = True +packages = find: +install_requires = + flask + flask-cors diff --git a/setup.py b/setup.py index 5e16893..2edc152 100644 --- a/setup.py +++ b/setup.py @@ -1,41 +1,5 @@ #!/usr/bin/env python3 -import os.path -import runpy +from setuptools import setup -import setuptools -from setuptools import setup, find_packages -here = os.path.abspath(os.path.dirname(__file__)) - -with open(os.path.join(here, "README.rst"), encoding="utf-8") as f: - long_description = f.read() - -install_requires = [ - 'flask~=0.12', - 'flask-cors~=3.0.3', -] - -setup( - name="xmpp-http-upload", - version="0.3.0", - description="Flask-based HTTP service to handle XMPP HTTP upload requests from Prosody mod_http_upload_external", - long_description=long_description, - url="https://github.com/horazont/xmpp-http-upload", - author="Jonas Wielicki", - author_email="jonas@wielicki.name", - license="GPLv3+", - classifiers=[ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", - "Operating System :: POSIX", - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", - "Programming Language :: Python :: 3 :: Only", - "Programming Language :: Python :: 3.3", - "Programming Language :: Python :: 3.4", - "Topic :: Communications :: Chat", - "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: XMPP", - ], - keywords="xmpp http", - install_requires=install_requires, -) +setup() diff --git a/xmpp_http_upload/__init__.py b/xmpp_http_upload/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/xhu.py b/xmpp_http_upload/xhu.py similarity index 100% rename from xhu.py rename to xmpp_http_upload/xhu.py From 78b3614ed1005b536cbb7da04c38f210678d33ec Mon Sep 17 00:00:00 2001 From: Laurent Hory Date: Sat, 16 May 2020 22:01:53 +0200 Subject: [PATCH 2/3] remove setup.cfg file --- .gitignore | 18 ++++++++++++++++++ setup.cfg | 28 ---------------------------- setup.py | 42 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 58 insertions(+), 30 deletions(-) delete mode 100644 setup.cfg diff --git a/.gitignore b/.gitignore index 225fc6f..017ca70 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,19 @@ /__pycache__ +*.py[cod] +*$py.class + +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +*.egg-info/ +.installed.cfg +*.egg + +.ropeproject diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index ff3ead8..0000000 --- a/setup.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[metadata] -name = xmpp-http-upload -version = 0.4.0 -description = "Flask-based HTTP service to handle XMPP HTTP upload requests from Prosody mod_http_upload_external" -long_description = file: README.rst -url = https://github.com/horazont/xmpp-http-upload -author = Jonas Wielicki -author_email = jonas@wielicki.name -license = GPLv3+ -keywords = xmpp, http -classifiers = - "Development Status :: 3 - Alpha" - "Intended Audience :: Developers" - "Operating System :: POSIX" - "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)" - "Programming Language :: Python :: 3 :: Only" - "Programming Language :: Python :: 3.3" - "Programming Language :: Python :: 3.4" - "Topic :: Communications :: Chat" - "Topic :: Internet :: WWW/HTTP" - "Topic :: Internet :: XMPP" - -[options] -include_package_data = True -packages = find: -install_requires = - flask - flask-cors diff --git a/setup.py b/setup.py index 2edc152..434213c 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,43 @@ #!/usr/bin/env python3 -from setuptools import setup +import os.path +import runpy +import setuptools +from setuptools import setup, find_packages + +here = os.path.abspath(os.path.dirname(__file__)) + +with open(os.path.join(here, "README.rst"), encoding="utf-8") as f: + long_description = f.read() + +install_requires = [ + 'flask~=0.12', + 'flask-cors~=3.0.3', +] + +setup( + name="xmpp-http-upload", + version="0.3.0", + packages=find_packages(), + description="Flask-based HTTP service to handle XMPP HTTP upload requests from Prosody mod_http_upload_external", + long_description=long_description, + url="https://github.com/horazont/xmpp-http-upload", + author="Jonas Wielicki", + author_email="jonas@wielicki.name", + license="GPLv3+", + classifiers=[ + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "Operating System :: POSIX", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", + "Topic :: Communications :: Chat", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: XMPP", + ], + keywords="xmpp http", + install_requires=install_requires, +) -setup() From 59615af54cf397c2a7bca8eff1a2136f1e9144e4 Mon Sep 17 00:00:00 2001 From: Laurent Hory Date: Sat, 16 May 2020 22:06:07 +0200 Subject: [PATCH 3/3] remove trailing line --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 434213c..90e1ea1 100644 --- a/setup.py +++ b/setup.py @@ -40,4 +40,3 @@ keywords="xmpp http", install_requires=install_requires, ) -