diff --git a/.gitignore b/.gitignore index 821f715..5153341 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ docs/build settings.json +apikeysrc \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 23f315e..af86298 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.6" - "2.7" - "3.3" - "3.4" diff --git a/test/conftest.py b/test/conftest.py index cc9c7f9..2744b60 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,12 +1,22 @@ import pytest import tempfile import os +import logging - -from .apikey import APIKEY, QRZ_USERNAME, QRZ_PWD from pyhamtools import LookupLib from pyhamtools import Callinfo +APIKEY = "" +QRZ_USERNAME = "" +QRZ_PWD = "" + +try: + APIKEY = str(os.environ['CLUBLOG_APIKEY']) + QRZ_USERNAME = str(os.environ['QRZ_USERNAME']) + QRZ_PWD = str(os.environ['QRZ_PWD']) + +except Exception as ex: + print("WARNING: Environment variables with API keys not set; some tests will be skipped") @pytest.fixture(scope="session", params=["a", "", 12.5, -5, {"foo" : "bar"}, [5, "foo"]]) def fixNonUnsignedInteger(request): diff --git a/test/test_lookuplib_qrz.py b/test/test_lookuplib_qrz.py index 27f804e..d65a34c 100644 --- a/test/test_lookuplib_qrz.py +++ b/test/test_lookuplib_qrz.py @@ -1,8 +1,8 @@ +import os + import pytest from datetime import datetime - -from .apikey import QRZ_USERNAME, QRZ_PWD from pyhamtools.lookuplib import LookupLib from pyhamtools.exceptions import APIKeyMissingError from pyhamtools.consts import LookupConventions as const @@ -10,10 +10,15 @@ from pyhamtools.consts import LookupConventions as const import pytz UTC = pytz.UTC + +try: + QRZ_USERNAME = str(os.environ['QRZ_USERNAME']) + QRZ_PWD = str(os.environ['QRZ_PWD']) +except Exception: + pytestmark = pytest.mark.skip("Environment variables with QRZ.com credentials not set") + #Fixtures #=========================================================== - - response_XX1XX = { u'addr2': u'Not QSL', u'adif': 0,