7 - Update game data api's

Author: lockwooddev

.drone.yml

@@ -1,24 +1,43 @@
 ---
 kind: pipeline
-name: default
+name: python27
 
 steps:
-- name: build27
+- name: test
   image: python:2.7-alpine3.8
   commands:
     - ./drone.sh
+    - pytest -c pytest_legacy.ini
 
-- name: build35
+---
+kind: pipeline
+name: python35
+
+steps:
+- name: test
   image: python:3.5-alpine3.8
   commands:
     - ./drone.sh
+    - pytest -c pytest_legacy.ini
+
+---
+kind: pipeline
+name: python36
 
-- name: build36
+steps:
+- name: test
   image: python:3.6-alpine3.8
   commands:
     - ./drone.sh
+    - pytest
+
+---
+kind: pipeline
+name: python37
 
-- name: build37
+steps:
+- name: test
   image: python:3.7-alpine3.8
   commands:
     - ./drone.sh
+    - pytest

CHANGELOG.md

@@ -14,7 +14,11 @@
 * Bump requests library to 2.20.1
 * Change packaging with setup.py
 
-## 2.1.0 (TBD)
+## 2.1.0 (13-12-2018)
 
 * Add Game Data API methods
 * Token handling per region
+
+## 2.2.0 (25-12-2018)
+
+* Add new Game Data API's

Makefile

@@ -2,7 +2,7 @@
 
 
 tests:
-	py.test -s -v tests
+	pytest -s -v tests
 
 devinstall:
 	pip install -e .

README.md

@@ -72,5 +72,5 @@ api.get_data_resource('https://eu.api.blizzard.com/data/wow/connected-realm/509?
 ```bash
 pip install -e .
 pip install -e .[tests]
-py.test
+pytest
 ```

drone.sh

@@ -1,7 +1,6 @@
-python setup.py sdist bdist_wheel
-rm -rf dist
-rm -rf build
+apk --update upgrade
+apk add make
+make build
 pip install --upgrade pip
 pip install -e .
 pip install -e .[tests]
-py.test

pytest.ini

@@ -1,16 +1,13 @@
 [pytest]
-addopts = -vs --tb=short --pep8 --flakes --cov=wowapi --cov-config .coveragerc
+addopts = -vs --tb=short --codestyle --cov=wowapi --cov-config .coveragerc
 
 python_files =
     test_*.py
 
-pep8maxlinelength = 99
-norecursedirs = env/* docs/*
+norecursedirs =
+    env/*
+    docs/*
 
-pep8ignore =
-    docs/* ALL
-    wowapi/__init__.py ALL
-
-flakes-ignore =
-    docs/* ALL
-    tests/conftest.py ALL
+codestyle_max_line_length = 99
+codestyle_exclude =
+    docs/*

pytest_legacy.ini

@@ -0,0 +1,9 @@
+[pytest]
+addopts = -vs --tb=short
+
+python_files =
+    test_*.py
+
+norecursedirs =
+    env/*
+    docs/*

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup, find_packages
 
 
-__version__ = '2.1.0'
+__version__ = '2.2.0'
 
 
 def read(*parts):
@@ -17,9 +17,8 @@ def read(*parts):
 ]
 
 test_requirements = [
-    'pytest==4.0.1',
-    'pytest-flakes==4.0.0',
-    'pytest-pep8==1.0.6',
+    'pytest==4.0.2',
+    "pytest-pycodestyle ; python_version>'3.5'",
     'pytest-cov==2.6.0',
     'mock==2.0.0',
     'pytest-mock==1.10.0',

tests/test_api.py

@@ -323,12 +323,14 @@ def test_get_pet_types(self, response_mock):
     # Game Data API tests
     # ---------------------------------------------------------------------------------------------
 
+    # Connected Realm API
+
     def test_get_connected_realms(self, response_mock):
         self.authorized_api.get_connected_realms('us', 'dynamic-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/connected-realm/', params=params)
+            'https://us.api.blizzard.com/data/wow/connected-realm/index', params=params)
 
     def test_get_connected_realm(self, response_mock):
         self.authorized_api.get_connected_realm('us', 'dynamic-us', 1)
@@ -337,23 +339,23 @@ def test_get_connected_realm(self, response_mock):
         response_mock.assert_called_with(
             'https://us.api.blizzard.com/data/wow/connected-realm/1', params=params)
 
-    def test_get_mythic_keystone_leaderboards(self, response_mock):
-        self.authorized_api.get_mythic_keystone_leaderboards('us', 'dynamic-us', 1)
+    # Mythic Keystone Affix API
+
+    def test_get_mythic_keystone_affixes(self, response_mock):
+        self.authorized_api.get_mythic_keystone_affixes('us', 'dynamic-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/connected-realm/1/mythic-leaderboard/',
-            params=params
-        )
+            'https://us.api.blizzard.com/data/wow/keystone-affix/index', params=params)
 
-    def test_get_mythic_keystone_leaderboard(self, response_mock):
-        self.authorized_api.get_mythic_keystone_leaderboard('us', 'dynamic-us', 1, 2, 3)
+    def test_get_mythic_keystone_affix(self, response_mock):
+        self.authorized_api.get_mythic_keystone_affix('us', 'dynamic-us', 3)
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/connected-realm/1/mythic-leaderboard/2/period/3',
-            params=params
-        )
+            'https://us.api.blizzard.com/data/wow/keystone-affix/3', params=params)
+
+    # Mythic Raid Leaderboard API
 
     def test_get_mythic_raid_leaderboard(self, response_mock):
         self.authorized_api.get_mythic_raid_leaderboard('us', 'dynamic-us', 'uldir', 'horde')
@@ -364,21 +366,85 @@ def test_get_mythic_raid_leaderboard(self, response_mock):
             params=params
         )
 
-    def test_get_mythic_challenge_modes(self, response_mock):
-        self.authorized_api.get_mythic_challenge_modes('us', 'dynamic-us')
+    # Mythic Keystone Dungeon API
+
+    def test_get_mythic_keystone_dungeons(self, response_mock):
+        self.authorized_api.get_mythic_keystone_dungeons('us', 'dynamic-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/dungeon/index', params=params)
+
+    def test_get_mythic_keystone_dungeon(self, response_mock):
+        self.authorized_api.get_mythic_keystone_dungeon('us', 'dynamic-us', 5)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/dungeon/5', params=params)
+
+    def test_get_mythic_keystones(self, response_mock):
+        self.authorized_api.get_mythic_keystones('us', 'dynamic-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/index', params=params)
+
+    def test_get_mythic_keystone_periods(self, response_mock):
+        self.authorized_api.get_mythic_keystone_periods('us', 'dynamic-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/period/index', params=params)
+
+    def test_get_mythic_keystone_period(self, response_mock):
+        self.authorized_api.get_mythic_keystone_period('us', 'dynamic-us', 641)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/period/641', params=params)
+
+    def test_get_mythic_keystone_seasons(self, response_mock):
+        self.authorized_api.get_mythic_keystone_seasons('us', 'dynamic-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/season/index', params=params)
+
+    def test_get_mythic_keystone_season(self, response_mock):
+        self.authorized_api.get_mythic_keystone_season('us', 'dynamic-us', 1)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/mythic-keystone/season/1', params=params)
+
+    # Mythic Keystone Leaderboard API
+
+    def test_get_mythic_keystone_leaderboards(self, response_mock):
+        self.authorized_api.get_mythic_keystone_leaderboards('us', 'dynamic-us', 1)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'dynamic-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/connected-realm/1/mythic-leaderboard/index',
+            params=params
+        )
+
+    def test_get_mythic_keystone_leaderboard(self, response_mock):
+        self.authorized_api.get_mythic_keystone_leaderboard('us', 'dynamic-us', 1, 2, 3)
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/mythic-challenge-mode/',
+            'https://us.api.blizzard.com/data/wow/connected-realm/1/mythic-leaderboard/2/period/3',
             params=params
         )
 
+    # Playable Class API
+
     def test_get_playable_classes(self, response_mock):
         self.authorized_api.get_playable_classes('us', 'static-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'static-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/playable-class/',
+            'https://us.api.blizzard.com/data/wow/playable-class/index',
             params=params
         )
 
@@ -391,12 +457,23 @@ def test_get_playable_class(self, response_mock):
             params=params
         )
 
+    def test_get_playable_class_pvp_talent_slots(self, response_mock):
+        self.authorized_api.get_playable_class_pvp_talent_slots('us', 'static-us', 7)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'static-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/playable-class/7/pvp-talent-slots',
+            params=params
+        )
+
+    # Playable Specialization API
+
     def test_get_playable_specializations(self, response_mock):
         self.authorized_api.get_playable_specializations('us', 'static-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'static-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/playable-specialization/',
+            'https://us.api.blizzard.com/data/wow/playable-specialization/index',
             params=params
         )
 
@@ -409,12 +486,54 @@ def test_get_playable_specialization(self, response_mock):
             params=params
         )
 
+    # Power Type API
+
+    def test_get_power_types(self, response_mock):
+        self.authorized_api.get_power_types('us', 'static-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'static-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/power-type/index',
+            params=params
+        )
+
+    def test_get_power_type(self, response_mock):
+        self.authorized_api.get_power_type('us', 'static-us', 0)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'static-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/power-type/0',
+            params=params
+        )
+
+    # Playable Race API
+
+    def test_get_races(self, response_mock):
+        self.authorized_api.get_races('us', 'static-us')
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'static-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/race/index',
+            params=params
+        )
+
+    def test_get_race(self, response_mock):
+        self.authorized_api.get_race('us', 'static-us', 2)
+        params = copy.deepcopy(self.params)
+        params['namespace'] = 'static-us'
+        response_mock.assert_called_with(
+            'https://us.api.blizzard.com/data/wow/race/2',
+            params=params
+        )
+
+    # Realm API
+
     def test_get_realms(self, response_mock):
         self.authorized_api.get_realms('us', 'dynamic-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/realm/',
+            'https://us.api.blizzard.com/data/wow/realm/index',
             params=params
         )
 
@@ -427,12 +546,14 @@ def test_get_realm(self, response_mock):
             params=params
         )
 
+    # Region API
+
     def test_get_regions(self, response_mock):
         self.authorized_api.get_regions('us', 'dynamic-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/region/',
+            'https://us.api.blizzard.com/data/wow/region/index',
             params=params
         )
 
@@ -445,9 +566,11 @@ def test_get_region(self, response_mock):
             params=params
         )
 
+    # WoW Token API
+
     def test_get_token(self, response_mock):
         self.authorized_api.get_token('us', 'dynamic-us')
         params = copy.deepcopy(self.params)
         params['namespace'] = 'dynamic-us'
         response_mock.assert_called_with(
-            'https://us.api.blizzard.com/data/wow/token/', params=params)
+            'https://us.api.blizzard.com/data/wow/token/index', params=params)