Merge pull request #43 from UMDBPP/develop

update function usage

Author: zacharyburnett

packetraven/connections.py

@@ -12,7 +12,7 @@
 from serial import Serial
 from shapely.geometry import Point
 from tablecrow import PostGresTable
-from tablecrow.table import split_URL_port
+from tablecrow.utilities import split_hostname_port
 
 from .base import (
     APRSPacketSink,
@@ -260,7 +260,7 @@ def __init__(self, hostname: str, database: str, table: str, **kwargs):
             kwargs['primary_key'] = 'time'
         kwargs['fields'] = {**self.__default_fields, **kwargs['fields']}
         PostGresTable.__init__(
-            self, hostname=hostname, database=database, name=table, **kwargs
+            self, hostname=hostname, database=database, table_name=table, **kwargs
         )
         PacketSource.__init__(
             self, f'postgresql://{self.hostname}:{self.port}/{self.database}/{self.name}'
@@ -475,7 +475,7 @@ def __packet_record(packet: LocationPacket) -> {str: Any}:
 class APRSis(APRSPacketSink, APRSPacketSource, NetworkConnection):
     def __init__(self, callsigns: [str] = None, hostname: str = None):
         if hostname is not None:
-            self.__hostname, self.__port = split_URL_port(hostname)
+            self.__hostname, self.__port = split_hostname_port(hostname)
         else:
             self.__hostname, self.__port = ('rotate.aprs.net', 10152)
 

setup.py

@@ -1,31 +1,70 @@
 #!/usr/bin/env python
+import importlib
+import logging
+import os
+from pathlib import Path
+import subprocess
+import sys
+
 from setuptools import config, find_packages, setup
 
-try:
-    from dunamai import Version
-except ImportError:
-    import sys
-    import subprocess
+BUILT_PACKAGES = {'numpy': [], 'pyproj': [], 'shapely': []}
+is_conda = (Path(sys.prefix) / 'conda-meta').exists()
 
-    subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'dunamai'])
-    from dunamai import Version
+if is_conda:
+    conda_packages = []
+    for conda_package in BUILT_PACKAGES:
+        try:
+            importlib.import_module(conda_package)
+        except:
+            conda_packages.append(conda_package)
+    if len(conda_packages) > 0:
+        subprocess.check_call(['conda', 'install', '-y', *conda_packages])
 
-try:
-    import pyproj
-except ImportError:
-    import platform
+if os.name == 'nt':
+    for required_package, pipwin_dependencies in BUILT_PACKAGES.items():
+        try:
+            importlib.import_module(required_package)
+        except:
+            try:
+                import pipwin
+            except:
+                subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pipwin'])
+
+            failed_pipwin_packages = []
+            for pipwin_package in pipwin_dependencies + [required_package]:
+                try:
+                    subprocess.check_call([sys.executable, '-m', 'pipwin', 'install', pipwin_package.lower()])
+                except subprocess.CalledProcessError:
+                    failed_pipwin_packages.append(pipwin_package)
 
-    if platform.system() == 'Windows':
+            if len(failed_pipwin_packages) > 0:
+                raise RuntimeError(
+                    f'failed to download or install non-conda Windows build(s) of {" and ".join(failed_pipwin_packages)}; you can either\n'
+                    '1) install within an Anaconda environment, or\n'
+                    f'2) `pip install <file>.whl`, with `<file>.whl` downloaded from {" and ".join("https://www.lfd.uci.edu/~gohlke/pythonlibs/#" + value.lower() for value in failed_pipwin_packages)} for your Python version'
+                )
+
+try:
+    try:
+        from dunamai import Version
+    except ImportError:
         import subprocess
+        import sys
+
+        subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'dunamai'])
+        from dunamai import Version
 
-        subprocess.check_call([sys.executable, '-m', 'pip', 'install', 'pipwin'])
-        subprocess.check_call([sys.executable, '-m', 'pipwin', 'install', 'pyproj'])
+    version = Version.from_any_vcs().serialize()
+except RuntimeError as error:
+    logging.exception(error)
+    version = '0.0.0'
 
 metadata = config.read_configuration('setup.cfg')['metadata']
 
 setup(
     name=metadata['name'],
-    version=Version.from_any_vcs().serialize(),
+    version=version,
     author=metadata['author'],
     author_email=metadata['author_email'],
     description=metadata['description'],
@@ -48,7 +87,7 @@
         'requests',
         'shapely',
         'sshtunnel',
-        'tablecrow>=1.3.1',
+        'tablecrow>=1.3.2',
     ],
     extras_require={
         'testing': ['flake8', 'pytest', 'pytest-cov', 'pytz'],

tests/test_database.py

@@ -5,8 +5,9 @@
 import psycopg2
 import pytest
 from sshtunnel import SSHTunnelForwarder
-from tablecrow.table import random_open_tcp_port, split_URL_port
+from tablecrow.table import random_open_tcp_port
 from tablecrow.tables.postgres import PostGresTable, SSH_DEFAULT_PORT, database_has_table
+from tablecrow.utilities import split_hostname_port
 
 from packetraven.connections import APRSDatabaseTable
 from packetraven.packets import APRSPacket
@@ -36,11 +37,11 @@
     'ssh_hostname' in CREDENTIALS['database']
     and CREDENTIALS['database']['ssh_hostname'] is not None
 ):
-    hostname, port = split_URL_port(CREDENTIALS['database']['hostname'])
+    hostname, port = split_hostname_port(CREDENTIALS['database']['hostname'])
     if port is None:
         port = PostGresTable.DEFAULT_PORT
 
-    ssh_hostname, ssh_port = split_URL_port(CREDENTIALS['database']['ssh_hostname'])
+    ssh_hostname, ssh_port = split_hostname_port(CREDENTIALS['database']['ssh_hostname'])
     if ssh_port is None:
         ssh_port = SSH_DEFAULT_PORT
 
@@ -68,7 +69,7 @@
 
 @pytest.fixture
 def connection() -> psycopg2.connect:
-    hostname, port = split_URL_port(CREDENTIALS['database']['hostname'])
+    hostname, port = split_hostname_port(CREDENTIALS['database']['hostname'])
     if port is None:
         port = PostGresTable.DEFAULT_PORT