tradedangerous 11.0.1__tar.gz → 11.0.3__tar.gz

{tradedangerous-11.0.1/tradedangerous.egg-info → tradedangerous-11.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.1
+Version: 11.0.3
 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

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/commands/parsing.py

@@ -60,7 +60,7 @@ class PadSizeArgument(int):
             'dest': 'padSize',
             'metavar': 'PADSIZES',
             'type': 'padsize',
-            'choices': 'SML?',
+            'choices': 'SsMmLl?',
         }
 
 
@@ -153,7 +153,7 @@ class PlanetaryArgument(int):
             'dest': 'planetary',
             'metavar': 'PLANETARY',
             'type': 'planetary',
-            'choices': 'YN??',
+            'choices': 'YyNn?',
         }
 
 
@@ -181,7 +181,7 @@ class FleetCarrierArgument(int):
             'dest': 'fleet',
             'metavar': 'FLEET',
             'type': 'fleet',
-            'choices': 'YN?',
+            'choices': 'YyNn?',
         }
 
 class OdysseyArgument(int):
@@ -208,7 +208,7 @@ class OdysseyArgument(int):
             'dest': 'odyssey',
             'metavar': 'ODYSSEY',
             'type': 'odyssey',
-            'choices': 'YN?',
+            'choices': 'YyNn?',
         }
 
 

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/misc/edsc.py

@@ -4,19 +4,7 @@ from collections import namedtuple
 from urllib.request import Request, urlopen
 
 import json
-
-try:
-    import requests
-except ImportError as e:
-    import pip
-    print("ERROR: Unable to load the Python 'requests' package.")
-    approval = input(
-        "Do you want me to try and install it with the package manager (y/n)? "
-    )
-    if approval.lower() != 'y':
-        raise e
-    pip.main(["install", "--upgrade", "requests"])
-    import requests
+import requests
 
 
 def edsc_log(apiCall, params, jsonData=None, error=None):

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/misc/edsm.py

@@ -6,19 +6,7 @@ uses EDSM - https://www.edsm.net/api
 """
 
 import json
-
-try:
-    import requests
-except ImportError as e:
-    import pip
-    print("ERROR: Unable to load the Python 'requests' package.")
-    approval = input(
-        "Do you want me to try and install it with the package manager (y/n)? "
-    )
-    if approval.lower() != 'y':
-        raise e
-    pip.main(["install", "--upgrade", "requests"])
-    import requests
+import requests
 
 
 def edsm_log(apiCall, url, params, jsonData=None, error=None):

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/plugins/eddblink_plug.py

@@ -355,7 +355,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         
         # We can probably safely assume that the plugin has never been run if
         # the prices file doesn't exist, since the plugin always generates it.
-        if not (self.tdb.dataPath / Path("TradeDangerous.prices")).exists():
+        if not (self.tdb.dataPath / Path("TradeDangerous.db")).exists():
             self.options["clean"] = True
         
         if self.getOption("clean"):

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/plugins/spansh_plug.py

@@ -208,7 +208,7 @@ class ImportPlugin(plugins.ImportPluginBase):
         assert not (self.url and self.file), 'Provide either url or file, not both'
         if self.file and (self.file != '-'):
             self.file = (Path(self.tdenv.cwDir, self.file)).resolve()
-        if not Path(self.tdb.dataPath, "TradeDangerous.prices").exists():
+        if not Path(self.tdb.dataPath, "TradeDangerous.db").exists():
             ri_path = Path(self.tdb.dataPath, "RareItem.csv")
             rib_path = ri_path.with_suffix(".tmp")
             if ri_path.exists():

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/submit-distances.py

@@ -16,6 +16,7 @@ import argparse
 import os
 import random
 import re
+import requests
 import sys
 import tradedb
 import tradeenv
@@ -23,30 +24,6 @@ import tradeenv
 from misc.edsc import StarSubmission, StarSubmissionResult, SubmissionError
 from misc.clipboard import SystemNameClip
 
-try:
-    import requests
-except ImportError as e:
-    print("""ERROR: Unable to load the Python 'requests' package.
-
-This script uses a Python module/package called 'requests' to allow
-it to talk to the EDSC web service. This package is not installed
-by default, but it can be installed with Python's package manager (pip).
-
-You can either install/update it yourself, e.g.:
-  
-  pip install --upgrade requests
-
-or if you like, I can try and install it for you now
-""")
-    approval = input(
-        "Do you want me to try and install it with the package manager (y/n)? "
-    )
-    if approval.lower() != 'y':
-        print("You didn't type 'y' so I'm giving up.")
-        raise e
-    import pip
-    pip.main(["install", "--upgrade", "requests"])
-    import requests  # noqa: F401
 
 standardStars = [
     "SOL",

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/transfers.py

@@ -1,82 +1,15 @@
+import csv
+import json
+import time
+
 from collections import deque
 from pathlib import Path
 from .tradeexcept import TradeException
-
-import csv
-import json
 from .misc import progress as pbar
-import platform  # noqa: F401
 from . import fs
-import time
-import subprocess
-import sys
 
-try:
-    import requests
-    __requests = requests
-except ImportError:
-    __requests = None
+import requests
 
-def import_requests():
-    global __requests
-    if __requests:
-        return __requests
-    
-    if platform.system() == 'Linux':
-        extra = (
-            "Ubuntu users: You may be able to install 'pip'\n"
-            "with 'apt-get install python3-pip' and requests with\n"
-            "'pip3 install --upgrade requests'.\n"
-        )
-    elif platform.system() == 'Windows':
-        extra = (
-            "\n\nThe requests package can be installed with\n"
-            "'pip3 install --upgrade requests'.\n\n"
-            "If requests is installed, you may have bits\n"
-            "of 32-bit and 64-bit Python installed.\n"
-            "Consider using control panel to uninstall Python,\n"
-            "delete the Python folder (usually C:\\Python34\\),\n"
-            "and then re-install Python.\n"
-        )
-    else:
-        extra = ""
-    
-    print(
-        "ERROR: Unable to load the Python 'requests' package.\n" + extra
-    )
-    approval = input(
-        "I can try and install the package automatically using 'pip'.\n"
-        "Try to install 'requests' now (y/n)? "
-    )
-    # Idiot-proofing: take just the first character in case the user typed
-    # 'YES' (upper or lower case) instead of 'Y'.
-    if approval[0:1].lower() != 'y':
-        raise TradeException("Missing package: 'requests'")
-    
-    try:
-        import pip  # noqa: F401  # pylint: disable=unused-import
-    except ImportError as e:
-        raise TradeException(
-            "Python 3.4.2 includes a package manager called 'pip', "
-            "except it doesn't appear to be installed on your system:\n"
-            "{}{}".format(str(e), extra)
-        ) from None
-    
-    # Let's use "The most reliable approach, and the one that is fully supported."
-    # Especially since the old way produces an error for me on Python 3.6:
-    # "AttributeError: 'module' object has no attribute 'main'"
-    #  pip.main(["install", "--upgrade", "requests"])
-    subprocess.check_call([sys.executable, '-m', 'pip', 'install', '--upgrade', 'requests'])
-    
-    try:
-        import requests  # pylint: disable=redefined-outer-name
-        __requests = requests
-    except ImportError as e:
-        raise TradeException(
-            f"The requests module did not install correctly ({e}).{extra}"
-        ) from None
-    
-    return __requests
 
 ######################################################################
 # Helpers
@@ -125,7 +58,6 @@ def download(
         function to call on the first line
     """
     
-    requests = import_requests()  # pylint: disable=redefined-outer-name
     tdenv.NOTE("Requesting {}".format(url))
     req = requests.get(url, headers=headers or None, stream=True, timeout=timeout)
     req.raise_for_status()
@@ -238,7 +170,6 @@ def get_json_data(url, *, timeout: int = 90):
     Displays a progress bar as it downloads.
     """
     
-    requests = import_requests()  # pylint: disable=redefined-outer-name
     req = requests.get(url, stream=True, timeout=timeout)
     
     totalLength = req.headers.get('content-length')
@@ -279,7 +210,6 @@ class CSVStream:
         self.url = url
         self.tdenv = tdenv
         if not url.startswith("file:///"):
-            requests = import_requests()  # pylint: disable=redefined-outer-name
             self.req = requests.get(self.url, stream=True, timeout=timeout)
             self.lines = self.req.iter_lines()
         else:

{tradedangerous-11.0.1 → tradedangerous-11.0.3}/tradedangerous/version.py

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

{tradedangerous-11.0.1 → tradedangerous-11.0.3/tradedangerous.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tradedangerous
-Version: 11.0.1
+Version: 11.0.3
 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