Merge branch 'master' of https://github.com/Adarnof/allianceauth into sso_registration

# Conflicts:
#	alliance_auth/__init__.py
#	corputils/models.py
#	corputils/views.py
#	eveonline/tasks.py
#	fleetactivitytracking/views.py
#	hrapplications/admin.py
#	requirements.txt

corputils/models.py

@@ -9,6 +9,10 @@ from authentication.models import CharacterOwnership, UserProfile
 from bravado.exception import HTTPForbidden
 from corputils.managers import CorpStatsManager
 import logging
+import os
+
+
+SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +39,7 @@ class CorpStats(models.Model):
 
     def update(self):
         try:
-            c = self.token.get_esi_client(Character='v4', Corporation='v2')
+            c = self.token.get_esi_client(spec_file=SWAGGER_SPEC_PATH)
             assert c.Character.get_characters_character_id(character_id=self.token.character_id).result()[
                        'corporation_id'] == int(self.corp.corporation_id)
             members = c.Corporation.get_corporations_corporation_id_members(
@@ -46,7 +50,6 @@ class CorpStats(models.Model):
             # the swagger spec doesn't have a maxItems count
             # manual testing says we can do over 350, but let's not risk it
             member_id_chunks = [member_ids[i:i + 255] for i in range(0, len(member_ids), 255)]
-            c = self.token.get_esi_client(Character='v1')  # ccplease bump versions of whole resources
             member_name_chunks = [c.Character.get_characters_names(character_ids=id_chunk).result() for id_chunk in
                                   member_id_chunks]
             member_list = {}

corputils/views.py

@@ -10,6 +10,9 @@ from eveonline.managers import EveManager
 from corputils.models import CorpStats
 from esi.decorators import token_required
 from bravado.exception import HTTPError
+import os
+
+SWAGGER_SPEC_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'swagger.json')
 
 
 def access_corpstats_test(user):
@@ -27,7 +30,7 @@ def corpstats_add(request, token):
             corp_id = EveCharacter.objects.get(character_id=token.character_id).corporation_id
         else:
             corp_id = \
-                token.get_esi_client(Character='v4').Character.get_characters_character_id(
+                token.get_esi_client(spec_file=SWAGGER_SPEC_PATH).Character.get_characters_character_id(
                     character_id=token.character_id).result()['corporation_id']
         try:
             corp = EveCorporationInfo.objects.get(corporation_id=corp_id)