Merge pull request #518 from alan-turing-institute/develop

Recent Development
alan-turing-institute · Oct 13, 2022 · b208c89 · b208c89
2 parents ed9dec2 + 380af8f
commit b208c89
Show file tree

Hide file tree

Showing 77 changed files with 9,212 additions and 5,848 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
     rev: 22.3.0
     hooks:
     - id: black
-      language_version: python3.8
+      language_version: python3.9
 -   repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2
     hooks:

diff --git a/airsenal/api/app.py b/airsenal/api/app.py
@@ -37,7 +37,7 @@ def get_session_id():
     it exists, otherwise just get a default string, which
     will enable us to test some functionality just via python requests.
     """
-    print("Session keys {}".format(session.keys()))
+    print(f"Session keys {session.keys()}")
     if "key" in session.keys():
         return session["key"]
     else:

diff --git a/airsenal/api/session_example.py b/airsenal/api/session_example.py
@@ -8,7 +8,7 @@
 @app.route("/visits-counter/")
 def visits():
     session["visits"] = (session.get("visits") + 1) if "visits" in session else 1
-    return "Total visits: {}".format(session.get("visits"))
+    return f"Total visits: {session.get('visits')}"
 
 
 @app.route("/delete-visits/")

diff --git a/airsenal/conftest.py b/airsenal/conftest.py
@@ -18,6 +18,7 @@
 from airsenal.tests.resources import dummy_players  # noqa: E402
 
 API_SESSION_ID = "TESTSESSION"
+TEST_PAST_SEASON = "2021"
 
 testengine_dummy = create_engine(f"sqlite:///{env.AIRSENAL_HOME}/test.db")
 
@@ -92,11 +93,11 @@ def fill_players():
             p.player_id = i
             p.fpl_api_id = i
             p.name = n
-            print("Filling {} {}".format(i, n))
+            print(f"Filling {i} {n}")
             try:
                 ts.add(p)
             except Exception:
-                print("Error adding {} {}".format(i, n))
+                print(f"Error adding {i} {n}")
             # now fill player_attributes
             if i % 15 < 2:
                 pos = "GK"

diff --git a/airsenal/data/absences_1516.csv b/airsenal/data/absences_1516.csv
diff --git a/airsenal/data/absences_1617.csv b/airsenal/data/absences_1617.csv
diff --git a/airsenal/data/absences_1718.csv b/airsenal/data/absences_1718.csv
diff --git a/airsenal/data/absences_1819.csv b/airsenal/data/absences_1819.csv
diff --git a/airsenal/data/absences_1920.csv b/airsenal/data/absences_1920.csv
diff --git a/airsenal/data/absences_2021.csv b/airsenal/data/absences_2021.csv
diff --git a/airsenal/data/absences_2122.csv b/airsenal/data/absences_2122.csv
diff --git a/airsenal/data/alternative_player_names.csv b/airsenal/data/alternative_player_names.csv
@@ -1,18 +1,18 @@
-Emerson Leite de Souza Junior,Emerson Aparecido Leite de Souza Junior
+Emerson Leite de Souza Junior,Emerson Aparecido Leite de Souza Junior,Emerson Royal
 Pablo Fornals Malla,Pablo Fornals
-Bernardo Veiga de Carvalho e Silva,Bernardo Mota Veiga de Carvalho e Silva
+Bernardo Veiga de Carvalho e Silva,Bernardo Mota Veiga de Carvalho e Silva,Bernardo Silva
 Moisés Caicedo Corozo,Moisés Caicedo
-Lyanco Silveira Neves Vojnovic,Lyanco Evangelista Silveira Neves Vojnovic
-Diogo Dalot Teixeira,José Diogo Dalot Teixeira
+Lyanco Silveira Neves Vojnovic,Lyanco Evangelista Silveira Neves Vojnovic,Lyanco
+Diogo Dalot Teixeira,José Diogo Dalot Teixeira,Diogo Dalot
 Jeremy Sarmiento Morante,Jeremy Sarmiento
-Son Heung-min,Heung-Min Son
+Son Heung-min,Heung-Min Son,Heung-min Son
 Asmir Begović,Asmir Begovic
-Gabriel Martinelli Silva,Gabriel Teodoro Martinelli Silva
+Gabriel Martinelli Silva,Gabriel Teodoro Martinelli Silva,Gabriel Martinelli
 Kaine Kesler Hayden,Kaine Hayden
 Matija Šarkić,Matija Sarkic
-Rúben da Silva Neves,Rúben Diogo da Silva Neves
+Rúben da Silva Neves,Rúben Diogo da Silva Neves,Rúben Neves
 Tino Livramento,Valentino Livramento
-Rúben Nascimento Vinagre,Rúben Gonçalo Silva Nascimento Vinagre
+Rúben Nascimento Vinagre,Rúben Gonçalo Silva Nascimento Vinagre,Rúben Vinagre
 Eddie Nketiah,Edward Nketiah
 Matt Clarke,Matthew Clarke
 Emiliano Martínez Romero,Emiliano Martínez
@@ -24,8 +24,8 @@ Roméo Lavia,Romeo Lavia
 Paulo Gazzaniga Farias,Paulo Gazzaniga
 Sergi Canós Tenés,Sergi Canós
 Cédric Alves Soares,Cédric Soares
-Junior Firpo Adames,Héctor Junior Firpo Adames
-Ricardo Barbosa Pereira,Ricardo Domingos Barbosa Pereira
+Junior Firpo Adames,Héctor Junior Firpo Adames,Junior Firpo
+Ricardo Barbosa Pereira,Ricardo Domingos Barbosa Pereira,Ricardo Pereira
 Lucas Torreira di Pascua,Lucas Torreira
 Hugo Bueno López,Hugo Bueno
 Andreas Hoelgebaum Pereira,Andreas Pereira
@@ -37,22 +37,107 @@ Miguel Almirón Rejala,Miguel Almirón
 Josh Dasilva,Pelenda Joshua Dasilva
 Joe Willock,Joseph Willock
 Josh Wilson-Esbrand,Joshua Wilson-Esbrand
-Rúben Gato Alves Dias,Rúben Santos Gato Alves Dias
+Rúben Gato Alves Dias,Rúben Santos Gato Alves Dias,Rúben Dias
 Pablo Marí Villar,Pablo Marí
-Gabriel dos Santos Magalhães,Gabriel Magalhães
+Gabriel dos Santos Magalhães,Gabriel Magalhães,Gabriel
 Ivan Neves Abreu Cavaleiro,Ivan Ricardo Neves Abreu Cavaleiro
 Adama Traoré Diarra,Adama Traoré
-Bruno Borges Fernandes,Bruno Miguel Borges Fernandes
+Bruno Borges Fernandes,Bruno Miguel Borges Fernandes,Bruno Fernandes
 Dele Alli,Bamidele Alli
-Bobby De Cordova-Reid,Bobby Decordova-Reid
-Hwang Hee-chan,Hee-Chan Hwang
+Bobby De Cordova-Reid,Bobby Decordova-Reid,Bobby Reid
+Hwang Hee-chan,Hee-Chan Hwang,Hee-chan Hwang
 Alex Telles,Alex Nicolao Telles
-André Tavares Gomes,André Filipe Tavares Gomes
+André Tavares Gomes,André Filipe Tavares Gomes,André Gomes
 Jefferson Lerma Solís,Jefferson Lerma
 Benjamin White,Ben White
 Javier Manquillo Gaitán,Javier Manquillo
 Boubacar Kamara,Aboubakar Kamara
 Facundo Pellistri Rebollo,Facundo Pellistri
 Solly March,Solomon March
 David De Gea Quintana,David de Gea
-João Cancelo,João Pedro Cavaco Cancelo
+João Cancelo,João Pedro Cavaco Cancelo
+João Pedro Junqueira de Jesus,João Pedro
+Joseph Gomez,Joe Gomez
+Gabriel Fernando de Jesus,Gabriel Jesus
+Matthew Longstaff,Matty Longstaff
+Emerson Palmieri dos Santos,Emerson
+Ederson Santana de Moraes,Ederson
+Willian Borges Da Silva,Willian
+Alisson Ramses Becker,Alisson
+José Ignacio Peleteiro Romallo,Jota Peleteiro
+Georges-Kévin Nkoudou,Georges-Kevin N'Koudou
+Joelinton Cássio Apolinário de Lira,Joelinton
+Ally Samatta,Mbwana Samatta
+Chicharito,Javier Hernández Balcázar
+Ralf Fahrmann,Ralf Fährmann
+Jay Rodriguez,Jay Rodríguez
+Isaac Success Ajayi,Isaac Success
+Pierre-Emile Højbjerg,Pierre-Emile Höjbjerg
+Robert Kenedy Nunes do Nascimento,Kenedy
+Roberto Jimenez Gago,Roberto
+José Lloyd Cholevas,José Holebas,Jose Cholevas
+Daniel Ceballos Fernández,Dani Ceballos
+Nemanja Matić,Nemanja Matic
+Lucas Rodrigues Moura da Silva,Lucas Moura
+Rodrigo Hernandez,Rodri
+Naby Keita,Naby Keïta
+Bruno André Cavaco Jordao,Bruno Jordão
+Gedson Carvalho Fernandes,Gedson Fernandes
+Arnaut Danjuma Groeneveld,Arnaut Danjuma
+Jonathan Castro Otto,Jonny Otto
+Richarlison de Andrade,Richarlison
+Etienne Capoue,Étienne Capoue
+Pedro Rodríguez Ledesma,Pedro
+Francisco Femenía Far,Kiko Femenía
+Pedro Lomba Neto,Pedro Neto
+Çaglar Söyüncü,Caglar Söyüncü
+Daniel Drinkwater,Danny Drinkwater
+Tanguy Ndombele,Tanguy Ndombélé
+Bernardo Fernandes da Silva Junior,Bernardo
+Bernard Anício Caldeira Duarte,Bernard
+Johann Berg Gudmundsson,Jóhann Berg Gudmundsson
+Ezri Konsa Ngoyo,Ezri Konsa
+Felipe Anderson Pereira Gomes,Felipe Anderson
+Eric Garcia,Eric García
+Wesley Moraes,Wesley
+José Reina,Pepe Reina
+Fabio Henrique Tavares,Fabinho
+Daniel Castelo Podence,Daniel Podence
+Fernando Luiz Rosa,Fernandinho
+Cristiano Ronaldo dos Santos Aveiro,Cristiano Ronaldo
+Francisco Machado Mota de Castro Trincão,Francisco Trincão
+Josh Sargent,Joshua Sargent
+Fabio Silva,Fábio Silva
+Ahmed El Mohamady,Ahmed Elmohamady
+Francisco Casilla Cortés,Kiko Casilla
+Rodrigo Moreno,Rodrigo
+David Raya Martin,David Raya
+Yerson Mosquera Valdelamar,Yerson Mosquera
+Thiago Emiliano da Silva,Thiago Silva
+Philippe Coutinho,Philippe Coutinho Correia
+Ørjan Nyland,Örjan Nyland
+Ian Carlo Poveda-Ocampo,Ian Poveda
+Willian José Da Silva,Willian José
+Abdul Rahman Baba,Abdul-Rahman Baba
+Daniel N'Lundulu,Dan N'Lundulu
+Adrián San Miguel del Castillo,Adrián
+Marek Rodák,Marek Rodak
+Douglas Luiz Soares de Paulo,Douglas Luiz
+Mahmoud Ahmed Ibrahim Hassan,Trezeguet
+Che Adams,Ché Adams
+Carlos Vinicius Alves Morais,Carlos Vinícius
+David Luiz Moreira Marinho,David Luiz
+Allan Marques Loureiro,Allan
+Fernando Marçal,Marçal
+Thiago Alcántara do Nascimento,Thiago
+Oriol Romeu Vidal,Oriol Romeu
+Nicolas Nkoulou,Nicolas N'Koulou
+Vitalii Mykolenko,Vitaliy Mykolenko
+Raphael Dias Belloli,Raphinha
+José Malheiro de Sá,José Sá
+Pablo Hernández Domínguez,Pablo Hernández
+Oluwasemilogo Adesewo Ibidapo Ajayi,Semi Ajayi
+Frederico Rodrigues de Paula Santos,Fred
+Jorge Luiz Frello Filho,Jorginho
+Rui Pedro dos Santos Patrício,Rui Patrício
+Zeze Steven Sessegnon,Steven Sessegnon