From 1f1df3e10dee93876241c8ecaced57add63e26b6 Mon Sep 17 00:00:00 2001
From: Greg Denton <gdenton@google.com>
Date: Wed, 27 Mar 2019 12:40:49 -0700
Subject: [PATCH] Make sure that versions folder is included in Dockerfile
 (#255)

* Make sure that versions folder is included in Dockerfile

* move versions directory into outline dir
---
 pyoutline/bin/cuerunbase.py                  | 2 +-
 pyoutline/outline/backend/cue.py             | 3 +--
 pyoutline/outline/backend/local.py           | 3 +--
 pyoutline/{ => outline}/versions/__init__.py | 0
 pyoutline/{ => outline}/versions/main.py     | 0
 pyoutline/{ => outline}/versions/session.py  | 0
 6 files changed, 3 insertions(+), 5 deletions(-)
 rename pyoutline/{ => outline}/versions/__init__.py (100%)
 rename pyoutline/{ => outline}/versions/main.py (100%)
 rename pyoutline/{ => outline}/versions/session.py (100%)

diff --git a/pyoutline/bin/cuerunbase.py b/pyoutline/bin/cuerunbase.py
index 06b83b6c7..bb1b81f2d 100644
--- a/pyoutline/bin/cuerunbase.py
+++ b/pyoutline/bin/cuerunbase.py
@@ -19,7 +19,7 @@
 import sys
 import traceback
 
-import versions
+from outline import versions
 
 
 logging.basicConfig()
diff --git a/pyoutline/outline/backend/cue.py b/pyoutline/outline/backend/cue.py
index ebaf2403c..4b483b4ee 100644
--- a/pyoutline/outline/backend/cue.py
+++ b/pyoutline/outline/backend/cue.py
@@ -24,9 +24,8 @@
 
 import FileSequence
 import opencue
-import versions
 
-from outline import config, util, OutlineException
+from outline import config, util, versions, OutlineException
 from outline.depend import DependType
 
 
diff --git a/pyoutline/outline/backend/local.py b/pyoutline/outline/backend/local.py
index a753b5240..bb9c2f0d0 100644
--- a/pyoutline/outline/backend/local.py
+++ b/pyoutline/outline/backend/local.py
@@ -15,10 +15,9 @@
 
 import sqlite3
 import subprocess
-import versions
 
 from outline.manifest import FileSequence
-from outline import config, util
+from outline import config, util, versions
 
 
 def build_command(ol, layer, frame):
diff --git a/pyoutline/versions/__init__.py b/pyoutline/outline/versions/__init__.py
similarity index 100%
rename from pyoutline/versions/__init__.py
rename to pyoutline/outline/versions/__init__.py
diff --git a/pyoutline/versions/main.py b/pyoutline/outline/versions/main.py
similarity index 100%
rename from pyoutline/versions/main.py
rename to pyoutline/outline/versions/main.py
diff --git a/pyoutline/versions/session.py b/pyoutline/outline/versions/session.py
similarity index 100%
rename from pyoutline/versions/session.py
rename to pyoutline/outline/versions/session.py