Distribute patched potion-client with onecodex (#111)

onecodex/api.py

@@ -12,12 +12,11 @@
 import warnings
 import errno
 
-from onecodex.vendor.potion_client import Client as PotionClient
-from onecodex.vendor.potion_client.converter import PotionJSONSchemaDecoder,
-    PotionJSONDecoder, PotionJSONEncoder
-from onecodex.vendor.potion_client.utils import upper_camel_case
 from requests.auth import HTTPBasicAuth
 
+from onecodex.vendor.potion_client import Client as PotionClient
+from onecodex.vendor.potion_client.converter import PotionJSONSchemaDecoder, PotionJSONDecoder, PotionJSONEncoder
+from onecodex.vendor.potion_client.utils import upper_camel_case
 from onecodex.lib.auth import BearerTokenAuth
 from onecodex.models import _model_lookup
 from onecodex.utils import ModuleAlias, get_raven_client, collapse_user

onecodex/cli.py

@@ -13,8 +13,7 @@
 
 from onecodex.utils import (cli_resource_fetcher, download_file_helper,
                             valid_api_key, OPTION_HELP, pprint, pretty_errors,
-                            warn_if_insecure_platform, is_simplejson_installed,
-                            warn_simplejson, telemetry)
+                            warn_if_insecure_platform, telemetry)
 from onecodex.api import Api
 from onecodex.exceptions import (ValidationWarning,
                                  ValidationError, UploadException)
@@ -63,10 +62,6 @@ def onecodex(ctx, api_key, no_pprint, verbose, telemetry):
     if verbose:
         log.setLevel(logging.INFO)
 
-    # Show a warning if simplejson is installed
-    if is_simplejson_installed():
-        warn_simplejson()
-
     # handle checking insecure platform, we let upload command do it by itself
     if ctx.invoked_subcommand != "upload":
         warn_if_insecure_platform()

onecodex/models/__init__.py

@@ -7,10 +7,10 @@
 from dateutil.parser import parse
 import pytz
 from requests.exceptions import HTTPError
-from onecodex.vendor.potion_client.converter import PotionJSONEncoder
-from onecodex.vendor.potion_client.resource import Resource
 import six
 
+from onecodex.vendor.potion_client.converter import PotionJSONEncoder
+from onecodex.vendor.potion_client.resource import Resource
 from onecodex.exceptions import MethodNotSupported, PermissionDenied, ServerError
 from onecodex.models.helpers import (check_bind, generate_potion_sort_clause,
                                      generate_potion_keyword_where)

onecodex/utils.py

@@ -25,8 +25,8 @@
 
 import requests
 from click import BadParameter, Context, echo
-from onecodex.vendor.potion_client.converter import PotionJSONEncoder
 
+from onecodex.vendor.potion_client.converter import PotionJSONEncoder
 from onecodex.exceptions import OneCodexException, UploadException
 from onecodex.version import __version__
 

onecodex/vendor/__init__.py

@@ -0,0 +1,5 @@
+"""
+Modules created by others. Versioned and distributed by One Codex
+"""
+
+__all__ = ['potion_client']

onecodex/vendor/potion_client/__init__.py

@@ -1,14 +1,15 @@
+# flake8: noqa
 from functools import partial
 from operator import getitem, delitem, setitem
 from six.moves.urllib.parse import urlparse, urljoin
 from weakref import WeakValueDictionary
 import collections
 import requests
 
-from potion_client.converter import PotionJSONDecoder, PotionJSONSchemaDecoder
-from potion_client.resource import Reference, Resource, uri_for
-from potion_client.links import Link
-from potion_client.utils import upper_camel_case, snake_case
+from .converter import PotionJSONDecoder, PotionJSONSchemaDecoder
+from .resource import Reference, Resource, uri_for
+from .links import Link
+from .utils import upper_camel_case, snake_case
 
 
 class Client(object):
@@ -144,4 +145,4 @@ def resource_factory(self, name, schema, resource_cls=None):
 
 
 ASC = ASCENDING = False
-DESC = DESCENDING = True
+DESC = DESCENDING = True

onecodex/vendor/potion_client/collection.py

@@ -1,7 +1,8 @@
+# flake8: noqa
 import collections
 from pprint import pformat
 
-from potion_client.utils import escape
+from .utils import escape
 
 
 class PaginatedList(collections.Sequence):

onecodex/vendor/potion_client/converter.py

@@ -8,7 +8,7 @@
 from six.moves.urllib.parse import urljoin
 import six
 
-from potion_client.resource import Reference
+from .resource import Reference
 
 try:
     from datetime import timezone

onecodex/vendor/potion_client/links.py

@@ -1,3 +1,4 @@
+# flake8: noqa
 try:
     import simplejson as json
 except ImportError:
@@ -7,10 +8,9 @@
 from requests import Request
 from requests.exceptions import HTTPError
 
-from potion_client import PotionJSONDecoder
-from potion_client.collection import PaginatedList
-from potion_client.converter import PotionJSONEncoder
-from potion_client.schema import Schema
+from .collection import PaginatedList
+from .converter import PotionJSONEncoder, PotionJSONDecoder
+from .schema import Schema
 
 
 class Link(object):

onecodex/vendor/potion_client/resource.py

@@ -3,8 +3,8 @@
 
 import six
 
-from potion_client.exceptions import ItemNotFound, MultipleItemsFound
-from potion_client.utils import escape
+from .exceptions import ItemNotFound, MultipleItemsFound
+from .utils import escape
 
 
 def uri_for(reference):