tradedangerous 12.0.2__py3-none-any.whl → 12.0.4__py3-none-any.whl

tradedangerous/cache.py

@@ -586,23 +586,30 @@ def processPrices(
         nonlocal newItems, updtItems, ignItems
         itemName, modified = matches.group('item', 'time')
         itemName = itemName.upper()
-        
+
         # Look up the item ID.
         itemID = getItemID(itemName, -1)
         if itemID < 0:
             oldName = itemName
             itemName = corrections.correctItem(itemName)
-            if itemName == DELETED:
+
+            # Silently skip DELETED items
+            if itemName == corrections.DELETED:
                 DEBUG1("DELETED {}", oldName)
                 return
+
+            # Retry with corrected name
             itemName = itemName.upper()
             itemID = getItemID(itemName, -1)
+
             if itemID < 0:
                 ignoreOrWarn(
                     UnknownItemError(priceFile, lineNo, itemName)
                 )
                 return
+
             DEBUG1("Renamed {} -> {}", oldName, itemName)
+
         
         lastModified = stationItemDates.get(itemID, None)
         if lastModified and merging:
@@ -976,12 +983,19 @@ def processImportFile(
             if deprecationFn:
                 try:
                     deprecationFn(importPath, lineNo, linein)
-                except (DeprecatedKeyError, DeletedKeyError) as e:
+                except DeletedKeyError as e:
                     if not tdenv.ignoreUnknown:
                         raise e
                     e.category = "WARNING"
                     tdenv.NOTE("{}", e)
                     continue
+                except DeprecatedKeyError as e:
+                    if not tdenv.ignoreUnknown:
+                        raise e
+                    e.category = "WARNING"
+                    tdenv.NOTE("{}", e)
+                    # Do NOT skip — correction is available
+
 
             # Build values aligned to activeColumns (skip the FK columns we excluded)
             activeValues = [linein[i] for i in kept_indices]

tradedangerous/version.py

@@ -12,5 +12,5 @@
 """just keeper of current version"""
 
 # TODO: remember to update tests when version changes
-__version__ = '12.0.2'
+__version__ = '12.0.4'
 

{tradedangerous-12.0.2.dist-info → tradedangerous-12.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tradedangerous
-Version: 12.0.2
+Version: 12.0.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.
 Home-page: https://github.com/eyeonus/Trade-Dangerous
 Author: eyeonus
@@ -22,8 +22,10 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
 Requires-Dist: appJar
-Requires-Dist: ijson
-Requires-Dist: rich
+Requires-Dist: ijson>=3.1
+Requires-Dist: rich==13.7.1
+Requires-Dist: importlib-metadata>=1
+Requires-Dist: sqlalchemy<3.0,>=2.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{tradedangerous-12.0.2.dist-info → tradedangerous-12.0.4.dist-info}/RECORD

@@ -1,7 +1,7 @@
 trade.py,sha256=Skqy0bC47g1KujuYrVwa3T8AfJ9NoLLOZcVjjxJ2daQ,1769
 tradegui.py,sha256=q2HdIdoyeLUpeF2X0hVIGn7sU6T4zOzq1HN0zGvZdyE,788
 tradedangerous/__init__.py,sha256=bwsbE_GyCNsuyGDKnfXAg0RD-ewsWHliySJ5QfCK7h8,1166
-tradedangerous/cache.py,sha256=fhnEzE2g4999sMI6JowTKYZj1epgsUdLZFjLBKKgsKQ,43829
+tradedangerous/cache.py,sha256=iLtrnxvP_0Bjk0pBOSi3uc54dDkvFEggG5N7fCyqUpc,44172
 tradedangerous/cli.py,sha256=aTZf6N7BD_G99r43n58xDSYH4gmvz0CBRU6vAgS3__4,4561
 tradedangerous/corrections.py,sha256=_WLgo1IBWoskrrPFeshRwCOeJ2BeJb_x4tDQ0JdAo-s,1340
 tradedangerous/csvexport.py,sha256=bwDcFKYPe-qdEG0HJONJ5Ij8PTphAD1mBOi_kK4nXSo,7970
@@ -20,7 +20,7 @@ tradedangerous/tradeenv.py,sha256=JA0yMStJ_zfLGHT2yxuY0s1cBvQz1ztL1zTYJslMZJk,12
 tradedangerous/tradeexcept.py,sha256=aZ-Y31MbkjF7lmAzBAbaMsPPE7FEEfuf4gaX2GvriDk,368
 tradedangerous/transfers.py,sha256=t_0Sjr4FI9lhIPwyPOXdR8d97bE611ujbKK4ioWShm0,6024
 tradedangerous/utils.py,sha256=PUPvAEqUyxYGqqQa0b_yfLAvq8YVUxK6HfdS-CxM-Lo,5186
-tradedangerous/version.py,sha256=gpJrI9RqdPX6fJtGRmHEjgBQF6D2dTz7VBGzWAJajiw,646
+tradedangerous/version.py,sha256=Xa6SxmkR76UsQCNJCwptugouGROmNqEHSHBPCM5KhrY,646
 tradedangerous/commands/TEMPLATE.py,sha256=seMXDN_Nf_Rvj_5BivI-0yhVT6W9iRDihr5yo8kr5qw,2069
 tradedangerous/commands/__init__.py,sha256=UvcWgcr_PVScbJ6R83iaUb2_4Ttmft85HYexTFo7FwU,9171
 tradedangerous/commands/buildcache_cmd.py,sha256=6CkmoDYthECkMcu5I3Ljyis42yy-bnUcllAlSF-Xwi8,3318
@@ -75,9 +75,9 @@ tradedangerous/templates/Added.csv,sha256=8o54civQCcS9y7_DBo0GX196XWRbbREQqKDYTK
 tradedangerous/templates/Category.csv,sha256=8xwUDcBZE25T6x6dZGlRUMTCqeDLt3a9LXU5h6hRHV8,250
 tradedangerous/templates/RareItem.csv,sha256=F1RhRnTD82PiwrVUO-ai2ErGH2PTqNnQaDw5mcgljXs,10483
 tradedangerous/templates/TradeDangerous.sql,sha256=pCw2Js8GQniqAWC6N3SL-ujyqlLYCeR2-SI-qhk6VsI,9336
-tradedangerous-12.0.2.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-tradedangerous-12.0.2.dist-info/METADATA,sha256=ErwIIUz3gcGomJRuCso4oWTMeKHqc2BTeV-uszwM5nU,4787
-tradedangerous-12.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tradedangerous-12.0.2.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
-tradedangerous-12.0.2.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
-tradedangerous-12.0.2.dist-info/RECORD,,
+tradedangerous-12.0.4.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+tradedangerous-12.0.4.dist-info/METADATA,sha256=vfdslCCJmrnlKKWXbfzZOZa9Zq4yjCXdiPxaSe1fBzA,4873
+tradedangerous-12.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tradedangerous-12.0.4.dist-info/entry_points.txt,sha256=lrA7U9JHOcNuam2WEK4Hmc3vQ3mrJfsbJCE74qd9au8,62
+tradedangerous-12.0.4.dist-info/top_level.txt,sha256=JEoOVAhg5GfXZ4kHpNontu0RVzek_7P9_jp93f3Pqn8,16
+tradedangerous-12.0.4.dist-info/RECORD,,