tradedangerous 10.17.0__tar.gz → 11.0.0__tar.gz

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 10.17.0
+Version: 11.0.0
 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
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: appJar
-Requires-Dist: pysimdjson
+Requires-Dist: ijson
 Requires-Dist: rich
 
 

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/setup.py

@@ -27,7 +27,7 @@ exec(open("tradedangerous/version.py").read())  # pylint: disable=W0122
 
 setup(name = package,
         version = __version__,  # pylint: disable=E0602
-        install_requires = ["requests", "appJar", "pysimdjson", "rich"],
+        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-10.17.0 → tradedangerous-11.0.0}/tests/test_bootstrap_commands.py

@@ -8,7 +8,6 @@ class TestBootstrapCommands(unittest.TestCase):
         self.assertIn('buildcache', commands.commandIndex)
         self.assertIn('buy', commands.commandIndex)
 
-
     def test_import_buildcache_cmd(self):
         from tradedangerous.commands import buildcache_cmd
     
@@ -47,7 +46,6 @@ class TestBootstrapCommands(unittest.TestCase):
     
     def test_import_update_cmd(self):
         from tradedangerous.commands import update_cmd
-        
+    
     def test_import_update_gui(self):
         from tradedangerous.commands import update_gui
-

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_bootstrap_plugins.py

@@ -1,6 +1,6 @@
 import pytest
 
-class TestBootstrapPlugins(object):
+class TestBootstrapPlugins:
     def test_import_traded(self):
         import tradedangerous as td
     

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_cache.py

@@ -5,7 +5,7 @@ from tradedangerous import cache
 
 FakeFile = namedtuple('FakeFile', ['name'])
 
-class TestCache(object):
+class TestCache:
     def test_parseSupply(self):
         fil = FakeFile('faked-file.prices')
         reading = '897H'

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_commands.py

@@ -1,8 +1,6 @@
 #! /usr/bin/env python
 # pytest
 
-from __future__ import absolute_import, with_statement, print_function, division, unicode_literals
-import sys
 import pytest
 from tradedangerous import commands
 from tradedangerous.commands.exceptions import UsageError, CommandLineError
@@ -11,9 +9,11 @@ from tradedangerous.commands.exceptions import UsageError, CommandLineError
 def cmd():
     return commands.CommandIndex()
 
+
 prog = "trade.py"
 
-class TestCommands(object):
+
+class TestCommands:
     
     def test_dashh(self, cmd):
         with pytest.raises(UsageError):
@@ -39,4 +39,4 @@ class TestCommands(object):
         cmd.parse([prog, 'local', 'ibootis'])
     
     def test_local_validsys_dashv(self, cmd):
-        cmd.parse([prog, 'local', 'ibootis', '-v'])
+        cmd.parse([prog, 'local', 'ibootis', '-v'])

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_fs.py

@@ -17,7 +17,7 @@ def tdenv():
     return TradeEnv()
 
 
-class TestFS(object):
+class TestFS:
     
     def test_copy(self, tdenv):
         src = fs.pathify(tdenv.templateDir, 'TradeDangerous.sql')
@@ -35,7 +35,8 @@ class TestFS(object):
             self.result = True
         
         flag = fs.ensureflag(flagfile, action)
-        assert self.result == True
+        assert self.result is True
+        assert flag is not None
     
     def test_copyallfiles(self, tdenv):
         setup_module()

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_peek.py

@@ -1,18 +1,17 @@
-import os
 import random
 
 import pytest
 
-from tradedangerous.tradedb import Trade, TradeDB, Station, System
+from tradedangerous.tradedb import TradeDB, Station, System
 from .helpers import copy_fixtures
 
-ORIGIN='Shinrarta Dezhra'
-#tdb = None
+ORIGIN = 'Shinrarta Dezhra'
+# tdb = None
 
 def setup_module():
     copy_fixtures()
 
-def route_to_closest(tdb:TradeDB, origin, destinations, maxLy=15):
+def route_to_closest(tdb: TradeDB, origin, destinations, maxLy=15):
     closest = min(destinations, key=lambda candidate: candidate.distanceTo(origin))
     print("Closest:", closest.name(), closest.distanceTo(origin))
     route = tdb.getRoute(origin, closest, maxLy)
@@ -23,16 +22,16 @@ def route_to_closest(tdb:TradeDB, origin, destinations, maxLy=15):
     return route
 
 def should_skip() -> bool:
-    return False # os.getenv("CI") != None
+    return False  # os.getenv("CI") != None
 
 
-class TestPeek(object):
+class TestPeek:
     """
     Tests based on https://github.com/eyeonus/Trade-Dangerous/wiki/Python-Quick-Peek
     """
-
+    
     @pytest.mark.skipif(should_skip(), reason="does not work with CI")
-    def test_quick_origin(self, tdb:TradeDB):
+    def test_quick_origin(self, tdb: TradeDB):
         # Look up a particular system
         origin = tdb.lookupSystem(ORIGIN)
         
@@ -70,7 +69,7 @@ class TestPeek(object):
         
         abe = tdb.lookupPlace("sol/hamlinc")
         assert isinstance(abe, Station)
-
+    
     @pytest.mark.skipif(should_skip(), reason="does not work with CI")
     def test_quick_five(self, tdb):
         systemTable = tdb.systemByID.values()
@@ -89,7 +88,7 @@ class TestPeek(object):
         else:
             # Route is a list of Systems. Turn it into a list of
             # System names...
-            routeNames = [ system.name() for system, distance in route ]
+            routeNames = [system.name() for system, distance in route]
             print("Route:", routeNames)
         
         route_to_closest(tdb, origin, visitMe)
@@ -106,5 +105,5 @@ class TestPeek(object):
         lhs = tdb.lookupSystem("lhs 380")
         bhr = tdb.lookupSystem("bhritzameno")
         
-        result = route_to_closest(tdb, sol, [ lhs, bhr ])
- 
+        route_to_closest(tdb, sol, [lhs, bhr])
+ 

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_tools.py

@@ -1,4 +1,4 @@
-import pytest
+import pytest       # noqa: F401
 
 from tradedangerous import tools
 from .helpers import copy_fixtures
@@ -8,6 +8,6 @@ def setup_module():
     copy_fixtures()
 
 
-class TestTools(object):
+class TestTools:
     def test_derp(self, capsys):
         tools.test_derp()

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_trade.py

@@ -15,39 +15,39 @@ def teardown_module():
     remove_fixtures()
 
 
-class TestTrade(object):
+class TestTrade:
     def test_local_help(self):
         with pytest.raises(UsageError):
             trade([PROG, "local", "-h"])
-
+    
     def test_local_sol(self, capsys):
         trade([PROG, "local", "--ly=10", "--detail", "sol"])
         captured = capsys.readouterr()
         assert "Sol       0" in captured.out
         assert "Ehrlich City" in captured.out
-
+    
     def test_sell(self, capsys):
         trade([PROG, "sell", "--near=sol", "hydrogen fuel"])
         captured = capsys.readouterr()
         assert "Sol/Mars High" in captured.out
-
+    
     def test_buy(self, capsys):
         trade([PROG, "buy", "--near=sol", "hydrogen fuel"])
         captured = capsys.readouterr()
         assert "Cost      Units DistLy Age/days" in captured.out
-
+    
     def test_export_station(self, capsys):
         trade([PROG, "export", "-T", "System"])
         captured = capsys.readouterr()
         assert "NOTE: Export Table 'System'" in captured.out
         # TODO: check that System.csv has a fresh date
-
+    
     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)
-
+    
     def test_station_add(self, capsys):
         # "Dekker's Yard"
         trade([
@@ -63,20 +63,20 @@ class TestTrade(object):
             "sol/Dangerous Delight"])
         captured = capsys.readouterr()
         assert regex_findin(r"NOTE: Sol/Dangerous Delight \(#\d+\) added", captured.out)
-
+    
     def test_nav(self, capsys):
         trade([PROG, "nav", "--ly-per=50", "sol", "Shinrarta Dezhra"])
         captured = capsys.readouterr()
         assert "System            JumpLy" in captured.out
         assert "Shinrarta Dezhra   47" in captured.out
-
+    
     def test_market(self, capsys):
         trade([PROG, "market", "sol/abr"])
         captured = capsys.readouterr()
         assert regex_findin("Item[ ]{3,}Buying Selling[ ]{2,}Supply", captured.out)
         assert "Hydrogen Fuel" in captured.out
         assert regex_findin("Water[ ]{3,}323", captured.out)
-
+    
     @pytest.mark.slow
     def test_import_edcd(self, capsys):
         trade([PROG, "import", "-P=edcd", "--opt=commodity"])

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_trade_run.py

@@ -13,7 +13,7 @@ def setup_module():
     copy_fixtures()
 
 
-class TestTradeRun(object):
+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"])
         captured = capsys.readouterr()

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tests/test_utils.py

@@ -1,10 +1,10 @@
-import pytest
+import pytest   # noqa: F401
 
 from tradedangerous import utils
 from tradedangerous import TradeEnv
 
 
-class TestUtils(object):
+class TestUtils:    # should inherit from TestCase
     # TODO: Test 'von' etc.
     
     def test_titleFixup_s(self):

{tradedangerous-10.17.0 → tradedangerous-11.0.0}/tradedangerous/__init__.py

@@ -10,14 +10,14 @@
 # --------------------------------------------------------------------
 
 """
-TradeDangerous is set of powerful trading tools for Elite Dangerous,
+TradeDangerous is a set of powerful trading tools for Elite Dangerous,
 organized around one of the most powerful trade run optimizers available.
 
 The TRO is a heavy hitter that can calculate complex routes with multiple stops
 while taking into account the profits you make along the route
-The price data in TradeDangerous is either manually entered or crowd sourced
+The price data in TradeDangerous is either manually entered or crowd-sourced
 from a website such as [Tromador's Trading Dangerously](http://elite.ripz.org "Tromador's Trading Dangerously"), often using a plugin such as the included eddblink.
 """
-from .version import *
+from .version import *          # noqa: F401, F403
 
-from .tradeenv import TradeEnv
+from .tradeenv import TradeEnv  # noqa: F401