Skip to content

Commit

Permalink
Merge pull request #76 from alk-lbinet/v021
Browse files Browse the repository at this point in the history
v0.2.1
  • Loading branch information
alk-lbinet authored Jul 6, 2021
2 parents 521776e + e374eb4 commit 3d0946e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 5 deletions.
15 changes: 12 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,25 @@ 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

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/*
4 changes: 3 additions & 1 deletion pandagg/node/aggs/abstract.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
"""
Expand Down
5 changes: 4 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

__version__ = "0.2.0"
__version__ = "0.2.1"

import os

Expand All @@ -17,11 +17,14 @@
develop_requires = [
"pre-commit",
"black",
"coverage",
"flake8",
"pytest",
"pytest-cov",
"mock",
"pandas",
"Sphinx",
"twine",
]

setup(
Expand Down

0 comments on commit 3d0946e

Please sign in to comment.