From fc0cf32685b8ec5a72ef4ce6872599199aebdb7f Mon Sep 17 00:00:00 2001 From: Peter Silva Date: Sun, 5 Nov 2023 02:49:39 -0500 Subject: [PATCH] win binary generation patch, and filled in author credits #740 --- generate-win-installer.sh | 3 +- pyproject.toml | 5 ++ setup.cfg | 5 -- setup.py | 109 -------------------------------------- 4 files changed, 7 insertions(+), 115 deletions(-) delete mode 100644 setup.cfg delete mode 100755 setup.py diff --git a/generate-win-installer.sh b/generate-win-installer.sh index 9b3c3e5cb..097791469 100755 --- a/generate-win-installer.sh +++ b/generate-win-installer.sh @@ -75,7 +75,8 @@ cd .. # Remove last build rm -rf dist rm -rf build -python3 setup.py bdist_wheel +#python3 setup.py bdist_wheel +hatch build if [ "$1" ]; then PYVERSION=$1 diff --git a/pyproject.toml b/pyproject.toml index 75b2850fb..3b528981e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,8 +12,13 @@ license = "GPL-2.0-only" keywords = ["file transfer"] authors = [ { name = "Peter Silva", email = "peter.silva@ssc-spc.gc.ca" }, + { name = "Michel Grenier", email ="" }, { name = "Reid Sunderland", email = "" }, { name = "André Leblanc", email = "" }, + { name = "Greg Linton", email ="" }, + { name = "Cléa Aumont", email ="" }, + { name = "Cody Au", email ="" }, + { name = "Benoit Lapointe", email ="" }, ] classifiers = [ diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 290ad06df..000000000 --- a/setup.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[wheel] -python-tag = py3 - -[pycodestyle] -max-line-length = 119 \ No newline at end of file diff --git a/setup.py b/setup.py deleted file mode 100755 index 6910e55b0..000000000 --- a/setup.py +++ /dev/null @@ -1,109 +0,0 @@ -import codecs -import itertools -import os -import re -import sys - -from setuptools import find_packages -from distutils.core import setup - -#import sarracenia - -here = os.path.abspath(os.path.dirname(__file__)) - - -def latest_changelog() -> str: - - lines=[] - started=False - with open('debian/changelog','r') as clf: - for l in clf.readlines(): - if len(l) < 2: continue - if l[2] == '*' : - lines.append(l) - elif l[2] == '-': break - return '\nChanges:\n' + '\n'.join(lines) - -def read(*parts): - # intentionally *not* adding an encoding option to open, See: - # https://github.com/pypa/virtualenv/issues/201#issuecomment-3145690 - return codecs.open(os.path.join(here, *parts), 'r').read() - -metadata = {} -with open(os.path.join(here, "sarracenia", "_version.py"), "r") as f: - exec(f.read(), metadata) - -packages = find_packages() -print("packages = %s" % packages) - -features = { - 'amqp' : [ "amqp" ], - 'filetypes': [ "python-magic" ], - 'ftppoll' : ['dateparser' ], - 'mqtt': [ 'paho.mqtt>=1.5.1' ], - 'vip': [ 'netifaces' ], - 'redis': [ 'redis' ] - } -features['all'] = list(itertools.chain.from_iterable(features.values())) - -setup( - name='metpx-sr3', - python_requires='>=3.6', - version=metadata["__version__"], - description='Subscribe, Acquire, and Re-Advertise products.', - long_description_content_type='text/x-rst', - long_description=(read('README.rst')+latest_changelog()), - url='https://github.com/MetPX/sarracenia', - license='GPLv2', - author='Shared Services Canada, Supercomputing, Data Interchange', - author_email='Peter.Silva@canada.ca', - packages=find_packages(), - package_data={'sarracenia': ['examples/*/*']}, - entry_points={ - "console_scripts": [ - "sr3=sarracenia.sr:main", - "sr3_post=sarracenia.sr_post:main", - "sr3_rotateLogsManually=sarracenia.sr_rotateLogsManually:main", - #"sr3_poll=sarracenia.sr_flow:main", - #"sr3_report=sarracenia.sr_flow:main", - #"sr3_watch=sarracenia.sr_flow:main", - #"sr3_winnow=sarracenia.sr_flow:main", - #"sr3_sarra=sarracenia.sr_flow:main", - #"sr3_shovel=sarracenia.sr_flow:main", - #"sr3_sender=sarracenia.sr_flow:main", - #"sr3_subscribe=sarracenia.sr_flow:main", - #"sr3_log2save=sarracenia.sr_log2save:main", - "sr3_tailf=sarracenia.sr_tailf:main" - ] - }, - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: Console', - 'Intended Audience :: Developers', - 'Intended Audience :: Science/Research', - 'Intended Audience :: System Administrators', - 'Natural Language :: English', - 'License :: OSI Approved :: GNU General Public License v2 (GPLv2)', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Topic :: Communications :: File Sharing', - 'Topic :: System :: Logging', - ], - install_requires=[ - "appdirs", "humanfriendly", "humanize", "jsonpickle", "paramiko", - "psutil>=5.3.0", "watchdog", - 'xattr ; sys_platform!="win32"', 'python-magic; sys_platform!="win32"', - 'python-magic-bin; sys_platform=="win32"' - - ], - extras_require = features - ) - - - -