Merge pull request #73 from alk-lbinet/CI

Improve CI

.github/workflows/python-3-tests.yml

@@ -52,8 +52,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -r requirements-test.txt
-        python setup.py develop
+        pip install -e ".[develop]"
     - name: Test with pytest and generate coverage report
       run:
         pytest --cov=./pandagg --cov-report=xml

Makefile

@@ -25,6 +25,9 @@ develop:
 doc-references:
 	-make -C docs api-doc
 
+tests:
+    pytest
+
 coverage:
 	coverage run --source=./pandagg -m pytest
 	coverage report

pandagg/node/aggs/composite.py

@@ -2,6 +2,10 @@
 
 
 class Composite(BucketAggClause):
+
+    KEY = "composite"
+    VALUE_ATTRS = ["doc_count"]
+
     def __init__(self, sources, size=None, after_key=None, meta=None, **body):
         """https://www.elastic.co/guide/en/elasticsearch/reference/current/search-aggregations-bucket-composite-aggregation.html
         :param sources:

setup.py

@@ -14,6 +14,15 @@
 
 install_requires = ["six", "future", "lighttree==1.1.1", "elasticsearch>=7.0.0,<8.0.0"]
 
+develop_requires = [
+    "pre-commit",
+    "black",
+    "flake8",
+    "pytest",
+    "pytest-cov",
+    "mock",
+    "pandas",
+]
 
 setup(
     name="pandagg",
@@ -30,6 +39,7 @@
     test_suite="pandagg.tests",
     zip_safe=False,
     install_requires=install_requires,
-    setup_requires=["pytest-runner"],
+    extras_require={"develop": develop_requires},
+    tests_require=develop_requires,
     license="Apache-2.0",
 )