EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/386060 )
Change subject: Use absolute_import from __future__ ...................................................................... Use absolute_import from __future__ We were already pulling this in for some specific use cases, lets use it everywhere. This basically means all imports must either be fully qualified, or start with a period. This reduces the ambiguity about what will be imported. Change-Id: I249d2b8e5741b1eef5b039d1684395a40835a837 --- M mjolnir/__init__.py M mjolnir/cirrus.py M mjolnir/cli/data_pipeline.py M mjolnir/cli/kafka_daemon.py M mjolnir/cli/training_pipeline.py M mjolnir/dbn.py M mjolnir/es_hits.py M mjolnir/feature_engineering.py M mjolnir/features.py M mjolnir/kafka/client.py M mjolnir/kafka/daemon.py M mjolnir/metrics.py M mjolnir/norm_query.py M mjolnir/sampling.py M mjolnir/spark/__init__.py M mjolnir/test/conftest.py M mjolnir/test/test_dbn.py M mjolnir/test/test_features.py M mjolnir/test/test_metrics.py M mjolnir/test/test_norm_query.py M mjolnir/test/test_sampling.py M mjolnir/test/test_spark.py M mjolnir/test/training/test_hyperopt.py M mjolnir/test/training/test_tuning.py M mjolnir/test/training/test_xgboost.py 25 files changed, 25 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/search/MjoLniR refs/changes/60/386060/1 diff --git a/mjolnir/__init__.py b/mjolnir/__init__.py index 1789d54..2fad765 100644 --- a/mjolnir/__init__.py +++ b/mjolnir/__init__.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from .about import (__author__, __author_email__, __description__, __name__, __url__, __version__) diff --git a/mjolnir/cirrus.py b/mjolnir/cirrus.py index 8532a86..860991a 100644 --- a/mjolnir/cirrus.py +++ b/mjolnir/cirrus.py @@ -3,6 +3,7 @@ to make those queries against an elasticsearch cluster. """ +from __future__ import absolute_import import random import requests import urlparse diff --git a/mjolnir/cli/data_pipeline.py b/mjolnir/cli/data_pipeline.py index 96ce889..ab86ffe 100644 --- a/mjolnir/cli/data_pipeline.py +++ b/mjolnir/cli/data_pipeline.py @@ -10,6 +10,7 @@ mjolnir/cli/data_pipeline.py """ +from __future__ import absolute_import import argparse from collections import OrderedDict import logging diff --git a/mjolnir/cli/kafka_daemon.py b/mjolnir/cli/kafka_daemon.py index b9240e9..1bbc4e6 100644 --- a/mjolnir/cli/kafka_daemon.py +++ b/mjolnir/cli/kafka_daemon.py @@ -4,6 +4,7 @@ kafka. """ +from __future__ import absolute_import import argparse import logging import mjolnir.kafka.daemon diff --git a/mjolnir/cli/training_pipeline.py b/mjolnir/cli/training_pipeline.py index 7425e87..dc32bd7 100644 --- a/mjolnir/cli/training_pipeline.py +++ b/mjolnir/cli/training_pipeline.py @@ -9,6 +9,7 @@ path/to/training_pipeline.py """ +from __future__ import absolute_import import argparse import logging import mjolnir.training.xgboost diff --git a/mjolnir/dbn.py b/mjolnir/dbn.py index a7ee154..536064e 100644 --- a/mjolnir/dbn.py +++ b/mjolnir/dbn.py @@ -3,6 +3,7 @@ within spark """ +from __future__ import absolute_import from clickmodels.inference import DbnModel from clickmodels.input_reader import InputReader import json diff --git a/mjolnir/es_hits.py b/mjolnir/es_hits.py index 714c8ee..5f673c1 100644 --- a/mjolnir/es_hits.py +++ b/mjolnir/es_hits.py @@ -2,6 +2,7 @@ Collect hit page ids for queries from elasticsearch """ +from __future__ import absolute_import import json import mjolnir.cirrus import mjolnir.spark diff --git a/mjolnir/feature_engineering.py b/mjolnir/feature_engineering.py index 9f86a53..d46ee55 100644 --- a/mjolnir/feature_engineering.py +++ b/mjolnir/feature_engineering.py @@ -1,4 +1,5 @@ """Helpful utilities for feature engineering""" +from __future__ import absolute_import import numpy as np import mjolnir.spark from pyspark.ml.linalg import Vectors, VectorUDT diff --git a/mjolnir/features.py b/mjolnir/features.py index 5cae635..13d069a 100644 --- a/mjolnir/features.py +++ b/mjolnir/features.py @@ -2,6 +2,7 @@ Integration for collecting feature vectors from elasticsearch """ +from __future__ import absolute_import import base64 from collections import defaultdict, namedtuple, OrderedDict import json diff --git a/mjolnir/kafka/client.py b/mjolnir/kafka/client.py index 60d4a37..7ef1f9a 100644 --- a/mjolnir/kafka/client.py +++ b/mjolnir/kafka/client.py @@ -4,6 +4,7 @@ collection. """ +from __future__ import absolute_import import json import mjolnir.spark import mjolnir.kafka diff --git a/mjolnir/kafka/daemon.py b/mjolnir/kafka/daemon.py index 78d79de..3f8d698 100644 --- a/mjolnir/kafka/daemon.py +++ b/mjolnir/kafka/daemon.py @@ -4,6 +4,7 @@ side of the network to have access to relforge servers. """ +from __future__ import absolute_import import json import kafka import kafka.common diff --git a/mjolnir/metrics.py b/mjolnir/metrics.py index f4d8e7c..e61b5cc 100644 --- a/mjolnir/metrics.py +++ b/mjolnir/metrics.py @@ -2,6 +2,7 @@ Calculates NDCG@k values for click data """ +from __future__ import absolute_import import math from pyspark.sql import functions as F from pyspark.sql import Window diff --git a/mjolnir/norm_query.py b/mjolnir/norm_query.py index 11b9f67..2c1916f 100644 --- a/mjolnir/norm_query.py +++ b/mjolnir/norm_query.py @@ -12,6 +12,7 @@ sets. """ +from __future__ import absolute_import import mjolnir.es_hits import mjolnir.spark import numpy as np diff --git a/mjolnir/sampling.py b/mjolnir/sampling.py index 3621be4..e65281c 100644 --- a/mjolnir/sampling.py +++ b/mjolnir/sampling.py @@ -7,6 +7,7 @@ in a single dataframe, but it works well enough for our data sizes. """ +from __future__ import absolute_import import bisect import mjolnir.spark import pyspark diff --git a/mjolnir/spark/__init__.py b/mjolnir/spark/__init__.py index 99796b7..442a286 100644 --- a/mjolnir/spark/__init__.py +++ b/mjolnir/spark/__init__.py @@ -1,6 +1,7 @@ """ Helper functions for dealing with pyspark """ +from __future__ import absolute_import import json from pyspark import SparkContext from pyspark.sql import Column, functions as F diff --git a/mjolnir/test/conftest.py b/mjolnir/test/conftest.py index 05c040a..2887b6c 100644 --- a/mjolnir/test/conftest.py +++ b/mjolnir/test/conftest.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import findspark findspark.init() # must happen before importing pyspark diff --git a/mjolnir/test/test_dbn.py b/mjolnir/test/test_dbn.py index 324ed5e..274b752 100644 --- a/mjolnir/test/test_dbn.py +++ b/mjolnir/test/test_dbn.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import os import mjolnir.dbn diff --git a/mjolnir/test/test_features.py b/mjolnir/test/test_features.py index 70b464b..f104604 100644 --- a/mjolnir/test/test_features.py +++ b/mjolnir/test/test_features.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from collections import OrderedDict import mjolnir.features import pyspark.sql diff --git a/mjolnir/test/test_metrics.py b/mjolnir/test/test_metrics.py index f9afe22..c09cb75 100644 --- a/mjolnir/test/test_metrics.py +++ b/mjolnir/test/test_metrics.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mjolnir.metrics import pytest diff --git a/mjolnir/test/test_norm_query.py b/mjolnir/test/test_norm_query.py index db7c4bb..428b823 100644 --- a/mjolnir/test/test_norm_query.py +++ b/mjolnir/test/test_norm_query.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import from collections import namedtuple import mjolnir.norm_query import numpy as np diff --git a/mjolnir/test/test_sampling.py b/mjolnir/test/test_sampling.py index 910bc17..2feeb29 100644 --- a/mjolnir/test/test_sampling.py +++ b/mjolnir/test/test_sampling.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import itertools import math import mjolnir.sampling diff --git a/mjolnir/test/test_spark.py b/mjolnir/test/test_spark.py index acd0b05..edc71aa 100644 --- a/mjolnir/test/test_spark.py +++ b/mjolnir/test/test_spark.py @@ -2,6 +2,7 @@ Tests for mjolnir.spark.* """ +from __future__ import absolute_import import mjolnir.spark from pyspark.sql import Window diff --git a/mjolnir/test/training/test_hyperopt.py b/mjolnir/test/training/test_hyperopt.py index 6a5a236..cd5d712 100644 --- a/mjolnir/test/training/test_hyperopt.py +++ b/mjolnir/test/training/test_hyperopt.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import hyperopt import mjolnir.training.hyperopt from pyspark.ml.linalg import Vectors diff --git a/mjolnir/test/training/test_tuning.py b/mjolnir/test/training/test_tuning.py index 521e399..13d8549 100644 --- a/mjolnir/test/training/test_tuning.py +++ b/mjolnir/test/training/test_tuning.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mjolnir.training.tuning import mjolnir.training.xgboost from pyspark.sql import functions as F diff --git a/mjolnir/test/training/test_xgboost.py b/mjolnir/test/training/test_xgboost.py index acc10bb..c4642d0 100644 --- a/mjolnir/test/training/test_xgboost.py +++ b/mjolnir/test/training/test_xgboost.py @@ -1,3 +1,4 @@ +from __future__ import absolute_import import mjolnir.training.xgboost from pyspark.ml.linalg import Vectors import pytest -- To view, visit https://gerrit.wikimedia.org/r/386060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I249d2b8e5741b1eef5b039d1684395a40835a837 Gerrit-PatchSet: 1 Gerrit-Project: search/MjoLniR Gerrit-Branch: master Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits