Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
source=shotgun_api3
omit=
shotgun_api3/lib/httplib2/*
shotgun_api3/lib/simplejson/*
shotgun_api3/lib/six.py
shotgun_api3/lib/xmlrpclib.py
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
language: python
python:
- "2.6"
- "2.7"

# use trusty dist, since xenial (default) does not support python 2.6
dist: trusty
# We need to test on multiple distros, since python 2.6 is not supported in xenial
# and 3.7 is not supported in trusty. For now just use trusty to test 2.6, and use
# the more modern xenial for 2.7 and 3.7.
matrix:
include:
# use trusty dist, since xenial (default) does not support python 2.6
- dist: trusty
python: "2.6"
# test python 2.7 and 3.7 on xenial.
- dist: xenial
python: "2.7"
- dist: xenial
python: "3.7"

# command to install dependencies
install:
Expand Down
2 changes: 1 addition & 1 deletion docs/cookbook/examples/ami_version_packager.rst
Original file line number Diff line number Diff line change
Expand Up @@ -253,5 +253,5 @@ It is intended to be used in conjunction with the script dicussed in :ref:`ami_h
raise ShotgunException("Unknown action... :%s" % sa.action)


print "\nVersion Packager done!"
print("\nVersion Packager done!")

2 changes: 1 addition & 1 deletion docs/cookbook/examples/basic_create_shot.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ The Complete Example
}
result = sg.create('Shot', data)
pprint(result)
print "The id of the %s is %d." % (result['type'], result['id'])
print("The id of the {} is {}.".format(result['type'], result['id']))

And here is the output::

Expand Down
4 changes: 2 additions & 2 deletions docs/cookbook/examples/svn_integration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@ link to the Revision.
'created_by':{"type":"HumanUser", "id":result['id']}
}
revision = sg.create("Revision", parameters)
print "created Revision #"+str(revision_code)
print("created Revision #"+str(revision_code))

# Send error message if valid HumanUser is not found
else:
print "Unable to find valid Shotgun User with login: "+author+", Revision not created in Shotgun."
print("Unable to find valid Shotgun User with login: "+author+", Revision not created in Shotgun.")



Expand Down
1 change: 0 additions & 1 deletion run-tests-2.4

This file was deleted.

1 change: 0 additions & 1 deletion run-tests-2.5

This file was deleted.

2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[nosetests]
exclude-dir=shotgun_api3/lib
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
from __future__ import absolute_import
import sys
from setuptools import setup, find_packages

Expand Down
5 changes: 3 additions & 2 deletions shotgun_api3/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from shotgun import (Shotgun, ShotgunError, ShotgunFileDownloadError, Fault,
from __future__ import absolute_import
from .shotgun import (Shotgun, ShotgunError, ShotgunFileDownloadError, Fault,

Choose a reason for hiding this comment

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

'.shotgun.AuthenticationFault' imported but unused
'.shotgun.Error' imported but unused
'.shotgun.Fault' imported but unused
'.shotgun.MissingTwoFactorAuthenticationFault' imported but unused
'.shotgun.ProtocolError' imported but unused
'.shotgun.ResponseError' imported but unused
'.shotgun.Shotgun' imported but unused
'.shotgun.ShotgunError' imported but unused
'.shotgun.ShotgunFileDownloadError' imported but unused
'.shotgun.UserCredentialsNotAllowedForSSOAuthenticationFault' imported but unused
'.shotgun.version' imported but unused

AuthenticationFault, MissingTwoFactorAuthenticationFault,
UserCredentialsNotAllowedForSSOAuthenticationFault,
ProtocolError, ResponseError, Error, __version__)
from shotgun import SG_TIMEZONE as sg_timezone
from .shotgun import SG_TIMEZONE as sg_timezone

Choose a reason for hiding this comment

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

'.shotgun.SG_TIMEZONE as sg_timezone' imported but unused


Loading