From 8ca83a5ff90aae04da7c73ed9b6b1756d55b2797 Mon Sep 17 00:00:00 2001 From: Matt Cieslak Date: Sat, 22 Jul 2017 17:34:05 -0700 Subject: [PATCH] missing openpyxl dependency during compilation --- INFO.txt | 2 +- meap/__init__.py | 2 +- packaging/deps2.py | 3 +++ packaging/innosetup/meap.iss | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/INFO.txt b/INFO.txt index 37d4ea0..321f466 100644 --- a/INFO.txt +++ b/INFO.txt @@ -1,4 +1,4 @@ -MEAP version 1.1.0 +MEAP version 1.2.1 Copyright (C) 2014 Matthew Cieslak and Will Ryan diff --git a/meap/__init__.py b/meap/__init__.py index d839905..67576d9 100644 --- a/meap/__init__.py +++ b/meap/__init__.py @@ -22,7 +22,7 @@ SEARCH_WINDOW=30 #samples BLOOD_RESISTIVITY=135. # Ohms cm n_regions=0 -__version__= "1.2.0" +__version__= "1.2.1" # Are we bundled? if getattr( sys, 'frozen', False ) : diff --git a/packaging/deps2.py b/packaging/deps2.py index f1a09b0..502d745 100755 --- a/packaging/deps2.py +++ b/packaging/deps2.py @@ -905,6 +905,9 @@ 'traitsui.include', 'pandas.core.config', 'scipy.stats._stats_mstats_common', + 'openpyxl', + 'jdcal', + 'et_xmlfile', 'pandas.compat.openpyxl_compat', 'sklearn.preprocessing.data', 'enable.tools.viewport_pan_tool', diff --git a/packaging/innosetup/meap.iss b/packaging/innosetup/meap.iss index ef1719b..68fa4bd 100644 --- a/packaging/innosetup/meap.iss +++ b/packaging/innosetup/meap.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "MEAP" -#define MyAppVersion "1.2.0" +#define MyAppVersion "1.2.1" #define MyAppPublisher "UCSB Department of Psycholgical and Brain Sciences" #define MyAppURL "http://meap.readthedocs.io/en/latest/" #define MyAppExeName "MEAP.exe"