Python 3.11 fixes, pull in upstream

Python 3.11 fixes, pull in upstream

Author: GraylinKim

CHANGES.rst

@@ -1,3 +1,9 @@
+Version 0.3.0
+-------------
+(released on January 13th 2015)
+
+- Added support for Python3
+
 Version 0.2.0
 -------------
 (released on October 15th 2012)

README.rst

@@ -10,6 +10,14 @@ For more details on how the algorithm works, see
 
 http://www.moserware.com/2010/03/computing-your-skill.html
 
+To install run the command::
+
+    pip install skills
+
+The match quality function of TrueSkill will run much faster with NumPy than with the provided matrix implementation.  Install with::
+
+    pip install numpy
+
 For details on how to use this project, see the accompanying unit tests with
 this project.  You can run the tests by running the commands::
 

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='skills',
-    version='0.2.0',
+    version='0.3.0',
     author='Scott Hamilton',
     author_email='mcleopold@gmail.com',
     packages=['skills',
@@ -15,12 +15,14 @@
     description='Implementation of the TrueSkill, Glicko'
                 ' and Elo Ranking Algorithms',
     long_description=open('README.rst').read(),
+    keywords='skill trueskill glicko elo',
     classifiers=[
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Other Environment',
         'Intended Audience :: Developers',
         'Intended Audience :: Science/Research',

skills/__init__.py

@@ -1,7 +1,6 @@
 """Ranking calculators implementing the Elo, Glicko and TrueSkill algorithms."""
-from __future__ import absolute_import
+from collections.abc import Sequence
 
-from collections import Sequence
 from skills.numerics import Gaussian
 
 
@@ -40,6 +39,7 @@ class Match(list):
     """Match is a list of Team objects"""
 
     def __init__(self, teams=None, rank=None):
+        super().__init__()
         if teams is not None:
             for team in teams:
                 self.append(Team.ensure_team(team))
@@ -87,14 +87,14 @@ def player_rating(self):
             for player_rating in team.player_rating():
                 yield player_rating
 
-    def sort(self):
+    def sort(self, **kwargs):
         """
         Performs an in-place sort of the items in accordance to the ranks in non-decreasing order
         """
         if not self.rank:
             raise AttributeError("Match does not have a ranking")
 
-        rank_sorted, teams_sorted = map(list, zip(*sorted(zip(self.rank, self))))
+        rank_sorted, teams_sorted = map(list, zip(*sorted(zip(self.rank, self), key=lambda x: x[0])))
 
         if rank_sorted != self.rank:
             # in-place update part
@@ -126,6 +126,7 @@ class Matches(list):
     """Matches is a list of Match objects"""
 
     def __init__(self, matches):
+        super().__init__()
         for match in matches:
             self.append(Match.ensure_match(match))
 
@@ -194,9 +195,7 @@ def __init__(self, players=None):
             # or 1 list of player, rating tuples
             team = Team([(player1, rating1), (player2, rating2)])
         """
-        self.players = self.keys
-        self.ratings = self.values
-        self.player_rating = self.items
+        super().__init__()
         if players is not None:
             try:
                 player_rating_tuples = players.items()
@@ -209,6 +208,15 @@ def __init__(self, players=None):
             except (TypeError, ValueError):
                 raise TypeError("Improper player dict or list")
 
+    def players(self):
+        return list(self.keys())
+
+    def ratings(self):
+        return list(self.values())
+
+    def player_rating(self):
+        return list(self.items())
+
     def add_player(self, player, rating):
         self[Player.ensure_player(player)] = RatingFactory.ensure_rating(rating)
         return self
@@ -237,6 +245,13 @@ def ensure_team(team):
         else:
             return team
 
+    def __lt__(self, other):
+        """
+        In python3, you can't order dicts anymore. Since we do that in Match.sort
+        we'll define a custom team sort based on the current contents for consistency
+        """
+        return frozenset(self.items()) < frozenset(other.items())
+
 
 class Rating(object):
     """
@@ -250,14 +265,14 @@ def __init__(self, mean):
             raise ValueError("Rating mean value must be numeric")
 
     def __repr__(self):
-        return "Rating(%s)" % (self.mean)
+        return "Rating(%s)" % self.mean
 
     def __str__(self):
-        return "mean=%.5f" % (self.mean)
+        return "mean=%.5f" % self.mean
 
     @staticmethod
     def ensure_rating(rating):
-        if (not hasattr(rating, 'mean')):
+        if not hasattr(rating, 'mean'):
             try:
                 return Rating(rating)
             except TypeError:
@@ -275,8 +290,9 @@ class RatingFactory(object):
 
     rating_class = Rating
 
-    def __new__(cls):
-        return RatingFactory.rating_class()
+    # def __new__(cls):
+    #     TODO: Rating ctor requires a param
+    #     return RatingFactory.rating_class()
 
     @staticmethod
     def ensure_rating(rating):

skills/elo.py

@@ -1,6 +1,4 @@
-from __future__ import absolute_import
-
-from collections import Sequence
+from collections.abc import Sequence
 
 from skills import (
     Calculator,

skills/factorgraph.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-
-
 class Factor(object):
 
     def __init__(self, name):

skills/glicko.py

@@ -1,6 +1,5 @@
-from __future__ import absolute_import
-
-from collections import Sequence, defaultdict
+from collections import defaultdict
+from collections.abc import Sequence
 from math import sqrt, log, pi
 
 from skills import (

skills/matrix.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-
-
 class MatrixError(Exception):
     pass
 
@@ -10,14 +7,15 @@ class Matrix(list):
     ERROR_TOLERANCE = 0.00000000000001
 
     def __init__(self, data):
+        super().__init__()
         rows = len(data)
         cols = len(data[0]) if rows > 0 else 0
         self.shape = rows, cols
         for row in data:
             self.append(row[:])
 
     def transpose(self):
-        return Matrix(map(lambda * row: list(row), *self))
+        return Matrix(list(map(lambda * row: list(row), *self)))
 
     def is_square(self):
         return self.shape[0] == self.shape[1] and self.shape[0] > 0

skills/numerics.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from math import sqrt, pi, log, exp
 
 try:
@@ -132,7 +130,7 @@ def log_product_normalization(left, right):
 
         return -LOG_SQRT_2_PI - (log(variance_sum) / 2.0) - ((mean_difference ** 2.0) / (2.0 * variance_sum))
 
-    def __div__(self, other):
+    def __truediv__(self, other):
         return Gaussian.from_precision_mean(
             self.precision_mean - other.precision_mean,
             self.precision - other.precision)