Skip to content

Commit

Permalink
Deployment fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Hauke Jürgen Mönck committed Mar 1, 2018
1 parent 1091079 commit 50efc0c
Show file tree
Hide file tree
Showing 14 changed files with 123 additions and 1,219 deletions.
70 changes: 70 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
build*
preprocessing/build*
__pycache__
*__init__.py
*.csv
BioTrackerAnalysis
*.dll

GeneratedFiles/
CMakeLists.txt.user
desktop.ini
*.swp
*.opensdf
*.sdf
*.suo
*.exe
*.psess
*.vsp
*.ipch
*.sln
*.vcxproj
*.vcxproj.filters
*.vcxproj.vspscc
.gitignore.swp
*.bak_*
BioTracker.apparmor
CMakeLists.txt.user.3.2-pre1
manifest.json

# ignore editor ~ files
.tags*
Doxyfile
CMakeCache.txt
Makefile
cmake_install.cmake
doxygen_sqlite3.db
*~
.idea/

/CMakeFiles
/doc
/html
/Debug
/Release
/build*
/Build*
*.kate-swp

# astyle original files
*.orig
*.user
*.obj
*.dll
*.qm
*.avi
*moc_*
*.tlog
*.log
*.ilk
*.lib
*.lastbuildstate
*.stamp
*.depend
*.pdb
*.exp
*.db
*.opendb
CMakeFiles
*.cache
*.csv
Empty file.
Binary file not shown.
Binary file not shown.
Binary file not shown.
1,218 changes: 0 additions & 1,218 deletions preprocessing/data_processing/first_stats.csv

This file was deleted.

41 changes: 41 additions & 0 deletions preprocessing/freeze.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
from cx_Freeze import setup, Executable
import os
import sys
import distutils
import opcode

base = None

#TODO generic...
pythonPath = r'C:/Users/MyUser/Anaconda3/'

os.environ['TCL_LIBRARY'] = pythonPath + r'tcl/tcl8.6'
os.environ['TK_LIBRARY'] = pythonPath + r'tcl/tk8.6'
executables = [Executable("mainWindow.py", base=base)]

options = {
'build_exe': {

'packages':['pandas', 'scipy', 'numpy', 'idna', 'seaborn', 'os'],
'excludes':['scipy.spatial.cKDTree'],
'includes':['scipy'],
'include_files':[pythonPath + 'DLLs/sqlite3.dll']
},
}

setup(
name = "BioTrackerAnalysis",
options = options,
version = "1.0",
description = 'BioTrackerAnalysis',
executables = executables
)

lst = os.listdir('build');
if (len(lst) == 1):
os.rename('build/'+lst[0], '../BioTrackerAnalysis')
os.rmdir('build')
from distutils.dir_util import copy_tree
copy_tree("settings", "../BioTrackerAnalysis/settings")
copy_tree("data_processing", "../BioTrackerAnalysis/data_processing")
copy_tree("stats", "../BioTrackerAnalysis/stats")
Empty file removed preprocessing/settings/__init__.py
Empty file.
Binary file not shown.
Binary file not shown.
13 changes: 12 additions & 1 deletion preprocessing/settings/dict_data.json
Original file line number Diff line number Diff line change
@@ -1 +1,12 @@
{"agent_specifications": ["_x", "_y", "_angle"], "other": [], "muesli_x": "7", "time": "2", "muesli_y": "8", "time_labels": ["frames", "time"], "frames": 1, "agent_names": ["muesli"], "info": {"angle": "deg", "time": "ms"}, "muesli_angle": "9"}
{
"agent_specifications": ["_x", "_y", "_angle"],
"other": [],
"agent_x": "7",
"time": "2",
"agent_y": "8",
"time_labels": ["frames", "time"],
"frames": 1,
"agent_names": ["agent"],
"info": {"angle": "deg", "time": "ms"},
"agent_angle": "9"
}
Empty file removed preprocessing/stats/__init__.py
Empty file.
Binary file removed preprocessing/stats/__pycache__/__init__.cpython-35.pyc
Binary file not shown.
Binary file not shown.

0 comments on commit 50efc0c

Please sign in to comment.