Merge pull request #188 from InsightLab/codacy

Codacy

Author: mxaviersmp

.code-style.md

@@ -13,7 +13,6 @@ We are using some tools to keep a default coding style in the project.
 
 We following the [Numpy](https://numpydoc.readthedocs.io/en/latest/format.html) docstring style with [PEP484](https://www.python.org/dev/peps/pep-0484/#abstract).
 
-
 ## Links
 -   <https://pre-commit.com/>
 -   <https://www.codacy.com/>

.github/workflows/code_coverage.yml

@@ -17,7 +17,8 @@ jobs:
         python-version: 3.7
     - name: Install dependencies
       run: |
-        make ci
+        python -m pip install --upgrade pip
+        make dev
     - name: Coverage
       run: |
         make coverage

.github/workflows/lint_and_test.yml

@@ -13,7 +13,8 @@ jobs:
         python-version: 3.7
     - name: Install dependencies
       run: |
-        make ci
+        python -m pip install --upgrade pip
+        make dev
     - name: Lint
       working-directory: ${{ github.workspace }}
       run: |
@@ -30,7 +31,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pytest geopandas .
+        make dev
     - name: Test
       working-directory: ${{ github.workspace }}
       run: |

.github/workflows/publish.yml

@@ -17,7 +17,8 @@ jobs:
         python-version: 3.7
     - name: Install dependencies
       run: |
-        make ci
+        python -m pip install --upgrade pip
+        make dev
     - name: Lint and Test
       run: |
         make lint

Makefile

@@ -8,13 +8,9 @@ help:
 
 dev:
 	pip install -r requirements-dev.txt
+	pip install -e .
 	pre-commit install
 
-ci:
-	python -m pip install --upgrade pip
-	pip install flake8 pep8-naming flake8-bugbear flake8-docstrings pytest coverage geopandas
-	pip install .
-
 clean:
 	rm -rf `find . -type d -name .pytest_cache`
 	rm -rf `find . -type d -name __pycache__`

pymove/core/pandas.py

@@ -1,17 +1,6 @@
 """PandasMoveDataFrame class."""
 
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    Callable,
-    Dict,
-    List,
-    Optional,
-    Set,
-    Text,
-    Tuple,
-    Union,
-)
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Text, Tuple, Union
 
 import numpy as np
 from pandas import DataFrame, DateOffset, Series, Timedelta

pymove/preprocessing/filters.py

@@ -299,7 +299,7 @@ def clean_consecutive_duplicates(
     ----------
     move_data : dataframe
         The input trajectory data
-    subset : Array of strs, optional
+    subset : Array of str, optional
         Specifies  Column label or sequence of labels, considered for
         identifying duplicates, by default None
     keep : 'first', 'last', optional

pymove/preprocessing/stay_point_detection.py

@@ -12,10 +12,7 @@
 
 from pymove.preprocessing.segmentation import by_max_dist
 from pymove.utils.constants import (
-    DATETIME,
     DIST_TO_PREV,
-    HOUR_COS,
-    HOUR_SIN,
     MOVE,
     SEGMENT_STOP,
     SITUATION,

requirements-dev.txt

@@ -1,12 +1,11 @@
--e .
-pre-commit
 bump2version
+coverage
 flake8
-pep8-naming
 flake8-bugbear
 flake8-docstrings
-pytest
-coverage
 geopandas
+pep8-naming
+pre-commit
+pytest
 sphinx
 sphinx_rtd_theme