Merge branch 'feature/issue-28-rename-toplevel-package-to-go-optouts'…

… into develop
praekelt · Oct 30, 2015 · 32ef510 · 32ef510
2 parents 28a7e35 + f27f943
commit 32ef510
Show file tree

Hide file tree

Showing 18 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,4 +22,4 @@ install:
   - riak version
   - riak-admin member-status
 script:
-  - trial opt_out_http_api
+  - trial go_optouts
diff --git a/opt_out_http_api/__init__.py → go_optouts/__init__.py b/opt_out_http_api/__init__.py → go_optouts/__init__.py
diff --git a/opt_out_http_api/api_methods.py → go_optouts/api_methods.py b/opt_out_http_api/api_methods.py → go_optouts/api_methods.py
diff --git a/opt_out_http_api/backends/__init__.py → go_optouts/backends/__init__.py b/opt_out_http_api/backends/__init__.py → go_optouts/backends/__init__.py
diff --git a/opt_out_http_api/backends/interface.py → go_optouts/backends/interface.py b/opt_out_http_api/backends/interface.py → go_optouts/backends/interface.py
diff --git a/opt_out_http_api/backends/memory.py → go_optouts/backends/memory.py b/opt_out_http_api/backends/memory.py → go_optouts/backends/memory.py
diff --git a/opt_out_http_api/backends/riak.py → go_optouts/backends/riak.py b/opt_out_http_api/backends/riak.py → go_optouts/backends/riak.py
diff --git a/opt_out_http_api/backends/tests/__init__.py → go_optouts/backends/tests/__init__.py b/opt_out_http_api/backends/tests/__init__.py → go_optouts/backends/tests/__init__.py
diff --git a/opt_out_http_api/backends/tests/test_riak.py → go_optouts/backends/tests/test_riak.py b/opt_out_http_api/backends/tests/test_riak.py → go_optouts/backends/tests/test_riak.py
@@ -7,7 +7,7 @@
 
 from go.vumitools.opt_out.models import OptOutStore
 
-from opt_out_http_api.backends.riak import (
+from go_optouts.backends.riak import (
     RiakOptOutBackend, RiakOptOutCollection)
 
 

diff --git a/opt_out_http_api/run.py → go_optouts/run.py b/opt_out_http_api/run.py → go_optouts/run.py
diff --git a/opt_out_http_api/store/__init__.py → go_optouts/store/__init__.py b/opt_out_http_api/store/__init__.py → go_optouts/store/__init__.py
diff --git a/opt_out_http_api/store/interface.py → go_optouts/store/interface.py b/opt_out_http_api/store/interface.py → go_optouts/store/interface.py
diff --git a/opt_out_http_api/store/memory.py → go_optouts/store/memory.py b/opt_out_http_api/store/memory.py → go_optouts/store/memory.py
diff --git a/opt_out_http_api/store/tests/__init__.py → go_optouts/store/tests/__init__.py b/opt_out_http_api/store/tests/__init__.py → go_optouts/store/tests/__init__.py
diff --git a/opt_out_http_api/store/tests/test_memory.py → go_optouts/store/tests/test_memory.py b/opt_out_http_api/store/tests/test_memory.py → go_optouts/store/tests/test_memory.py
@@ -2,8 +2,8 @@
 Tests for OptOutMemory.
 """
 from zope.interface.verify import verifyClass, verifyObject
-from opt_out_http_api.store.interface import IOptOutStore
-from opt_out_http_api.store.memory import OptOutMemory
+from go_optouts.store.interface import IOptOutStore
+from go_optouts.store.memory import OptOutMemory
 from twisted.trial.unittest import TestCase
 
 

diff --git a/opt_out_http_api/tests/__init__.py → go_optouts/tests/__init__.py b/opt_out_http_api/tests/__init__.py → go_optouts/tests/__init__.py
diff --git a/opt_out_http_api/tests/test_api.py → go_optouts/tests/test_api.py b/opt_out_http_api/tests/test_api.py → go_optouts/tests/test_api.py
@@ -1,10 +1,10 @@
-from opt_out_http_api.api_methods import API
+from go_optouts.api_methods import API
 import treq
 from twisted.trial.unittest import TestCase
 from twisted.web.server import Site
 from twisted.internet import reactor
 from twisted.internet.defer import inlineCallbacks
-from opt_out_http_api.store.memory import OptOutMemory
+from go_optouts.store.memory import OptOutMemory
 
 
 class TestApi(TestCase):

diff --git a/opt_out_http_api/_trial_temp/_trial_marker b/opt_out_http_api/_trial_temp/_trial_marker