Merge pull request #507 from open5e/staging

Release 1.6.1

api_v2/serializers/creature.py

@@ -97,6 +97,16 @@ def make_action_obj(action):
     return obj
 
 
+class CreatureTypeSerializer(GameContentSerializer):
+    '''Serializer for the Creature Type object'''
+    key = serializers.ReadOnlyField()
+
+    class Meta:
+        '''Meta options for serializer.'''
+        model = models.CreatureType
+        fields = '__all__'
+
+
 class CreatureSerializer(GameContentSerializer):
     '''The serializer for the Creature object.'''
 
@@ -108,7 +118,6 @@ class CreatureSerializer(GameContentSerializer):
     skill_bonuses = serializers.SerializerMethodField()
     skill_bonuses_all = serializers.SerializerMethodField()
     actions = serializers.SerializerMethodField()
-    size = SizeSerializer(read_only=True, context={'request': {}})
     speed = serializers.SerializerMethodField()
     speed_all = serializers.SerializerMethodField()
     challenge_rating_text = serializers.SerializerMethodField()
@@ -230,15 +239,6 @@ def get_challenge_rating_text(self, creature):
     def get_experience_points(self, creature):
         return creature.experience_points
 
-class CreatureTypeSerializer(GameContentSerializer):
-    '''Serializer for the Creature Type object'''
-    key = serializers.ReadOnlyField()
-
-    class Meta:
-        '''Meta options for serializer.'''
-        model = models.CreatureType
-        fields = '__all__'
-
 
 class CreatureSetSerializer(GameContentSerializer):
     '''Serializer for the Creature Set object'''

api_v2/serializers/item.py

@@ -41,10 +41,6 @@ class Meta:
 class ItemSerializer(GameContentSerializer):
     key = serializers.ReadOnlyField()
     is_magic_item = serializers.ReadOnlyField()
-    weapon = WeaponSerializer(read_only=True, context={'request': {}})
-    size = SizeSerializer(read_only=True, context={'request': {}})
-    armor = ArmorSerializer(read_only=True, context={'request': {}})
-    rarity = ItemRaritySerializer(read_only=True, context={'request': {}})
 
     class Meta:
         model = models.Item