diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b11e435..e915bc6 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,12 +16,10 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install setuptools wheel twine + pip install hatch - name: Build and publish env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }} run: | - python setup.py sdist bdist_wheel - twine upload dist/* - + hatch build + hatch publish --user __token__ --auth $PYPI_API_TOKEN \ No newline at end of file diff --git a/astetik/__init__.py b/astetik/__init__.py index f36697d..0d18934 100755 --- a/astetik/__init__.py +++ b/astetik/__init__.py @@ -51,3 +51,5 @@ del utils except: pass + +__VERSION__ = '1.16' diff --git a/astetik/plots/kde.py b/astetik/plots/kde.py index 03b1d0e..292b864 100644 --- a/astetik/plots/kde.py +++ b/astetik/plots/kde.py @@ -116,7 +116,7 @@ def kde(data, params()['fig_height'])) p = sns.kdeplot(data=data[x], - data2=data2, + y=data2, shade=True, cut=5, shade_lowest=False, diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..a6ebb60 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,52 @@ +[build-system] +requires = ["hatchling"] +build-backend = "hatchling.build" + +[project] +name = "astetik" +dynamic = ["version"] +description = "Astetik data visualization and reporting library" +readme = "README.md" +license = "MIT" +authors = [ + { name = "Mikko Kotila", email = "mailme@mikkokotila.com" }, +] +maintainers = [ + { name = "Mikko Kotila", email = "mailme@mikkokotila.com" }, +] +classifiers = [ + "Intended Audience :: Science/Research", + "License :: OSI Approved :: MIT License", + "Operating System :: MacOS", + "Operating System :: POSIX", + "Operating System :: Unix", + "Programming Language :: Python :: 2.7", + "Programming Language :: Python :: 3.4", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Topic :: Multimedia :: Graphics", + "Topic :: Scientific/Engineering :: Visualization", +] +dependencies = [ + "geonamescache", + "IPython", + "numpy", + "pandas", + "patsy", + "scikit-learn", + "seaborn", + "statsmodels", + "wrangle", +] + +[project.urls] +Download = "https://github.com/mikkokotila/pretty" +Homepage = "http://mikkokotila.com" + +[tool.hatch.version] +path = "astetik/__init__.py" + +[tool.hatch.build.targets.sdist] +include = [ + "/astetik", +] diff --git a/requirements.txt b/requirements.txt index 9923d73..37e9f41 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,4 @@ pandas IPython patsy statsmodels -sklearn \ No newline at end of file +scikit-learn diff --git a/setup.py b/setup.py index 3456c05..313cb19 100755 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ URL = 'http://mikkokotila.com' LICENSE = 'MIT' DOWNLOAD_URL = 'https://github.com/mikkokotila/pretty' -VERSION = '1.13' +VERSION = '1.14' try: from setuptools import setup @@ -70,7 +70,7 @@ def check_dependencies(): try: import sklearn except ImportError: - install_requires.append('sklearn') + install_requires.append('scikit-learn') return install_requires diff --git a/test_script.py b/test_script.py index 8a6d076..3acfc11 100644 --- a/test_script.py +++ b/test_script.py @@ -407,20 +407,20 @@ def multicount_full(df): # test_simple_minimal(df) # test plots with parameters -corr_full(df) -kde_full(df) +#corr_full(df) +#kde_full(df) hist_full(df) pie_full(df) swarm_full(df) scat_full(df) line_full(df) -grid_full(df) +#grid_full(df) box_full(df) violin_full(df) strip_full(df) -count_full(df) -bars_full(df) +#count_full(df) +#bars_full(df) overlap_full(df) -multikde_full(df) -compare_full(df) -multicount_full(df) +#multikde_full(df) +#compare_full(df) +#multicount_full(df)