update versions + minor improvements (#85)

* update some version + other minor changes

* fix test.yml for covereage

* bump version + clean up setup.cfg

* fix ignore for flake8

* relative imports

Author: matin

.github/workflows/test.yml

@@ -10,49 +10,47 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: '3.7'
+          python-version: '3.8'
       - name: Install dependencies
         run: make install-test
       - name: Lint
         run: make lint
 
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.7
+    - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: ${{ matrix.python-version }}
     - name: Install dependencies
-      run: |
-        cp env.template .env
-        make install-test
+      run: make install-test
     - name: Run tests
       run: |
-        export $(<.env)
-        make test
+        export $(<env.template)
+        pytest
   coverage:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master
       - name: Setup Python
         uses: actions/setup-python@master
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install dependencies
-        run: |
-          make install-test
-          cp env.template .env
+        run: make install-test
       - name: Generate coverage report
         run: |
-          export $(<.env)
+          export $(<env.template)
           pytest --cov-report=xml
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
         with:
-          token: c3898684-cb06-4229-b7fe-b8489a1b8fb2
           file: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
-          fail_ci_if_error: true
+          fail_ci_if_error: true

Makefile

@@ -1,42 +1,51 @@
 SHELL := bash
 PATH := ./venv/bin:${PATH}
-PYTHON=python3.7
-PROJECT=arcus
-isort = isort -rc -ac $(PROJECT) tests setup.py
-black = black -S -l 79 --target-version py37 $(PROJECT) tests setup.py
+PYTHON = python3.7
+PROJECT = arcus
+isort = isort $(PROJECT) tests setup.py
+black = black -S -l 79 --target-version py38 $(PROJECT) tests setup.py
 
 
 all: test
 
 venv:
-		$(PYTHON) -m venv --prompt $(PROJECT) venv
-		pip install -qU pip
+	$(PYTHON) -m venv --prompt $(PROJECT) venv
+	pip install -qU pip
 
 install-test:
-		pip install -q .[test]
+	pip install -q .[test]
 
 test: clean install-test lint
-		python setup.py test
+	python setup.py test
 
 format:
-		$(isort)
-		$(black)
+	$(isort)
+	$(black)
 
 lint:
-		$(isort) --check-only
-		$(black) --check
-		flake8 $(PROJECT) tests setup.py
-		mypy $(PROJECT) tests
+	flake8 $(PROJECT) tests setup.py
+	$(isort) --check-only
+	$(black) --check
+	mypy $(PROJECT) tests
 
 clean:
-		find . -name '*.pyc' -exec rm -f {} +
-		find . -name '*.pyo' -exec rm -f {} +
-		find . -name '*~' -exec rm -f {} +
-		rm -rf build dist $(PROJECT).egg-info
+	rm -rf `find . -name __pycache__`
+	rm -f `find . -type f -name '*.py[co]' `
+	rm -f `find . -type f -name '*~' `
+	rm -f `find . -type f -name '.*~' `
+	rm -rf .cache
+	rm -rf .pytest_cache
+	rm -rf .mypy_cache
+	rm -rf htmlcov
+	rm -rf *.egg-info
+	rm -f .coverage
+	rm -f .coverage.*
+	rm -rf build
+	rm -rf dist
 
 release: clean
-		python setup.py sdist bdist_wheel
-		twine upload dist/*
+	python setup.py sdist bdist_wheel
+	twine upload dist/*
 
 
 .PHONY: all install-test test format lint clean release

README.md

@@ -2,9 +2,10 @@
 [![test](https://github.com/cuenca-mx/arcus-python/workflows/test/badge.svg)](https://github.com/cuenca-mx/arcus-python/actions?query=workflow%3Atest)
 [![codecov](https://codecov.io/gh/cuenca-mx/arcus-python/branch/master/graph/badge.svg)](https://codecov.io/gh/cuenca-mx/arcus-python)
 [![PyPI](https://img.shields.io/pypi/v/arcus.svg)](https://pypi.org/project/arcus/)
+[![Downloads](https://pepy.tech/badge/arcus)](https://pepy.tech/project/arcus)
 
 
-Arcus python3.6 + 3.7 client library for API version 3.1 of [Arcus](https://www.arcusfi.com/).
+Arcus python3.6+ client library for API version 3.1 of [Arcus](https://www.arcusfi.com/).
 
 
 

arcus/resources/base.py

@@ -4,7 +4,7 @@
 
 
 class Resource:
-    _client: ClassVar['arcus.Client']  # type: ignore
+    _client: ClassVar['arcus.Client']  # type:ignore  # noqa:F821
     _endpoint: ClassVar[str]
 
     # Just for mypy

arcus/resources/bill_payments.py

@@ -2,8 +2,7 @@
 from dataclasses import dataclass, field
 from typing import ClassVar, Optional
 
-from arcus.exc import UnprocessableEntity, raise_arcus_exception
-
+from ..exc import UnprocessableEntity, raise_arcus_exception
 from .base import Resource
 
 """

arcus/resources/billers.py

@@ -3,8 +3,7 @@
 
 from pydash import filter_
 
-from arcus.exc import NotFound
-
+from ..exc import NotFound
 from .base import Resource
 
 ENDPOINTS = ['topups', 'utilities']

arcus/resources/bills.py

@@ -2,13 +2,12 @@
 from dataclasses import dataclass, field
 from typing import ClassVar, Optional, Union
 
-from arcus.exc import (
+from ..exc import (
     InvalidBiller,
     NotFound,
     UnprocessableEntity,
     raise_arcus_exception,
 )
-
 from .base import Resource
 from .transactions import Transaction
 

arcus/resources/transactions.py

@@ -2,8 +2,7 @@
 from dataclasses import dataclass, field
 from typing import ClassVar, Union
 
-from arcus.exc import UnprocessableEntity, raise_arcus_exception
-
+from ..exc import UnprocessableEntity, raise_arcus_exception
 from .base import Resource
 
 

arcus/version.py

@@ -1 +1 @@
-__version__ = '1.2.3'  # pragma: no cover
+__version__ = '1.2.4'  # pragma: no cover

setup.cfg

@@ -2,24 +2,27 @@
 test=pytest
 
 [tool:pytest]
-addopts = -p no:warnings -v --cov=arcus
+addopts = -p no:warnings -v --cov-report term-missing --cov=arcus
 
 [flake8]
 inline-quotes = '
 multiline-quotes = """
-builtins = arcus
 
 [isort]
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
+profile=black
+line_length=79
 
 [mypy-iso8601]
 ignore_missing_imports = true
 
 [mypy-pytest]
 ignore_missing_imports = true
 
-[mypy]
-ignore_missing_imports = True
+[mypy-pydash]
+ignore_missing_imports = true
+
+[mypy-requests_mock]
+ignore_missing_imports = true
+
+[coverage:report]
+precision = 2