Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #123, create package for cfs-groundsystem #137

Merged
merged 1 commit into from
Mar 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions GroundSystem.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@
import shlex
import subprocess
import sys
from pathlib import Path
import os
import signal
import pathlib

from PyQt5.QtWidgets import QApplication, QMainWindow, QMessageBox

Expand All @@ -36,8 +38,8 @@

__version__ = _version


ROOTDIR = Path(sys.argv[0]).resolve().parent
#ROOTDIR = Path(sys.argv[0]).resolve().parent
ROOTDIR = pathlib.Path(__file__).parent.absolute()


#
Expand Down Expand Up @@ -71,7 +73,7 @@ def closeEvent(self, evnt):
if self.RoutingService:
self.RoutingService.stop()
print("Stopped routing service")

os.kill(0, signal.SIGKILL)
super().closeEvent(evnt)

# Read the selected spacecraft from combo box on GUI
Expand Down Expand Up @@ -171,9 +173,10 @@ def initRoutingService(self):

#
# Main

#
if __name__ == "__main__":
def main():

# Report Version Number upon startup
print(_version_string)

Expand All @@ -193,3 +196,6 @@ def initRoutingService(self):

# Execute the app
sys.exit(app.exec_())

if __name__ == "__main__":
main()
Empty file added Subsystems/__init__.py
Empty file.
Empty file.
Empty file added Subsystems/cmdGui/__init__.py
Empty file.
Empty file added Subsystems/cmdUtil/__init__.py
Empty file.
Empty file added Subsystems/tlmGUI/__init__.py
Empty file.
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setuptools
13 changes: 13 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
from setuptools import setup

setup(
name='GroundSystem',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename to "cF-GroundSystem" and update version to use the number in version.py

packages=['Subsystems','Subsystems.tlmGUI','Subsystems.cmdGui','Subsystems.cmdUtil'],
include_package_data=True,
version='0.0.0',
entry_points={
'console_scripts':[
'startg=GroundSystem:main'
]
},
)