Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ pynsee.egg-info
settings.json
.coverage
.venv/
uv.lock
.vscode/
notebooks/
*.html
*.pyc
*.rtc
Expand Down
Binary file added docs/_static/internet_usage_melodi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

import pynsee


# -- Project information -----------------------------------------------------

project = "pynsee"
Expand Down Expand Up @@ -82,6 +81,7 @@
"examples/example_cadre_iris_idf": "_static/upper_middle_class_worker_idf.png",
"examples/example_marie_firstname": "_static/firstname.png",
"examples/example_rp_logement_2017": "_static/housing.png",
"examples/example_internet_usage_melodi": "_static/internet_usage_melodi.png",
}


Expand Down
1 change: 1 addition & 0 deletions docs/examples.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ Examples
examples/example_doctors_idf.ipynb
examples/example_automotive_industry_sirene.ipynb
examples/example_commute_paris.ipynb
examples/example_internet_usage_melodi.ipynb
758 changes: 758 additions & 0 deletions docs/examples/example_internet_usage_melodi.ipynb

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions docs/get_data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,18 @@ Get data from INSEE files

.. autofunction:: pynsee.download.get_column_metadata
:no-index:

Get MELODI data
---------------

.. autofunction:: pynsee.melodi.get_catalog
:no-index:

.. autofunction:: pynsee.melodi.get_dataset
:no-index:

.. autofunction:: pynsee.melodi.get_range
:no-index:

.. autofunction:: pynsee.melodi.get_idbank
:no-index:
13 changes: 10 additions & 3 deletions docs/modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ Macro data
:members:


Metadata
--------
MELODI
------

.. automodule:: pynsee.metadata
.. automodule:: pynsee.melodi
:members:


Expand All @@ -48,3 +48,10 @@ Utils

.. automodule:: pynsee.utils
:members:


Metadata (deprecated)
---------------------

.. automodule:: pynsee.metadata
:members:
Comment thread
GrasClement marked this conversation as resolved.
9 changes: 5 additions & 4 deletions pynsee/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from pynsee.download import *
from pynsee.geodata import *
from pynsee.macrodata import *
from pynsee.localdata import *
from pynsee.sirene import *
from pynsee.macrodata import *
from pynsee.melodi import *
from pynsee.metadata import *
from pynsee.sirene import *
from pynsee.utils import *
from pynsee.download import *

__version__ = "0.2.5"
__version__ = "0.2.6"
4 changes: 2 additions & 2 deletions pynsee/geodata/_add_insee_dep.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def _add_insee_dep_from_id_com(gdf):
"geometry": "insee_dep_geometry",
"code_insee": "code_insee_du_departement",
},
inplace=True
inplace=True,
)

gdf = gdf.merge(
Expand Down Expand Up @@ -85,7 +85,7 @@ def _add_insee_dep_region(gdf):
columns={
"geometry": "insee_dep_geometry",
},
inplace=True
inplace=True,
)

gdf = gdf.merge(dep, on="insee_reg", how="left")
Expand Down
4 changes: 3 additions & 1 deletion pynsee/melodi/catalog.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@


@save_df(day_lapse_max=30)
def get_catalog(language: str = "all") -> pd.DataFrame:
def get_catalog(
language: str = "all", update: bool = False, silent: bool = False
) -> pd.DataFrame:
"""
Retrieve MELODI's full catalog.

Expand Down
Loading