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

Fixing GDS for windows #176

Merged
merged 1 commit into from
May 21, 2024
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
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ Repository = "https://github.com/fprime-community/fprime-gds"
[project.scripts]
fprime-cli = "fprime_gds.executables.fprime_cli:main"
fprime-seqgen = "fprime_gds.common.tools.seqgen:main"

[project.gui-scripts]
fprime-gds = "fprime_gds.executables.run_deployment:main"

# For Pytest fixtures
Expand Down
6 changes: 4 additions & 2 deletions src/fprime_gds/common/zmq_transport.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,11 +130,13 @@ def connect_incoming(self):

def disconnect_outgoing(self):
"""Disconnect the ZeroMQ sockets"""
self.zmq_socket_outgoing.close()
if self.zmq_socket_outgoing is not None:
self.zmq_socket_outgoing.close()

def disconnect_incoming(self):
"""Disconnect the ZeroMQ sockets"""
self.zmq_socket_incoming.close()
if self.zmq_socket_incoming is not None:
self.zmq_socket_incoming.close()

def terminate(self):
"""Terminate the ZeroMQ context"""
Expand Down
2 changes: 1 addition & 1 deletion src/fprime_gds/flask/sequence.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def put(self):
403,
message=f"{key} is invalid command key. Supply 0xfeedcafe to run command.",
)
elif not re.match(".*\.seq", name) or Path(name).name != name:
elif not re.match(".*\\.seq", name) or Path(name).name != name:
flask_restful.abort(
403,
message={"error": "Supply filename with .seq suffix", "type": "error"},
Expand Down
Loading