tradedangerous 10.16.2__tar.gz → 10.16.3__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of tradedangerous might be problematic. Click here for more details.

Files changed (96) hide show
  1. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/PKG-INFO +1 -1
  2. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/eddblink_plug.py +7 -0
  3. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/spansh_plug.py +2 -0
  4. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/version.py +1 -1
  5. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/PKG-INFO +1 -1
  6. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/LICENSE +0 -0
  7. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/README.md +0 -0
  8. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/pyproject.toml +0 -0
  9. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/setup.cfg +0 -0
  10. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/setup.py +0 -0
  11. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_bootstrap_commands.py +0 -0
  12. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_bootstrap_plugins.py +0 -0
  13. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_cache.py +0 -0
  14. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_commands.py +0 -0
  15. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_fs.py +0 -0
  16. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_peek.py +0 -0
  17. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_tools.py +0 -0
  18. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_trade.py +0 -0
  19. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_trade_run.py +0 -0
  20. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tests/test_utils.py +0 -0
  21. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/__init__.py +0 -0
  22. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/cache.py +0 -0
  23. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/cli.py +0 -0
  24. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/TEMPLATE.py +0 -0
  25. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/__init__.py +0 -0
  26. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/buildcache_cmd.py +0 -0
  27. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/buy_cmd.py +0 -0
  28. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/commandenv.py +0 -0
  29. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/exceptions.py +0 -0
  30. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/export_cmd.py +0 -0
  31. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/import_cmd.py +0 -0
  32. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/local_cmd.py +0 -0
  33. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/market_cmd.py +0 -0
  34. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/nav_cmd.py +0 -0
  35. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/olddata_cmd.py +0 -0
  36. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/parsing.py +0 -0
  37. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/rares_cmd.py +0 -0
  38. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/run_cmd.py +0 -0
  39. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/sell_cmd.py +0 -0
  40. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/shipvendor_cmd.py +0 -0
  41. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/station_cmd.py +0 -0
  42. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/trade_cmd.py +0 -0
  43. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/update_cmd.py +0 -0
  44. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/commands/update_gui.py +0 -0
  45. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/corrections.py +0 -0
  46. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/csvexport.py +0 -0
  47. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/edscupdate.py +0 -0
  48. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/edsmupdate.py +0 -0
  49. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/formatting.py +0 -0
  50. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/fs.py +0 -0
  51. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/gui.py +0 -0
  52. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/jsonprices.py +0 -0
  53. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/mapping.py +0 -0
  54. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/mfd/__init__.py +0 -0
  55. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/mfd/saitek/__init__.py +0 -0
  56. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/mfd/saitek/directoutput.py +0 -0
  57. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/mfd/saitek/x52pro.py +0 -0
  58. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/checkpricebounds.py +0 -0
  59. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/clipboard.py +0 -0
  60. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/coord64.py +0 -0
  61. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/derp-sentinel.py +0 -0
  62. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/diff-system-csvs.py +0 -0
  63. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/eddb.py +0 -0
  64. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/eddn.py +0 -0
  65. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/edsc.py +0 -0
  66. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/edsm.py +0 -0
  67. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/importeddbstats.py +0 -0
  68. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/prices-json-exp.py +0 -0
  69. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/misc/progress.py +0 -0
  70. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/__init__.py +0 -0
  71. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/edapi_plug.py +0 -0
  72. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/edcd_plug.py +0 -0
  73. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/edmc_batch_plug.py +0 -0
  74. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/journal_plug.py +0 -0
  75. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/plugins/netlog_plug.py +0 -0
  76. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/prices.py +0 -0
  77. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/submit-distances.py +0 -0
  78. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/templates/Added.csv +0 -0
  79. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/templates/Category.csv +0 -0
  80. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/templates/RareItem.csv +0 -0
  81. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/templates/TradeDangerous.sql +0 -0
  82. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tools.py +0 -0
  83. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/trade.py +0 -0
  84. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tradecalc.py +0 -0
  85. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tradedb.py +0 -0
  86. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tradeenv.py +0 -0
  87. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tradeexcept.py +0 -0
  88. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/tradegui.py +0 -0
  89. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/transfers.py +0 -0
  90. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous/utils.py +0 -0
  91. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/SOURCES.txt +0 -0
  92. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/dependency_links.txt +0 -0
  93. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/entry_points.txt +0 -0
  94. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/not-zip-safe +0 -0
  95. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/requires.txt +0 -0
  96. {tradedangerous-10.16.2 → tradedangerous-10.16.3}/tradedangerous.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tradedangerous
3
- Version: 10.16.2
3
+ Version: 10.16.3
4
4
  Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
5
5
  Home-page: https://github.com/eyeonus/Trade-Dangerous
6
6
  Author: eyeonus
@@ -72,10 +72,12 @@ class ImportPlugin(plugins.ImportPluginBase):
72
72
  self.commoditiesPath = Path("Item.csv")
73
73
  self.rareItemPath = Path("RareItem.csv")
74
74
  self.shipPath = Path("Ship.csv")
75
+ self.FDevShipyardPath = Path("FDevShipyard.csv")
75
76
  self.shipVendorPath = Path("ShipVendor.csv")
76
77
  self.stationsPath = Path("Station.csv")
77
78
  self.sysPath = Path("System.csv")
78
79
  self.upgradesPath = Path("Upgrade.csv")
80
+ self.FDevOutfittingPath = Path("FDevOutfitting.csv")
79
81
  self.upgradeVendorPath = Path("UpgradeVendor.csv")
80
82
  self.listingsPath = Path("listings.csv")
81
83
  self.liveListingsPath = Path("listings-live.csv")
@@ -366,12 +368,15 @@ class ImportPlugin(plugins.ImportPluginBase):
366
368
  for name in [
367
369
  "Category",
368
370
  "Item",
371
+ "RareItem",
369
372
  "Ship",
370
373
  "ShipVendor",
371
374
  "Station",
372
375
  "System",
373
376
  "Upgrade",
374
377
  "UpgradeVendor",
378
+ "FDevShipyard",
379
+ "FDevOutfitting",
375
380
  ]:
376
381
  file = self.tdb.dataPath / Path(name + ".csv")
377
382
  try:
@@ -471,10 +476,12 @@ class ImportPlugin(plugins.ImportPluginBase):
471
476
 
472
477
  if self.getOption("upgrade"):
473
478
  if self.downloadFile(self.upgradesPath) or self.getOption("force"):
479
+ self.downloadFile(self.FDevOutfittingPath)
474
480
  buildCache = True
475
481
 
476
482
  if self.getOption("ship"):
477
483
  if self.downloadFile(self.shipsPath) or self.getOption("force"):
484
+ self.downloadFile(self.FDevShipyardPath)
478
485
  buildCache = True
479
486
 
480
487
  if self.getOption("rare"):
@@ -268,6 +268,8 @@ class ImportPlugin(plugins.ImportPluginBase):
268
268
  try:
269
269
  return cursor.execute(query, params or kwparams)
270
270
  except sqlite3.OperationalError as ex:
271
+ if "no transaction is active" in str(ex):
272
+ return
271
273
  if not attempts:
272
274
  raise
273
275
  attempts -= 1
@@ -12,5 +12,5 @@
12
12
  """just keeper of current version"""
13
13
 
14
14
  # TODO: remember to update tests when version changes
15
- __version__ = '10.16.2'
15
+ __version__ = '10.16.3'
16
16
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tradedangerous
3
- Version: 10.16.2
3
+ Version: 10.16.3
4
4
  Summary: Trade-Dangerous is a set of powerful trading tools for Elite Dangerous, organized around one of the most powerful trade run optimizers available.
5
5
  Home-page: https://github.com/eyeonus/Trade-Dangerous
6
6
  Author: eyeonus