[master][noticket]: Merge tidy up.

ckan/tests/functional/test_home.py

@@ -117,7 +117,6 @@ def test_locale_change_with_false_hash(self):
             assert res.status == 200, res.status # doesn't redirect
         finally:
             self.clear_language_setting()
->>>>>>> release-v1.6
 
     def test_update_profile_notice(self):
         edit_url = url_for(controller='user', action='edit')

ckan/tests/functional/test_package.py

@@ -17,7 +17,6 @@
 from ckan.lib.create_test_data import CreateTestData
 import ckan.lib.helpers as h
 import ckan.lib.search as search
-from ckan.lib.i18n import set_session_locale
 from ckan.logic.action import get, update
 from ckan.controllers.package import PackageController
 from ckan.plugins import SingletonPlugin, implements, IPackageController
@@ -1311,10 +1310,7 @@ def test_change_locale(self):
         res = self.app.get(offset)
         res = res.click('Deutsch')
         try:
-            res = res.follow()
             assert 'Datensatz' in res.body, res.body
-
-
         finally:
             self.clear_language_setting()
 

pip-requirements.txt

@@ -5,11 +5,11 @@
 # 
 #     pip install --ignore-installed -r pip-requirements.txt
 
--e git+https://github.com/okfn/ckan@release-v1.6#egg=ckan
+-e git+https://github.com/okfn/ckan@master#egg=ckan
 # CKAN dependencies
--r https://github.com/okfn/ckan/raw/release-v1.6/requires/lucid_conflict.txt
--r https://github.com/okfn/ckan/raw/release-v1.6/requires/lucid_present.txt
--r https://github.com/okfn/ckan/raw/release-v1.6/requires/lucid_missing.txt
+-r https://github.com/okfn/ckan/raw/master/requires/lucid_conflict.txt
+-r https://github.com/okfn/ckan/raw/master/requires/lucid_present.txt
+-r https://github.com/okfn/ckan/raw/master/requires/lucid_missing.txt
 
 # NOTE: Developers, please do not edit this file. Changes should go in the
 #       appropriate files in the `requires' directory.