tradedangerous 11.5.3__tar.gz → 12.0.1__tar.gz

{tradedangerous-11.5.3/tradedangerous.egg-info → tradedangerous-12.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: tradedangerous
-Version: 11.5.3
+Version: 12.0.1
 Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus
@@ -11,12 +11,13 @@ Project-URL: Documentation, https://github.com/eyeonus/Trade-Dangerous/wiki
 Project-URL: Source Code, https://github.com/eyeonus/Trade-Dangerous
 Keywords: trade,elite,elite-dangerous
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
@@ -31,8 +32,10 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: project-url
 Dynamic: requires-dist
+Dynamic: requires-python
 Dynamic: summary
 
 
@@ -41,9 +44,10 @@ Dynamic: summary
 TradeDangerous  
 Copyright (C) Oliver "kfsone" Smith, July 2014  
 Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017  
-Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2021
+Copyright (C) Stefan 'Tromador' Morrell 2025  
+Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2025  
 
-REQUIRES PYTHON 3.4 OR HIGHER.
+REQUIRES PYTHON 3.10 OR HIGHER.
 
 ----------
 

{tradedangerous-11.5.3 → tradedangerous-12.0.1}/README.md

@@ -4,9 +4,10 @@
 TradeDangerous  
 Copyright (C) Oliver "kfsone" Smith, July 2014  
 Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017  
-Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2021
+Copyright (C) Stefan 'Tromador' Morrell 2025  
+Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2025  
 
-REQUIRES PYTHON 3.4 OR HIGHER.
+REQUIRES PYTHON 3.10 OR HIGHER.
 
 ----------
 

tradedangerous-12.0.1/setup.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+# --------------------------------------------------------------------
+# Copyright (C) Oliver 'kfsone' Smith 2014 <oliver@kfs.org>:
+# Copyright (C) Bernd 'Gazelle' Gollesch 2016, 2017
+# Copyright (C) Stefan 'Tromador' Morrell 2025
+# Copyright (C) Jonathan 'eyeonus' Jones 2018 - 2025
+#
+# You are free to use, redistribute, or even print and eat a copy of
+# this software so long as you include this copyright notice.
+# I guarantee there is at least one bug neither of us knew about.
+# --------------------------------------------------------------------
+"""Setup for trade-dangerous"""
+import sys
+from setuptools import setup, find_packages
+
+try:
+    from semantic_release import setup_hook
+    setup_hook(sys.argv)
+except ImportError:
+    pass
+
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+package = "tradedangerous"
+
+exec(open("tradedangerous/version.py").read())  # pylint: disable=W0122
+
+setup(
+    name=package,
+    version=__version__,  # pylint: disable=E0602
+    install_requires=["requests", "appJar", "ijson", "rich"],
+    setup_requires=["pytest-runner"],
+    tests_require=["pytest"],
+    packages=[
+        ".",
+        "tradedangerous",
+        "tradedangerous.commands",
+        "tradedangerous.mfd",
+        "tradedangerous.mfd.saitek",
+        "tradedangerous.misc",
+        "tradedangerous.plugins",
+        "tradedangerous.db",
+    ],
+    url="https://github.com/eyeonus/Trade-Dangerous",
+    project_urls={
+        "Bug Tracker": "https://github.com/eyeonus/Trade-Dangerous/issues",
+        "Documentation": "https://github.com/eyeonus/Trade-Dangerous/wiki",
+        "Source Code": "https://github.com/eyeonus/Trade-Dangerous",
+    },
+    author="eyeonus",
+    author_email="eyeonus@gmail.com",
+    description=(
+        "Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, "
+        "organized around one of the most powerful trade run optimizers available."
+    ),
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    keywords=["trade", "elite", "elite-dangerous"],
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
+        "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
+        "Operating System :: OS Independent",
+    ],
+    license="MPL",
+    python_requires=">=3.10",
+    test_suite="tests",
+    package_data={
+        "tradedangerous": [
+            "templates/TradeDangerous.sql",
+            "templates/Added.csv",
+            "templates/Category.csv",
+            "templates/RareItem.csv",
+            "templates/database_changes.json",
+        ]
+    },
+    entry_points={
+        "console_scripts": [
+            "trade=trade:main",
+            "tradegui=tradegui:main",
+        ]
+    },
+    zip_safe=False,
+)

{tradedangerous-11.5.3 → tradedangerous-12.0.1}/tests/test_bootstrap_commands.py

@@ -1,3 +1,4 @@
+import pytest
 import unittest
 
 
@@ -46,6 +47,7 @@ class TestBootstrapCommands(unittest.TestCase):
     
     def test_import_update_cmd(self):
         from tradedangerous.commands import update_cmd
-    
+
+    @pytest.mark.skip(reason="update_gui command has been deprecated and archived")
     def test_import_update_gui(self):
-        from tradedangerous.commands import update_gui
+        pytest.skip("update_gui command is deprecated and archived")

{tradedangerous-11.5.3 → tradedangerous-12.0.1}/tests/test_bootstrap_plugins.py

@@ -19,9 +19,11 @@ class TestBootstrapPlugins:
     
     def test_import_plugins_edmc_batch(self):
         from tradedangerous.plugins import edmc_batch_plug
-    
+
+    @pytest.mark.skip(reason="journal_plug plugin has been deprecated and archived")
     def test_import_plugins_journal(self):
-        from tradedangerous.plugins import journal_plug
-    
+        pytest.skip("journal_plug plugin is deprecated and archived")
+
+    @pytest.mark.skip(reason="netlog_plug plugin has been deprecated and archived")
     def test_import_plugins_netlog(self):
-        from tradedangerous.plugins import netlog_plug
+        pytest.skip("netlog_plug plugin is deprecated and archived")

{tradedangerous-11.5.3 → tradedangerous-12.0.1}/tests/test_trade.py

@@ -41,28 +41,14 @@ class TestTrade:
         captured = capsys.readouterr()
         assert "NOTE: Export Table 'System'" in captured.out
         # TODO: check that System.csv has a fresh date
-    
+
+    @pytest.mark.skip(reason="station command deprecated; now prints deprecation banner")
     def test_station_remove(self, capsys):
-        # "Dekker's Yard"
-        trade([PROG, "station", "-rm", "sol/dekkers"])
-        captured = capsys.readouterr()
-        assert regex_findin(r"NOTE: Sol/Dekker's Yard \(#\d+\) removed", captured.out)
-    
+        pytest.skip("station command deprecated; no longer edits DB directly")
+
+    @pytest.mark.skip(reason="station command deprecated; now prints deprecation banner")
     def test_station_add(self, capsys):
-        # "Dekker's Yard"
-        trade([
-            PROG, "station", "--add", "--ls-from-star=5",
-            "--market=Y",
-            "--black-market=?",
-            "--outfitting=?",
-            "--pad-size=s",
-            "--rearm=?",
-            "--refuel=Y",
-            "--repair=?",
-            "--no-export",
-            "sol/Dangerous Delight"])
-        captured = capsys.readouterr()
-        assert regex_findin(r"NOTE: Sol/Dangerous Delight \(#\d+\) added", captured.out)
+        pytest.skip("station command deprecated; no longer edits DB directly")
     
     def test_nav(self, capsys):
         trade([PROG, "nav", "--ly-per=50", "sol", "Shinrarta Dezhra"])

{tradedangerous-11.5.3 → tradedangerous-12.0.1}/tests/test_trade_run.py

@@ -1,9 +1,9 @@
 import io
-
+import os
 import pytest
+import re
 
 from tradedangerous.cli import trade
-
 from .helpers import copy_fixtures, regex_findin, replace_stdin
 
 PROG = "trade"
@@ -15,50 +15,58 @@ def setup_module():
 
 class TestTradeRun:
     def test_run1(self, capsys):
-        trade([PROG, "run", "--capacity=10", "--credits=10000", "--from=sol/abr", "--jumps-per=3", "--ly-per=10.5", "--no-planet"])
+        # Disable colour output for deterministic matching
+        os.environ["TD_NO_COLOR"] = "1"
+        trade([
+            PROG, "run",
+            "--capacity=10", "--credits=10000",
+            "--from=sol/abr", "--jumps-per=3",
+            "--ly-per=10.5", "--no-planet"
+        ])
         captured = capsys.readouterr()
         assert "Sol/Abraham Lincoln: 10 x Hydrogen Fuel," in captured.out
         assert "Sol/Burnell Station: 2 x Silver," in captured.out
         assert "560cr (213/ton)" in captured.out
-    
+
     @pytest.mark.slow
     def test_run2(self, capsys):
+        os.environ["TD_NO_COLOR"] = "1"
         trade([
             PROG, "run", "-vv", "--progress", "--empty=82",
             "--cap=212", "--jumps=4", "--cr=2153796", "--from=sol/abr",
             "--hops=6", "--ls-m=8000", "--sup=10000",
-            "--pad=L", "--ly=25", "--prune-hop=3", "--prune-sc=40"])
+            "--pad=L", "--ly=25", "--prune-hop=3", "--prune-sc=40"
+        ])
         captured = capsys.readouterr()
         assert regex_findin(r"=> est [\d\s,]+cr total", captured.out)
-    
+
     @pytest.mark.slow
     def test_run3(self, capsys):
-        """Testing --checklist
-        """
-        # monkeypatch.setattr('sys.stdin', io.StringIO('100'))
+        """Testing --checklist"""
+        os.environ["TD_NO_COLOR"] = "1"
         STEPS = 37
         with replace_stdin(io.StringIO('\n' * STEPS)):
             trade([
                 PROG, "run", "-vv", "--progress", "--empty=82", "--checklist",
                 "--cap=212", "--jumps=4", "--cr=2153796", "--from=sol/abr",
                 "--hops=6", "--ls-m=8000", "--sup=10000",
-                "--pad=L", "--ly=25", "--prune-hop=3", "--prune-sc=40"])
+                "--pad=L", "--ly=25", "--prune-hop=3", "--prune-sc=40"
+            ])
         captured = capsys.readouterr()
-        # with capsys.disabled():
-        #      print("Here")
-        #      print(captured.out)
-        #      print("to Here")
         assert "BEGINNING CHECKLIST FOR Sol/Abraham Lincoln -> LHS 449/Fisher Point" in captured.out
-        assert "35 : Sell 212 x Polymers"
-    
+        assert "35 : Sell 212 x Polymers" in captured.out
+
     def test_run4(self, capsys):
-        trade([PROG, "run", "--capacity=10", "--credits=10000", "--from=sol/abr", "--jumps-per=3", "--ly-per=10.5", "--start-jumps=2"])
+        os.environ["TD_NO_COLOR"] = "1"
+        trade([
+            PROG, "run",
+            "--capacity=10", "--credits=10000",
+            "--from=sol/abr", "--jumps-per=3",
+            "--ly-per=10.5", "--start-jumps=2"
+        ])
         captured = capsys.readouterr()
-        # with capsys.disabled():
-        #      print("Here")
-        #      print(captured.out)
-        #      print("to Here")
+        # Legacy route verification (plain text, no ANSI)
         assert "Sol/Haberlandt Survey -> Sol/Durrance Camp" in captured.out
         assert "  Sol/Haberlandt Survey: 5 x Reactive Armour," in captured.out
         assert "  Sol/Ehrlich City: 10 x Building Fabricators," in captured.out
-        assert "  Sol/Durrance Camp +10 925cr (728/ton)"
+        assert re.search(r"Sol/Durrance Camp \+10,?925cr \(728/ton\)", captured.out)