Эх сурвалжийг харах

[cleanup][nose] Remove old nose package references (#3711)

Harsh Gupta 1 жил өмнө
parent
commit
a172d006e1

+ 2 - 4
desktop/core/src/desktop/require_login_test.py

@@ -14,11 +14,9 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#
+
 # Test for RequireLoginEverywhereMiddleware in middleware.py
-# 
-# This test uses "nose"-style testing (no need for a TestCase),
-# and nose-style assertions.
+
 
 import sys
 import pytest

+ 1 - 3
desktop/devtools.mk

@@ -21,9 +21,7 @@
 DEVTOOLS += \
 	ipython[5.2.0] \
 	ipdb[0.13.9] \
-	nose[1.3.7] \
-	coverage[4.4.2] \
-	nosetty[0.4]
+	coverage[4.4.2]
 
 PYPI_MIRROR ?= https://pypi.python.org/simple/
 

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/clean_to_match_schema.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="fields, get_regex"/>
 
 # treat empty strings as if the field wasn't in the tuple unless the type is string

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/convert_date_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/extract_uri_components_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/find_replace_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/geo_ip_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 {

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/grok_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/parse_csv.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="format_settings, format_class"/>
 
 {

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/parse_grok_line.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="format_settings, format_class"/>
 
 {

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/parse_hue.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="format_settings, format_class"/>
 
 {

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/parse_parquet.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="format_settings, format_class, fields"/>
 
 {

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/split_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 2 - 1
desktop/libs/indexer/src/data/oozie_workspace/translate_operation.conf

@@ -12,7 +12,8 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
+
 <%page args="field, operation"/>
 
 # field

+ 3 - 4
desktop/libs/indexer/src/indexer/indexers/morphline_tests.py

@@ -12,10 +12,9 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
-# limitations under the License.from nose.tools import assert_equal
+# limitations under the License.
 
 from future import standard_library
-standard_library.install_aliases()
 from builtins import zip
 from past.builtins import basestring
 from builtins import object
@@ -44,6 +43,7 @@ if sys.version_info[0] > 2:
 else:
   from StringIO import StringIO as string_io
 
+standard_library.install_aliases()
 
 LOG = logging.getLogger()
 
@@ -258,7 +258,7 @@ class TestIndexer(object):
 
   @pytest.mark.integration
   def test_end_to_end(self):
-    if not is_live_cluster(): # Skipping as requires morplines libs to be setup
+    if not is_live_cluster():  # Skipping as requires morplines libs to be setup
       pytest.skip("Skipping Test")
 
     cluster = shared_cluster()
@@ -294,7 +294,6 @@ class TestIndexer(object):
     if is_unique_generated:
       schema_fields += [{"name": unique_field, "type": "string"}]
 
-
     # create the collection from the specified fields
     collection_manager = CollectionManagerController("test")
     if collection_manager.collection_exists(collection_name):