From d54d9cfb224c5661474dfd820be41a895f304c93 Mon Sep 17 00:00:00 2001 From: Leonard Binet Date: Mon, 22 Jun 2020 07:14:05 +0200 Subject: [PATCH 1/2] gitignore update --- .github/workflows/python-3-tests.yml | 2 +- .gitignore | 7 +++---- pandagg/__init__.py | 9 +-------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.github/workflows/python-3-tests.yml b/.github/workflows/python-3-tests.yml index e6e34b8b..ab06e3e0 100644 --- a/.github/workflows/python-3-tests.yml +++ b/.github/workflows/python-3-tests.yml @@ -39,7 +39,7 @@ jobs: flake8 --count --ignore=W503,W605,E231,E501 --show-source --statistics tests - name: Test with pytest and generate coverage report run: - pytest --cov=./ --cov-report=xml + pytest --cov=./pandagg --cov-report=xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: diff --git a/.gitignore b/.gitignore index 08c83058..f6b3884e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .* -/_* +!.github *.py[co] *.egg *.egg-info @@ -10,6 +10,5 @@ /build /docs/build /examples/imdb/conf.py - -env/ -env3/ +/coverage.xml +env* diff --git a/pandagg/__init__.py b/pandagg/__init__.py index e89eaa31..b1d258d9 100644 --- a/pandagg/__init__.py +++ b/pandagg/__init__.py @@ -5,13 +5,6 @@ import logging -try: # Python 2.7+ - from logging import NullHandler -except ImportError: - - class NullHandler(logging.Handler): - def emit(self, record): - pass - +from logging import NullHandler logging.getLogger(__name__).addHandler(NullHandler()) From 2fc2f835a00ce524cc606082f3ae51e83f4b9a72 Mon Sep 17 00:00:00 2001 From: Leonard Binet Date: Mon, 22 Jun 2020 07:18:08 +0200 Subject: [PATCH 2/2] license in readme and setup.py --- README.md | 1 + setup.py | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 6b62fb10..133fbc86 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![PyPI Latest Release](https://img.shields.io/pypi/v/pandagg.svg)](https://pypi.org/project/pandagg/) +[![License](https://img.shields.io/pypi/l/pandagg.svg)](https://github.com/leonardbinet/pandagg/blob/master/LICENSE) ![Python package](https://github.com/alkemics/pandagg/workflows/Python%203%20Tests/badge.svg) ![Python package](https://github.com/alkemics/pandagg/workflows/Python%202%20Tests/badge.svg) [![Coverage](https://codecov.io/github/alkemics/pandagg/coverage.svg?branch=master)](https://codecov.io/gh/alkemics/pandagg) diff --git a/setup.py b/setup.py index 95dd34de..86d967d6 100644 --- a/setup.py +++ b/setup.py @@ -36,4 +36,5 @@ zip_safe=False, install_requires=install_requires, setup_requires=["pytest-runner"], + license="MIT", )