diff --git a/docs/conf.py b/docs/conf.py index decfd68..d1dcf75 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -32,7 +32,7 @@ author = 'Lilian Besson, Bastien Trotobas et al' # The short X.Y version -version = '0.0.1' +version = '0.2' # The full version, including alpha/beta/rc tags release = 'alpha' diff --git a/logs/ordreappel-4-2_tests.txt b/logs/ordreappel-4-2_tests.txt index ff5e881..ff8241e 100644 --- a/logs/ordreappel-4-2_tests.txt +++ b/logs/ordreappel-4-2_tests.txt @@ -1838,4 +1838,4 @@ Feature: Algorithme de calcul de l'ordre d'appel section 4.2 # ordreappel-4-2.fe 1 feature passed, 0 failed, 0 skipped 260 scenarios passed, 0 failed, 0 skipped 1300 steps passed, 0 failed, 0 skipped, 0 undefined -Took 0m0.181s +Took 0m0.212s diff --git a/logs/pylint3_log.txt b/logs/pylint3_log.txt index 85b21c9..4d0679e 100644 --- a/logs/pylint3_log.txt +++ b/logs/pylint3_log.txt @@ -10,13 +10,13 @@ Statistics by type +---------+-------+-----------+-----------+------------+---------+ |type |number |old number |difference |%documented |%badname | +=========+=======+===========+===========+============+=========+ -|module |19 |19 |= |NC |NC | +|module |19 |1 |+18.00 |NC |NC | +---------+-------+-----------+-----------+------------+---------+ -|class |28 |28 |= |NC |NC | +|class |28 |1 |+27.00 |NC |NC | +---------+-------+-----------+-----------+------------+---------+ -|method |0 |0 |= |0 |0 | +|method |0 |7 |-7.00 |0 |0 | +---------+-------+-----------+-----------+------------+---------+ -|function |0 |0 |= |0 |0 | +|function |0 |3 |-3.00 |0 |0 | +---------+-------+-----------+-----------+------------+---------+ @@ -27,13 +27,13 @@ Raw metrics +----------+-------+------+---------+-----------+ |type |number |% |previous |difference | +==========+=======+======+=========+===========+ -|code |1551 |58.55 |1560 |-9.00 | +|code |1551 |58.55 |NC |NC | +----------+-------+------+---------+-----------+ -|docstring |395 |14.91 |395 |= | +|docstring |395 |14.91 |NC |NC | +----------+-------+------+---------+-----------+ -|comment |283 |10.68 |282 |+1.00 | +|comment |283 |10.68 |NC |NC | +----------+-------+------+---------+-----------+ -|empty |420 |15.86 |420 |= | +|empty |420 |15.86 |NC |NC | +----------+-------+------+---------+-----------+ @@ -57,18 +57,18 @@ Messages by category +-----------+-------+---------+-----------+ |type |number |previous |difference | +===========+=======+=========+===========+ -|convention |0 |0 |= | +|convention |0 |10 |-10.00 | +-----------+-------+---------+-----------+ -|refactor |0 |0 |= | +|refactor |0 |2 |-2.00 | +-----------+-------+---------+-----------+ -|warning |0 |0 |= | +|warning |0 |13 |-13.00 | +-----------+-------+---------+-----------+ -|error |0 |0 |= | +|error |0 |1 |-1.00 | +-----------+-------+---------+-----------+ --------------------------------------------------------------------- -Your code has been rated at 10.00/10 (previous run: 10.00/10, +0.00) +------------------------------------------------------------------- +Your code has been rated at 10.00/10 (previous run: 8.62/10, +1.38) diff --git a/logs/pylint_log.txt b/logs/pylint_log.txt index 8d28bfd..44c6ec7 100644 --- a/logs/pylint_log.txt +++ b/logs/pylint_log.txt @@ -247,13 +247,13 @@ Statistics by type +---------+-------+-----------+-----------+------------+---------+ |type |number |old number |difference |%documented |%badname | +=========+=======+===========+===========+============+=========+ -|module |19 |19 |= |100.00 |0.00 | +|module |19 |1 |+18.00 |100.00 |0.00 | +---------+-------+-----------+-----------+------------+---------+ -|class |28 |28 |= |100.00 |39.29 | +|class |28 |6 |+22.00 |100.00 |39.29 | +---------+-------+-----------+-----------+------------+---------+ -|method |102 |101 |+1.00 |98.04 |44.12 | +|method |102 |10 |+92.00 |98.04 |44.12 | +---------+-------+-----------+-----------+------------+---------+ -|function |23 |23 |= |65.22 |34.78 | +|function |23 |3 |+20.00 |65.22 |34.78 | +---------+-------+-----------+-----------+------------+---------+ @@ -305,13 +305,13 @@ Raw metrics +----------+-------+------+---------+-----------+ |type |number |% |previous |difference | +==========+=======+======+=========+===========+ -|code |1551 |58.55 |1560 |-9.00 | +|code |1551 |58.55 |NC |NC | +----------+-------+------+---------+-----------+ -|docstring |395 |14.91 |395 |= | +|docstring |395 |14.91 |NC |NC | +----------+-------+------+---------+-----------+ -|comment |283 |10.68 |282 |+1.00 | +|comment |283 |10.68 |NC |NC | +----------+-------+------+---------+-----------+ -|empty |420 |15.86 |420 |= | +|empty |420 |15.86 |NC |NC | +----------+-------+------+---------+-----------+ @@ -335,13 +335,13 @@ Messages by category +-----------+-------+---------+-----------+ |type |number |previous |difference | +===========+=======+=========+===========+ -|convention |73 |85 |-12.00 | +|convention |73 |8 |+65.00 | +-----------+-------+---------+-----------+ -|refactor |15 |15 |= | +|refactor |15 |0 |+15.00 | +-----------+-------+---------+-----------+ -|warning |28 |31 |-3.00 | +|warning |28 |3 |+25.00 | +-----------+-------+---------+-----------+ -|error |2 |2 |= | +|error |2 |0 |+2.00 | +-----------+-------+---------+-----------+ @@ -440,5 +440,5 @@ Messages ------------------------------------------------------------------ -Your code has been rated at 9.05/10 (previous run: 8.93/10, +0.12) +Your code has been rated at 9.05/10 (previous run: 9.45/10, -0.40) diff --git a/parcoursup/__init__.py b/parcoursup/__init__.py index cb75dc4..ffc75e1 100644 --- a/parcoursup/__init__.py +++ b/parcoursup/__init__.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" # from .ordreappel import * # from .propositions import * diff --git a/parcoursup/ordreappel/AlgoOrdreAppel.py b/parcoursup/ordreappel/AlgoOrdreAppel.py index c5d8d51..cb8f38d 100644 --- a/parcoursup/ordreappel/AlgoOrdreAppel.py +++ b/parcoursup/ordreappel/AlgoOrdreAppel.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" import xml.etree.ElementTree as ET from pprint import pprint # DEBUG diff --git a/parcoursup/ordreappel/GroupeClassement.py b/parcoursup/ordreappel/GroupeClassement.py index f57da9c..4ec93d6 100644 --- a/parcoursup/ordreappel/GroupeClassement.py +++ b/parcoursup/ordreappel/GroupeClassement.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import List, Dict diff --git a/parcoursup/ordreappel/OrdreAppel.py b/parcoursup/ordreappel/OrdreAppel.py index 699fcac..02bf555 100644 --- a/parcoursup/ordreappel/OrdreAppel.py +++ b/parcoursup/ordreappel/OrdreAppel.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" # XXX Pour utiliser l'implémentation dans scipy.stats diff --git a/parcoursup/ordreappel/VoeuClasse.py b/parcoursup/ordreappel/VoeuClasse.py index 1ce9b39..11dafa3 100644 --- a/parcoursup/ordreappel/VoeuClasse.py +++ b/parcoursup/ordreappel/VoeuClasse.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from functools import total_ordering from enum import Enum diff --git a/parcoursup/ordreappel/__init__.py b/parcoursup/ordreappel/__init__.py index 43fc36a..202304c 100755 --- a/parcoursup/ordreappel/__init__.py +++ b/parcoursup/ordreappel/__init__.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" if __name__ == '__main__': diff --git a/parcoursup/ordreappel/exemples.py b/parcoursup/ordreappel/exemples.py index c3615a0..913c4f1 100644 --- a/parcoursup/ordreappel/exemples.py +++ b/parcoursup/ordreappel/exemples.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" import json from os import path diff --git a/parcoursup/propositions/AlgoPropositions.py b/parcoursup/propositions/AlgoPropositions.py index 7b3d06b..6b86721 100644 --- a/parcoursup/propositions/AlgoPropositions.py +++ b/parcoursup/propositions/AlgoPropositions.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" import xml.etree.ElementTree as ET from pprint import pprint # DEBUG diff --git a/parcoursup/propositions/Candidat.py b/parcoursup/propositions/Candidat.py index afe97d7..4f0a856 100644 --- a/parcoursup/propositions/Candidat.py +++ b/parcoursup/propositions/Candidat.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" class Candidat(object): diff --git a/parcoursup/propositions/Etablissement.py b/parcoursup/propositions/Etablissement.py index 5f44525..fb1d77a 100644 --- a/parcoursup/propositions/Etablissement.py +++ b/parcoursup/propositions/Etablissement.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import List, Dict, Union, Set from random import random, randint, choice diff --git a/parcoursup/propositions/GroupeAffectation.py b/parcoursup/propositions/GroupeAffectation.py index e6b4784..858adbf 100644 --- a/parcoursup/propositions/GroupeAffectation.py +++ b/parcoursup/propositions/GroupeAffectation.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import Set, List diff --git a/parcoursup/propositions/GroupeAffectationUID.py b/parcoursup/propositions/GroupeAffectationUID.py index 911859a..94a0c83 100644 --- a/parcoursup/propositions/GroupeAffectationUID.py +++ b/parcoursup/propositions/GroupeAffectationUID.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" class GroupeAffectationUID(object): diff --git a/parcoursup/propositions/GroupeInternat.py b/parcoursup/propositions/GroupeInternat.py index 72a87e1..5891785 100644 --- a/parcoursup/propositions/GroupeInternat.py +++ b/parcoursup/propositions/GroupeInternat.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import Set, List diff --git a/parcoursup/propositions/GroupeInternatUID.py b/parcoursup/propositions/GroupeInternatUID.py index d191274..dd44864 100644 --- a/parcoursup/propositions/GroupeInternatUID.py +++ b/parcoursup/propositions/GroupeInternatUID.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" class GroupeInternatUID(object): diff --git a/parcoursup/propositions/VerificationsResultats.py b/parcoursup/propositions/VerificationsResultats.py index de0b285..a28d7f6 100644 --- a/parcoursup/propositions/VerificationsResultats.py +++ b/parcoursup/propositions/VerificationsResultats.py @@ -12,7 +12,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import Dict, Set from datetime import datetime diff --git a/parcoursup/propositions/VoeuEnAttente.py b/parcoursup/propositions/VoeuEnAttente.py index 1eca974..0498d44 100644 --- a/parcoursup/propositions/VoeuEnAttente.py +++ b/parcoursup/propositions/VoeuEnAttente.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" from typing import Union try: diff --git a/parcoursup/propositions/VoeuUID.py b/parcoursup/propositions/VoeuUID.py index c3f54de..2d92e78 100644 --- a/parcoursup/propositions/VoeuUID.py +++ b/parcoursup/propositions/VoeuUID.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" class VoeuUID(object): diff --git a/parcoursup/propositions/__init__.py b/parcoursup/propositions/__init__.py index 97223fe..e3bfdbe 100755 --- a/parcoursup/propositions/__init__.py +++ b/parcoursup/propositions/__init__.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" if __name__ == '__main__': diff --git a/parcoursup/propositions/exemples.py b/parcoursup/propositions/exemples.py index fb613e2..940b693 100644 --- a/parcoursup/propositions/exemples.py +++ b/parcoursup/propositions/exemples.py @@ -7,7 +7,7 @@ - Licence : MIT License (http://lbesson.mit-license.org). """ __author__ = "Lilian Besson, Bastien Trotobas et al" -__version__ = "0.0.1" +__version__ = "0.2" import json from os import path diff --git a/setup.py b/setup.py index b0b2c46..c38a310 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ # print("Using a long_description of length,", len(long_description), "from file", README) # DEBUG -version = "0.1" +version = "0.2" try: from parcoursup import __version__ as version except ImportError: @@ -35,7 +35,7 @@ print("Are you sure you are building in the correct folder?") # FIXME revert when done uploading the first version to PyPI -# version = "0.0.1.dev9" +version = "0.1.dev9" setup(name="parcoursup", @@ -83,8 +83,8 @@ 'LICENSE', 'README.md', # FIXME add the xml data used in the tests - 'donnes/*.xml', - 'donnes/*.json', + 'donnees/*.xml', + 'donnees/*.json', ] }, # project_urls={ # Optional