Skip to content

SG-19789 licensing #236

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
pscadding merged 8 commits into from
Nov 19, 2020
Merged

SG-19789 licensing #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
417ec3c
wip adding in software credits file for 3rd party components.
pscadding Nov 10, 2020
22268b7
removing unused xmlrpclib
pscadding Nov 10, 2020
e1959a0
WIP
pscadding Nov 10, 2020
6716365
Merge branch 'master' into SG-19789-licencing
pscadding Nov 10, 2020
d09446d
Added the certifi and Httplib2 licences.
pscadding Nov 12, 2020
227ceae
increase the thumbnail attempts to help flaky tests.
pscadding Nov 13, 2020
6987353
trying 30 attempts at 10 sec intervals = five mins max wait
pscadding Nov 17, 2020
77aef0e
Merge branch 'master' into SG-19789-licencing
pscadding Nov 19, 2020
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
1 change: 0 additions & 1 deletion .coveragerc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ source=shotgun_api3
omit=
shotgun_api3/lib/httplib2/*
shotgun_api3/lib/six.py
shotgun_api3/lib/xmlrpclib.py
2 changes: 1 addition & 1 deletion .flake8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@

[flake8]
max-line-length = 120
exclude = shotgun_api3/lib/httplib2/*,shotgun_api3/lib/six.py,shotgun_api3/lib/xmlrpclib.py,tests/httplib2test.py,tests/mock.py
exclude = shotgun_api3/lib/httplib2/*,shotgun_api3/lib/six.py,tests/httplib2test.py,tests/mock.py
341 changes: 0 additions & 341 deletions shotgun_api3/lib/xmlrpclib.py
View file
Open in desktop

This file was deleted.

Loading