tradedangerous 12.0.2__tar.gz → 12.0.4__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 (101) hide show
  1. {tradedangerous-12.0.2/tradedangerous.egg-info → tradedangerous-12.0.4}/PKG-INFO +5 -3
  2. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/setup.py +8 -1
  3. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/cache.py +17 -3
  4. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/version.py +1 -1
  5. {tradedangerous-12.0.2 → tradedangerous-12.0.4/tradedangerous.egg-info}/PKG-INFO +5 -3
  6. tradedangerous-12.0.4/tradedangerous.egg-info/requires.txt +6 -0
  7. tradedangerous-12.0.2/tradedangerous.egg-info/requires.txt +0 -4
  8. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/LICENSE +0 -0
  9. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/README.md +0 -0
  10. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/pyproject.toml +0 -0
  11. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/setup.cfg +0 -0
  12. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_bootstrap_commands.py +0 -0
  13. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_bootstrap_plugins.py +0 -0
  14. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_cache.py +0 -0
  15. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_commands.py +0 -0
  16. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_fs.py +0 -0
  17. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_peek.py +0 -0
  18. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_tools.py +0 -0
  19. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_trade.py +0 -0
  20. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_trade_run.py +0 -0
  21. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tests/test_utils.py +0 -0
  22. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/trade.py +0 -0
  23. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/__init__.py +0 -0
  24. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/cli.py +0 -0
  25. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/TEMPLATE.py +0 -0
  26. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/__init__.py +0 -0
  27. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/buildcache_cmd.py +0 -0
  28. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/buy_cmd.py +0 -0
  29. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/commandenv.py +0 -0
  30. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/exceptions.py +0 -0
  31. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/export_cmd.py +0 -0
  32. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/import_cmd.py +0 -0
  33. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/local_cmd.py +0 -0
  34. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/market_cmd.py +0 -0
  35. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/nav_cmd.py +0 -0
  36. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/olddata_cmd.py +0 -0
  37. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/parsing.py +0 -0
  38. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/rares_cmd.py +0 -0
  39. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/run_cmd.py +0 -0
  40. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/sell_cmd.py +0 -0
  41. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/shipvendor_cmd.py +0 -0
  42. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/station_cmd.py +0 -0
  43. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/trade_cmd.py +0 -0
  44. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/commands/update_cmd.py +0 -0
  45. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/corrections.py +0 -0
  46. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/csvexport.py +0 -0
  47. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/__init__.py +0 -0
  48. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/adapter.py +0 -0
  49. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/config.py +0 -0
  50. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/engine.py +0 -0
  51. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/lifecycle.py +0 -0
  52. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/locks.py +0 -0
  53. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/orm_models.py +0 -0
  54. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/paths.py +0 -0
  55. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/db/utils.py +0 -0
  56. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/edscupdate.py +0 -0
  57. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/edsmupdate.py +0 -0
  58. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/formatting.py +0 -0
  59. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/fs.py +0 -0
  60. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/gui.py +0 -0
  61. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/mapping.py +0 -0
  62. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/mfd/__init__.py +0 -0
  63. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/mfd/saitek/__init__.py +0 -0
  64. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/mfd/saitek/directoutput.py +0 -0
  65. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/mfd/saitek/x52pro.py +0 -0
  66. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/checkpricebounds.py +0 -0
  67. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/clipboard.py +0 -0
  68. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/coord64.py +0 -0
  69. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/derp-sentinel.py +0 -0
  70. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/diff-system-csvs.py +0 -0
  71. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/eddb.py +0 -0
  72. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/eddn.py +0 -0
  73. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/edsc.py +0 -0
  74. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/edsm.py +0 -0
  75. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/importeddbstats.py +0 -0
  76. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/prices-json-exp.py +0 -0
  77. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/misc/progress.py +0 -0
  78. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/plugins/__init__.py +0 -0
  79. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/plugins/edcd_plug.py +0 -0
  80. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/plugins/eddblink_plug.py +0 -0
  81. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/plugins/edmc_batch_plug.py +0 -0
  82. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/plugins/spansh_plug.py +0 -0
  83. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/prices.py +0 -0
  84. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/submit-distances.py +0 -0
  85. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/templates/Added.csv +0 -0
  86. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/templates/Category.csv +0 -0
  87. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/templates/RareItem.csv +0 -0
  88. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/templates/TradeDangerous.sql +0 -0
  89. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/tools.py +0 -0
  90. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/tradecalc.py +0 -0
  91. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/tradedb.py +0 -0
  92. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/tradeenv.py +0 -0
  93. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/tradeexcept.py +0 -0
  94. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/transfers.py +0 -0
  95. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous/utils.py +0 -0
  96. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous.egg-info/SOURCES.txt +0 -0
  97. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous.egg-info/dependency_links.txt +0 -0
  98. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous.egg-info/entry_points.txt +0 -0
  99. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous.egg-info/not-zip-safe +0 -0
  100. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradedangerous.egg-info/top_level.txt +0 -0
  101. {tradedangerous-12.0.2 → tradedangerous-12.0.4}/tradegui.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tradedangerous
3
- Version: 12.0.2
3
+ Version: 12.0.4
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
@@ -22,8 +22,10 @@ Description-Content-Type: text/markdown
22
22
  License-File: LICENSE
23
23
  Requires-Dist: requests
24
24
  Requires-Dist: appJar
25
- Requires-Dist: ijson
26
- Requires-Dist: rich
25
+ Requires-Dist: ijson>=3.1
26
+ Requires-Dist: rich==13.7.1
27
+ Requires-Dist: importlib-metadata>=1
28
+ Requires-Dist: sqlalchemy<3.0,>=2.0
27
29
  Dynamic: author
28
30
  Dynamic: author-email
29
31
  Dynamic: classifier
@@ -29,7 +29,14 @@ exec(open("tradedangerous/version.py").read()) # pylint: disable=W0122
29
29
  setup(
30
30
  name=package,
31
31
  version=__version__, # pylint: disable=E0602
32
- install_requires=["requests", "appJar", "ijson", "rich"],
32
+ install_requires=[
33
+ "requests",
34
+ "appJar",
35
+ "ijson>=3.1",
36
+ "rich==13.7.1",
37
+ "importlib-metadata>=1",
38
+ "sqlalchemy>=2.0,<3.0",
39
+ ],
33
40
  setup_requires=["pytest-runner"],
34
41
  tests_require=["pytest"],
35
42
  packages=[
@@ -586,23 +586,30 @@ def processPrices(
586
586
  nonlocal newItems, updtItems, ignItems
587
587
  itemName, modified = matches.group('item', 'time')
588
588
  itemName = itemName.upper()
589
-
589
+
590
590
  # Look up the item ID.
591
591
  itemID = getItemID(itemName, -1)
592
592
  if itemID < 0:
593
593
  oldName = itemName
594
594
  itemName = corrections.correctItem(itemName)
595
- if itemName == DELETED:
595
+
596
+ # Silently skip DELETED items
597
+ if itemName == corrections.DELETED:
596
598
  DEBUG1("DELETED {}", oldName)
597
599
  return
600
+
601
+ # Retry with corrected name
598
602
  itemName = itemName.upper()
599
603
  itemID = getItemID(itemName, -1)
604
+
600
605
  if itemID < 0:
601
606
  ignoreOrWarn(
602
607
  UnknownItemError(priceFile, lineNo, itemName)
603
608
  )
604
609
  return
610
+
605
611
  DEBUG1("Renamed {} -> {}", oldName, itemName)
612
+
606
613
 
607
614
  lastModified = stationItemDates.get(itemID, None)
608
615
  if lastModified and merging:
@@ -976,12 +983,19 @@ def processImportFile(
976
983
  if deprecationFn:
977
984
  try:
978
985
  deprecationFn(importPath, lineNo, linein)
979
- except (DeprecatedKeyError, DeletedKeyError) as e:
986
+ except DeletedKeyError as e:
980
987
  if not tdenv.ignoreUnknown:
981
988
  raise e
982
989
  e.category = "WARNING"
983
990
  tdenv.NOTE("{}", e)
984
991
  continue
992
+ except DeprecatedKeyError as e:
993
+ if not tdenv.ignoreUnknown:
994
+ raise e
995
+ e.category = "WARNING"
996
+ tdenv.NOTE("{}", e)
997
+ # Do NOT skip — correction is available
998
+
985
999
 
986
1000
  # Build values aligned to activeColumns (skip the FK columns we excluded)
987
1001
  activeValues = [linein[i] for i in kept_indices]
@@ -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__ = '12.0.2'
15
+ __version__ = '12.0.4'
16
16
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: tradedangerous
3
- Version: 12.0.2
3
+ Version: 12.0.4
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
@@ -22,8 +22,10 @@ Description-Content-Type: text/markdown
22
22
  License-File: LICENSE
23
23
  Requires-Dist: requests
24
24
  Requires-Dist: appJar
25
- Requires-Dist: ijson
26
- Requires-Dist: rich
25
+ Requires-Dist: ijson>=3.1
26
+ Requires-Dist: rich==13.7.1
27
+ Requires-Dist: importlib-metadata>=1
28
+ Requires-Dist: sqlalchemy<3.0,>=2.0
27
29
  Dynamic: author
28
30
  Dynamic: author-email
29
31
  Dynamic: classifier
@@ -0,0 +1,6 @@
1
+ requests
2
+ appJar
3
+ ijson>=3.1
4
+ rich==13.7.1
5
+ importlib-metadata>=1
6
+ sqlalchemy<3.0,>=2.0
@@ -1,4 +0,0 @@
1
- requests
2
- appJar
3
- ijson
4
- rich
File without changes