Skip to content

Commit 068eda0

Browse files
authored
Revised version structure, fixed recursion preventing installation of…
… dependencies ([ydataai#184]). The setup.py file used to include utils from the package prior to installation. This causes errors when the dependencies are not yet present.
2 parents c817111 + 1057fcb commit 068eda0

File tree

9 files changed

+126
-73
lines changed

9 files changed

+126
-73
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include LICENSE
2+
include VERSION
23
include pandas_profiling/view/*.mplstyle
34
include pandas_profiling/view/templates/*.html
45
include pandas_profiling/view/templates/variables/*.html

VERSION

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.0.2

docs/index.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,7 @@ <h2 id="dependencies">Dependencies</h2>
136136
import warnings
137137

138138
from pandas_profiling.utils.dataframe import clean_column_names, rename_index
139-
140-
__version__ = &#34;2.0.1&#34;
139+
from pandas_profiling.utils.paths import get_config_default, get_project_root
141140

142141
from pathlib import Path
143142
import numpy as np
@@ -146,10 +145,14 @@ <h2 id="dependencies">Dependencies</h2>
146145
from pandas_profiling.controller import pandas_decorator
147146
import pandas_profiling.view.templates as templates
148147
from pandas_profiling.model.describe import describe as describe_df
149-
from pandas_profiling.utils.paths import get_config_default
150148
from pandas_profiling.view.report import to_html
151149

152150

151+
source_root = get_project_root()
152+
with (source_root / &#34;VERSION&#34;).open() as f:
153+
__version__ = f.read()
154+
155+
153156
class ProfileReport(object):
154157
&#34;&#34;&#34;Generate a profile report from a Dataset stored as a pandas `DataFrame`.
155158

examples/meteorites/meteorites_report.html

Lines changed: 49 additions & 28 deletions
Large diffs are not rendered by default.

examples/nza/nza_report.html

Lines changed: 49 additions & 28 deletions
Large diffs are not rendered by default.

examples/titanic/titanic_report.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

pandas_profiling/__init__.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import warnings
77

88
from pandas_profiling.utils.dataframe import clean_column_names, rename_index
9-
10-
__version__ = "2.0.1"
9+
from pandas_profiling.utils.paths import get_config_default, get_project_root
1110

1211
from pathlib import Path
1312
import numpy as np
@@ -16,10 +15,14 @@
1615
from pandas_profiling.controller import pandas_decorator
1716
import pandas_profiling.view.templates as templates
1817
from pandas_profiling.model.describe import describe as describe_df
19-
from pandas_profiling.utils.paths import get_config_default
2018
from pandas_profiling.view.report import to_html
2119

2220

21+
source_root = get_project_root()
22+
with (source_root / "VERSION").open() as f:
23+
__version__ = f.read()
24+
25+
2326
class ProfileReport(object):
2427
"""Generate a profile report from a Dataset stored as a pandas `DataFrame`.
2528

pandas_profiling/view/templates/navigation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
</ul>
2929
</div>
3030
</div>
31-
</nav>
31+
</nav>

setup.py

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
import pandas_profiling
2-
from pandas_profiling.utils.paths import get_project_root
1+
from pathlib import Path
2+
33
from setuptools import setup, find_packages
44

55
# Read the contents of README file
6-
source_root = get_project_root()
6+
source_root = Path(".")
77
with (source_root / "README.md").open(encoding="utf-8") as f:
88
long_description = f.read()
99

10+
with (source_root / "VERSION").open() as f:
11+
version = f.read()
12+
1013
setup(
1114
name="pandas-profiling",
12-
version=pandas_profiling.__version__,
15+
version=version,
1316
author="Jos Polfliet, Simon Brugman",
1417
author_email="[email protected]",
1518
packages=find_packages(),
@@ -20,10 +23,10 @@
2023
"pandas>=0.19",
2124
"matplotlib>=1.4",
2225
"jinja2>=2.8",
23-
"missingno",
24-
"htmlmin",
25-
"phik",
26-
"confuse",
26+
"missingno>=0.4.1",
27+
"htmlmin>=0.1.12",
28+
"phik>=0.9.8",
29+
"confuse>=1.0.0",
2730
],
2831
include_package_data=True,
2932
classifiers=[

0 commit comments

Comments
 (0)