From 3ed3ed7c638155c103f32f61bd353a04122b7bbf Mon Sep 17 00:00:00 2001
From: Evan Flynn <evan.flynn@apex.ai>
Date: Wed, 20 Mar 2024 18:52:49 -0700
Subject: [PATCH] Bring rqt_topic rewrite together, use in main

Signed-off-by: Evan Flynn <evan.flynn@apex.ai>
---
 rqt_topic/main.py    |  4 ++--
 rqt_topic/topic.py   |  2 +-
 setup.py             | 34 +++++++++++++++++-----------------
 test/test_xmllint.py |  4 ++--
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/rqt_topic/main.py b/rqt_topic/main.py
index 8ac6033..b882cfc 100755
--- a/rqt_topic/main.py
+++ b/rqt_topic/main.py
@@ -37,8 +37,8 @@
 
 def main():
     main = Main()
-    sys.exit(main.main(sys.argv, standalone='rqt_topic.topic.Topic'))
+    sys.exit(main.main(sys.argv, standalone="rqt_topic.topic.Topic"))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/rqt_topic/topic.py b/rqt_topic/topic.py
index 300a326..4cafc4c 100644
--- a/rqt_topic/topic.py
+++ b/rqt_topic/topic.py
@@ -38,7 +38,7 @@
 class Topic(Plugin):
     def __init__(self, context):
         super(Topic, self).__init__(context)
-        self.setObjectName('Topic')
+        self.setObjectName("Topic")
 
         self._widget = TopicWidget(context.node, self)
 
diff --git a/setup.py b/setup.py
index 0de391d..cbc3bd1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 from setuptools import setup
 
-package_name = 'rqt_topic'
+package_name = "rqt_topic"
 setup(
     name=package_name,
     version='1.7.1',
-    package_dir={'': 'src'},
+    package_dir={'': '.'},
     packages=[
         package_name,
         f'{package_name}/models',
@@ -18,27 +18,27 @@
         ('share/' + package_name, ['package.xml']),
         ('share/' + package_name, ['plugin.xml']),
     ],
-    install_requires=['setuptools'],
+    install_requires=["setuptools"],
     zip_safe=True,
-    author='Dorian Scholz',
-    maintainer='Brandon Ong',
-    maintainer_email='brandon@openrobotics.org',
-    keywords=['ROS'],
+    author="Dorian Scholz",
+    maintainer="Brandon Ong",
+    maintainer_email="brandon@openrobotics.org",
+    keywords=["ROS"],
     classifiers=[
-        'Intended Audience :: Developers',
-        'License :: OSI Approved :: BSD License',
-        'Programming Language :: Python',
-        'Topic :: Software Development',
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: BSD License",
+        "Programming Language :: Python",
+        "Topic :: Software Development",
     ],
     description=(
-        'rqt_topic provides a GUI plugin for displaying debug information about ROS topics '
-        'including publishers, subscribers, publishing rate, and ROS Messages.'
+        "rqt_topic provides a GUI plugin for displaying debug information about ROS topics "
+        "including publishers, subscribers, publishing rate, and ROS Messages."
     ),
-    license='BSD',
-    tests_require=['pytest'],
+    license="BSD",
+    tests_require=["pytest"],
     entry_points={
-        'console_scripts': [
-            'rqt_topic = ' + package_name + '.main:main',
+        "console_scripts": [
+            "rqt_topic = " + package_name + ".main:main",
         ],
     },
 )
diff --git a/test/test_xmllint.py b/test/test_xmllint.py
index ca32830..6591651 100644
--- a/test/test_xmllint.py
+++ b/test/test_xmllint.py
@@ -19,5 +19,5 @@
 @pytest.mark.linter
 @pytest.mark.xmllint
 def test_xmllint():
-    rc = main(argv=['.'])
-    assert rc == 0, 'Found errors'
+    rc = main(argv=["."])
+    assert rc == 0, "Found errors"