From 159f20473281f9568d8debccd7854fe478a14e6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20Binet?= Date: Mon, 5 Jul 2021 22:27:02 +0200 Subject: [PATCH 1/4] makefile update --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5c4e5176..806fa84a 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ black: black examples docs pandagg tests setup.py develop: - -python -m pip install -e . + -python -m pip install -e ".[develop]" doc-references: -make -C docs api-doc From 14a66f68776e17b291029a199b263e76b0513d38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20Binet?= Date: Mon, 5 Jul 2021 22:27:24 +0200 Subject: [PATCH 2/4] make mapping validation too laxist rather than too strict --- pandagg/node/aggs/abstract.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pandagg/node/aggs/abstract.py b/pandagg/node/aggs/abstract.py index 0f899e3e..18b3152b 100644 --- a/pandagg/node/aggs/abstract.py +++ b/pandagg/node/aggs/abstract.py @@ -98,7 +98,9 @@ def valid_on_field_type(cls, field_type): return field_type in cls.WHITELISTED_MAPPING_TYPES if cls.BLACKLISTED_MAPPING_TYPES is not None: return field_type not in cls.BLACKLISTED_MAPPING_TYPES - return False + # by default laxist + # TODO - constraint to only allowed types + return True def to_dict(self): """ From 3c33c29cf50d8336759012f3a4ba5128a1df62bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20Binet?= Date: Mon, 5 Jul 2021 22:27:34 +0200 Subject: [PATCH 3/4] add coverage dependency --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 93e505c9..f0f9f882 100644 --- a/setup.py +++ b/setup.py @@ -17,6 +17,7 @@ develop_requires = [ "pre-commit", "black", + "coverage", "flake8", "pytest", "pytest-cov", From e374eb4d9175f9b6d9aeca9ec7863f1780043780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9onard=20Binet?= Date: Tue, 6 Jul 2021 12:05:21 +0200 Subject: [PATCH 4/4] update makefile for dist --- Makefile | 13 +++++++++++-- setup.py | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 806fa84a..344b987e 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,19 @@ doc-references: -make -C docs api-doc tests: - pytest + pytest coverage: coverage run --source=./pandagg -m pytest coverage report -check: black doc-references +check: doc-references black lint + +create_dist: check + python setup.py sdist bdist_wheel + +test_dist: create_dist + twine upload -r testpypi dist/* + +upload_dist: + twine upload dist/* diff --git a/setup.py b/setup.py index f0f9f882..5cc40cb4 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -__version__ = "0.2.0" +__version__ = "0.2.1" import os @@ -23,6 +23,8 @@ "pytest-cov", "mock", "pandas", + "Sphinx", + "twine", ] setup(