From dd2730f8db268eb3cf09ed76c6042476dfca3a66 Mon Sep 17 00:00:00 2001
From: MintoDA1 <51412913+MintoDA1@users.noreply.github.com>
Date: Wed, 9 Aug 2023 12:12:43 -0400
Subject: [PATCH] Added some new info to the setup.py and
 streamlined/reorganize the tests

---
 setup.py                                      | 21 ++++++++++++++++++-
 {tests => swiftest/tests}/CMakeLists.txt      |  2 +-
 .../tests/test_input_output.py                |  0
 3 files changed, 21 insertions(+), 2 deletions(-)
 rename {tests => swiftest/tests}/CMakeLists.txt (79%)
 rename tests/test_suite.py => swiftest/tests/test_input_output.py (100%)

diff --git a/setup.py b/setup.py
index 132f2b202..9266d5fec 100644
--- a/setup.py
+++ b/setup.py
@@ -24,6 +24,25 @@
       url='https://github.itap.purdue.edu/MintonGroup/swiftest',
       python_requires=">3.8",
       license="GPLv3",
+      classifiers=[
+        # How mature is this project? Common values are
+        #   3 - Alpha
+        #   4 - Beta
+        #   5 - Production/Stable
+        'Development Status :: 3 - Alpha/Development',
+
+        # Indicate who your project is intended for
+        'Intended Audience :: Science/Research',
+        'Topic :: Scientific/Engineering :: Astronomy',
+
+        # Pick your license as you wish (should match "license" above)
+        'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
+
+        # Specify the Python versions you support here. In particular, ensure
+        # that you indicate whether you support Python 2, Python 3 or both.
+        'Programming Language :: Python :: 3',
+      ],
+      keywords='astronomy astrophysics planetary nbody integrator symplectic wisdom-holman',
       cmake_args=[
             '-DCMAKE_BUILD_TYPE=RELEASE',
             '-DMACHINE_CODE_VALUE="generic"',
@@ -33,7 +52,6 @@
             ],
       install_requires= [
             'numpy>=1.24.3',
-            'pandas>=1.5.3',
             'scipy>=1.10.1',
             'xarray>=2022.11.0',
             'dask>=2022.1',
@@ -46,4 +64,5 @@
             'tqdm>=4.65.0',
       ],
       packages=['swiftest'],
+      test_suite="swiftest.tests",
       )
diff --git a/tests/CMakeLists.txt b/swiftest/tests/CMakeLists.txt
similarity index 79%
rename from tests/CMakeLists.txt
rename to swiftest/tests/CMakeLists.txt
index 17e6a6b62..4a7f951f0 100644
--- a/tests/CMakeLists.txt
+++ b/swiftest/tests/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(UNIT_TEST swiftest_test_suite)
 ADD_CUSTOM_TARGET(${UNIT_TEST} ALL)
 ADD_DEPENDENCIES(${UNIT_TEST} ${SWIFTEST_DRIVER})
 
-ADD_TEST(NAME ${UNIT_TEST} COMMAND python ${CMAKE_SOURCE_DIR}/python/swiftest/tests/test_suite.py)
+ADD_TEST(NAME ${UNIT_TEST} COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/test_input_output.py)
 
 ADD_CUSTOM_COMMAND(
      TARGET ${UNIT_TEST}
diff --git a/tests/test_suite.py b/swiftest/tests/test_input_output.py
similarity index 100%
rename from tests/test_suite.py
rename to swiftest/tests/test_input_output.py