Skip to content

Commit 6241194

Browse files
Corrige warning deprecated path() dans la réforme epci_test_factory (#190)
1 parent d93b34d commit 6241194

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Changelog
2+
## [6.7.1] - 2023-11-21
3+
4+
_Pour les changements détaillés et les discussions associées, référencez la pull request [#190](https://github.com/openfisca/openfisca-france-local/pull/190)
5+
6+
### Fixed
7+
8+
- Corrige le warning lié à l'utilisation de `ressource.path()` dans la réforme `epci_test_factory`
29

310
## [6.7.0] - 2023-11-15
411

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
# -*- coding: utf-8 -*-
22
from openfisca_france.model.base import Variable, Menage, MONTH
33
from openfisca_core import reforms
4-
from numpy.core.defchararray import startswith
54

65
import pandas as pd
7-
from importlib import resources
6+
87

98
def epci_test_factory(groups, code):
10-
group = groups.get_group(code)
11-
code_communes = group['insee'].values
12-
raison_sociale = group['raison_sociale'].values[0]
9+
group = groups.get_group(code)
10+
code_communes = group['insee'].values
11+
raison_sociale = group['raison_sociale'].values[0]
1312

14-
class NewEPCITestClass(Variable):
15-
value_type = bool
16-
entity = Menage
17-
definition_period = MONTH
18-
label = u"Ménage dans une commune de l'EPCI %s" % raison_sociale
13+
class NewEPCITestClass(Variable):
14+
value_type = bool
15+
entity = Menage
16+
definition_period = MONTH
17+
label = u"Ménage dans une commune de l'EPCI %s" % raison_sociale
1918

20-
def formula(menage, period):
21-
depcom = menage('depcom', period)
22-
return sum([depcom == code for code in code_communes])
19+
def formula(menage, period):
20+
depcom = menage('depcom', period)
21+
return sum([depcom == code for code in code_communes])
2322

24-
NewEPCITestClass.__name__ = "menage_dans_epci_siren_%i" % code
25-
return NewEPCITestClass
23+
NewEPCITestClass.__name__ = "menage_dans_epci_siren_%i" % code
24+
return NewEPCITestClass
2625

2726

2827
class epci_reform(reforms.Reform):
2928
def apply(self):
30-
with resources.path('openfisca_france_local', 'epcicom2020.xlsx') as filepath:
31-
raw = pd.read_excel(filepath)
29+
raw = pd.read_excel('openfisca_france_local/epcicom2020.xlsx')
3230
raw.insee = raw.insee.astype('|S5')
3331
df = raw[['siren', 'insee', 'raison_sociale']].groupby('siren')
3432

3533
for siren in df.groups:
36-
self.add_variable(epci_test_factory(df, siren))
34+
self.add_variable(epci_test_factory(df, siren))

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
setup(
55
name='OpenFisca-France-Local',
6-
version='6.7.0',
6+
version='6.7.1',
77
author='OpenFisca Team',
88
author_email='[email protected]',
99
classifiers=[
@@ -33,7 +33,6 @@
3333
'nose',
3434
],
3535
'excel-reader': [
36-
'xlrd == 1.2.0',
3736
'openpyxl == 3.1.2',
3837
]
3938
},

0 commit comments

Comments
 (0)