Merge pull request #52 from anxdpanic/dev

2.0.5~beta1

Author: anxdpanic

LICENSE LICENSES/GPL-3.0-onlyLICENSE renamed to LICENSES/GPL-3.0-only

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.4" provider-name="A Talented Community">
+<addon id="script.module.python.twitch" name="python-twitch for Kodi" version="2.0.5~beta1" provider-name="A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
-        <import addon="script.module.six" version="1.9.0"/>
-        <import addon="script.module.requests" version="2.9.1"/>
+        <import addon="script.module.six" version="1.11.0"/>
+        <import addon="script.module.requests" version="2.12.4"/>
     </requires>
     <extension point="xbmc.python.module" library="resources/lib"/>
     <extension point="xbmc.addon.metadata">
         <platform>all</platform>
         <news>
-[fix] video/live stream token encoding
+[add] add frame rate and resolution to returned stream information
+[upd] update usher parameters
+[upd] use SPDX license identifiers
         </news>
         <assets>
             <icon>icon.png</icon>
         </assets>
         <platform>all</platform>
         <summary lang="en_GB">Module for interaction with the Twitch.tv API</summary>
         <description lang="en_GB">python-twitch for Kodi is module for interaction with the Twitch.tv API based on python-twitch by ingwinlu.</description>
-        <license>GNU GENERAL PUBLIC LICENSE. Version 3, 29 June 2007</license>
+        <license>GPL-3.0-only</license>
         <source>https://github.com/MrSprigster/script.module.python.twitch</source>
         <reuselanguageinvoker>true</reuselanguageinvoker>
     </extension>

addon.xml

@@ -1,3 +1,8 @@
+2.0.5
+[add] add frame rate and resolution to returned stream information
+[upd] update usher parameters
+[upd] use SPDX license identifiers
+
 2.0.4
 [fix] video/live stream token encoding
 

changelog.txt

@@ -0,0 +1,9 @@
+"""
+
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""

resources/__init__.py

@@ -1,3 +1,12 @@
+"""
+
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 __all__ = ['twitch']
 

resources/lib/__init__.py

@@ -1,4 +1,14 @@
 # -*- encoding: utf-8 -*-
+"""
+
+    Copyright (C) 2012-2016 python-twitch (https://github.com/ingwinlu/python-twitch)
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 __all__ = ['VERSION', 'CLIENT_ID', 'CLIENT_SECRET', 'OAUTH_TOKEN', 'APP_TOKEN', 'api', 'oauth',
            'exceptions', 'keys', 'log', 'methods', 'parser', 'queries', 'scraper']

resources/lib/twitch/__init__.py

@@ -1,4 +1,14 @@
 # -*- encoding: utf-8 -*-
+"""
+
+    Copyright (C) 2012-2016 python-twitch (https://github.com/ingwinlu/python-twitch)
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 __all__ = ['v5', 'default', 'helix', 'parameters', 'usher']
 

resources/lib/twitch/api/__init__.py

@@ -1,5 +1,14 @@
 # -*- encoding: utf-8 -*-
-# https://dev.twitch.tv/docs/
+"""
+    Reference: https://dev.twitch.tv/docs/
+
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 __all__ = ['analytics', 'bits', 'clips', 'entitlements', 'games', 'streams', 'users', 'videos', 'webhooks']
 

resources/lib/twitch/api/helix/__init__.py

@@ -1,5 +1,14 @@
 # -*- encoding: utf-8 -*-
-# https://dev.twitch.tv/docs/api/reference
+"""
+    Reference: https://dev.twitch.tv/docs/api/reference
+
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 from ..parameters import IntRange, Cursor, ReportType
 from ... import keys

resources/lib/twitch/api/helix/analytics.py

@@ -1,5 +1,14 @@
 # -*- encoding: utf-8 -*-
-# https://dev.twitch.tv/docs/api/reference
+"""
+    Reference: https://dev.twitch.tv/docs/api/reference
+
+    Copyright (C) 2016-2018 script.module.python.twitch
+
+    This file is part of script.module.python.twitch
+
+    SPDX-License-Identifier: GPL-3.0-only
+    See LICENSES/GPL-3.0-only for more information.
+"""
 
 from ..parameters import PeriodHelix, IntRange
 from ... import keys