Skip to content

Add a compat module, remove six dependency #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kolanos merged 2 commits into from
Apr 10, 2018
Merged

Add a compat module, remove six dependency #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2912676
Add a compat module, remove six dependency
kolanos Apr 10, 2018
c92edee
Up version for micro release
kolanos Apr 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions iopipe/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import sys

PY3 = sys.version_info[0] == 3

if PY3:
string_types = str,
else:
string_types = basestring, # noqa
2 changes: 1 addition & 1 deletion iopipe/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
PROCESS_ID = str(uuid.uuid4())
TIMESTAMP_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
METRIC_NAME_LIMIT = 128
VERSION = '1.4.0'
VERSION = '1.4.1'
2 changes: 1 addition & 1 deletion iopipe/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import decimal
import numbers
import warnings
from six import string_types
from . import constants
from .compat import string_types


class ContextWrapper(object):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='iopipe',
version='1.4.0',
version='1.4.1',
description='IOpipe agent for serverless Application Performance Monitoring',
author='IOpipe',
author_email='dev@iopipe.com',
Expand Down
1 change: 1 addition & 0 deletions tests/contrib/trace/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def test__trace_plugin__valid_schema(mock_send_report, handler_with_trace, mock_
handler({}, mock_context)

assert_valid_schema(iopipe.report.report, optional_fields=[
'disk',
Copy link
Copy Markdown
Contributor

@pselle pselle Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need this as an optional field

Copy link
Copy Markdown
Contributor Author

@kolanos kolanos Apr 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The three tests were failing without it. So it is needed until #190 is merged.

'environment.runtime.vendor',
'environment.runtime.vmVendor',
'environment.runtime.vmVersion',
Expand Down
2 changes: 2 additions & 0 deletions tests/test_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ def test_report_linux_system_success(mock_context, assert_valid_schema):
assert_valid_schema(
report.report,
optional_fields=[
'disk',
'environment.runtime.vendor',
'environment.runtime.vmVendor',
'environment.runtime.vmVersion',
Expand Down Expand Up @@ -40,6 +41,7 @@ def test_report_linux_system_error(mock_context, assert_valid_schema):
assert_valid_schema(
report.report,
optional_fields=[
'disk',
'environment.runtime.vendor',
'environment.runtime.vmVendor',
'environment.runtime.vmVersion',
Expand Down