From b5180bc1ed3f34e7cc03e8544ceb45365e7f1321 Mon Sep 17 00:00:00 2001 From: John Burwell Date: Sun, 23 Apr 2023 22:27:57 -0500 Subject: [PATCH] fiddling --- main.py | 5 ++-- rsbbs/__init__.py | 1 + rsbbs/bbs.py | 5 ++-- rsbbs/message.py | 1 + rsbbs/parser.py | 1 + rsbbs/project_root.py | 1 + setup.py | 53 ++++++++++++------------------------------- 7 files changed, 24 insertions(+), 43 deletions(-) mode change 100644 => 100755 main.py diff --git a/main.py b/main.py old mode 100644 new mode 100755 index 26243ad..6c712a0 --- a/main.py +++ b/main.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell @@ -40,7 +41,7 @@ def main(): # Version arg is special: sysv_parser.add_argument('-v', '--version', action='version', - version=f"{sysv_parser.prog} version zero point aitch point negative purple") + version=f"{sysv_parser.prog} version 0.h.-p") # Parse the args from the system sysv_args = sysv_parser.parse_args(sys.argv[1:]) @@ -49,7 +50,7 @@ def main(): bbs = BBS(sysv_args) # Start the main BBS loop - bbs.main() + bbs.run() if __name__ == "__main__": main() diff --git a/rsbbs/__init__.py b/rsbbs/__init__.py index 0c03037..db87668 100644 --- a/rsbbs/__init__.py +++ b/rsbbs/__init__.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell diff --git a/rsbbs/bbs.py b/rsbbs/bbs.py index 05e8fbc..3c1044e 100644 --- a/rsbbs/bbs.py +++ b/rsbbs/bbs.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell @@ -39,7 +40,7 @@ class BBS(): self.config = self.load_config(sysv_args.config_file) - self.calling_station = sysv_args.calling_station + self.calling_station = sysv_args.calling_station.upper() self.engine = self.init_engine() self.parser = self.init_parser() @@ -276,7 +277,7 @@ class BBS(): # Main loop - def main(self): + def run(self): # Show greeting self.write_output(f"[RSBBS-1.0.0] listening on {self.config['callsign']} ") self.write_output(f"Welcome to {self.config['bbs_name']}, {self.calling_station}") diff --git a/rsbbs/message.py b/rsbbs/message.py index a664913..85927ab 100644 --- a/rsbbs/message.py +++ b/rsbbs/message.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell diff --git a/rsbbs/parser.py b/rsbbs/parser.py index 7d0fbdb..360fc50 100644 --- a/rsbbs/parser.py +++ b/rsbbs/parser.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell diff --git a/rsbbs/project_root.py b/rsbbs/project_root.py index 4692506..92dd62d 100644 --- a/rsbbs/project_root.py +++ b/rsbbs/project_root.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell diff --git a/setup.py b/setup.py index 0b666b2..04eb7a3 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- # # Really Simple BBS - a really simple BBS for ax.25 packet radio. # Copyright (C) 2023 John Burwell @@ -18,47 +19,21 @@ from setuptools import setup, find_packages -# https://www.digitalocean.com/community/tutorials/how-to-package-and-distribute-python-applications + +with open('README.md') as f: + readme = f.read() + +with open('LICENSE') as f: + license = f.read() setup( - name="really-simple-bbs", - version="0.1", - - description='''A really simple BBS developed particularly with ax.25 and amateur radio in mind.''', - + name='rsbbs', + version='0.1.0', + description='The Really Simple BBS for ax25d and packet radio', + long_description=readme, author='John Burwell', author_email='john@atatdotdot.com', - url='https://git.b-wells.us/jmbwell/rsbbs', - - classifiers=[ - "Programming Language :: Python :: 3", - "License :: OSI Approved :: MIT License", - ], - - - packages=find_packages(exclude=['test*', 'Test*']), - - package_data={ - '': ['README.md', 'LICENSE'], - 'really-simple-bbs': ['config.yaml.sample'] - }, - - - scripts=['main.py'], - - entry_points={ - 'console_scripts': [ - 'main.py = main:main', - ], - }, - - install_requires=[ - 'greenlet==2.0.2', - 'PyYAML==6.0', - 'SQLAlchemy==2.0.10', - 'typing_extensions==4.5.0', - ], - - -) \ No newline at end of file + license=license, + packages=find_packages(exclude=('tests', 'docs')) +)