diff --git a/ci/appveyor/build.cmd b/ci/appveyor/build.cmd index 0eac09f249cb28c21b34edc1d37354b535d4b3f6..7c8481da39d2363581d28a9d7382279e98a44a39 100644 --- a/ci/appveyor/build.cmd +++ b/ci/appveyor/build.cmd @@ -18,7 +18,7 @@ pip install base58 pip install git+https://github.com/Insoleet/quamash.git@sockets_only pip install aiohttp pip install git+https://github.com/ucoin-io/ucoin-python-api.git -pip install git+https://github.com/Insoleet/pretenders.git@develop +pip install pretenders python gen_resources.py if %errorlevel% neq 0 exit /b 1s diff --git a/setup.py b/setup.py index 0d8638e57671bb51b3f6765a54a29e4eae95becc..1fa686c84c7f7b29588fb43335788eccdc1a7d2f 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,8 @@ from PyQt5 import QtCore sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), 'src'))) print(sys.path) +print("Environnement:") +print(os.environ) includes = ["sip", "re", "json", "logging", "hashlib", "os", "urllib", "ucoinpy", "pylibscrypt"] @@ -29,7 +31,7 @@ if sys.platform == "win32": if os.path.isfile(os.path.join(os.path.dirname(path), "libEGL.dll")): libEGL_path = os.path.join(os.path.dirname(path), "libEGL.dll") - if 'CONDA_ENV_PATH' in os.environ: + if 'CONDA_DEFAULT_ENV' in os.environ: # Check if we are in Conda env path = QtCore.QCoreApplication.libraryPaths()[0] libEGL_path = os.path.join(path, "Scripts", "libEGL.dll") @@ -52,11 +54,20 @@ else: libsodium_path = "" print(QtCore.QCoreApplication.libraryPaths()) # Check if we are in Conda env - if 'CONDA_ENV_PATH' in os.environ: - libsodium_path = os.path.join(os.environ['CONDA_ENV_PATH'], "lib", + if 'CONDA_DEFAULT_ENV' in os.environ: + libsodium_path = os.path.join(os.environ['CONDA_DEFAULT_ENV'], "lib", "libsodium.so.13") includefiles.append((libsodium_path, "libsodium.so.13")) +print("Includes : ") +print(includes) +print("Excludes : ") +print(exclude) +print("Include files : ") +print(includefiles) +print("Packages : ") +print(packages) +print(sys.path) options = {"path": sys.path, "includes": includes,