Merge pull request #169 from InsightLab/developer

mxaviersmp · web-flow · commit 302bfb64d0e6 · 2021-03-12T00:00:08.000-03:00
Developer
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -5,6 +5,6 @@ tag_name = version-{new_version}
 tag = True
 commit = True
 
-[bumpversion:file:pymove/_version.py]
+[bumpversion:file:pymove/__init__.py]
 
 [bumpversion:file:setup.py]
diff --git a/.documentation.md b/.documentation.md
@@ -102,4 +102,4 @@ following command:
 To update the documentation just run the following command and move
  the generated files to the folder `references/`.
 
-`sphinx-apidoc -o docs pymove`
+`sphinx-apidoc -f -o docs/references pymove pymove/tests/`
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ help:
 	@echo " - clean  : clean temporary folders and files"
 	@echo " - test   : runs all unit tests"
 	@echo " - lint   : checks code style"
-	@echo " - doc    : creates documentation in html"
+	@echo " - docs   : creates documentation in html"
 
 dev:
 	pip install -r requirements-dev.txt
@@ -24,5 +24,6 @@ test: clean
 lint: clean
 	flake8
 
-doc: clean
+docs: clean
+	sphinx-apidoc -f -o docs/references pymove pymove/tests/
 	make -C docs html
diff --git a/docs/references/modules.rst b/docs/references/modules.rst
@@ -0,0 +1,7 @@
+pymove
+======
+
+.. toctree::
+   :maxdepth: 4
+
+   pymove
diff --git a/docs/references/pymove.core.rst b/docs/references/pymove.core.rst
@@ -44,10 +44,10 @@ pymove.core.pandas module
    :undoc-members:
    :show-inheritance:
 
-pymove.core.pandas_discrete module
-----------------------------------
+pymove.core.pandas\_discrete module
+-----------------------------------
 
-.. automodule:: pymove.core.pandas
+.. automodule:: pymove.core.pandas_discrete
    :members:
    :undoc-members:
    :show-inheritance:
diff --git a/docs/references/pymove.models.pattern_mining.rst b/docs/references/pymove.models.pattern_mining.rst
@@ -12,6 +12,30 @@ pymove.models.pattern\_mining.clustering module
    :undoc-members:
    :show-inheritance:
 
+pymove.models.pattern\_mining.freq\_seq\_patterns module
+--------------------------------------------------------
+
+.. automodule:: pymove.models.pattern_mining.freq_seq_patterns
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pymove.models.pattern\_mining.moving\_together\_patterns module
+---------------------------------------------------------------
+
+.. automodule:: pymove.models.pattern_mining.moving_together_patterns
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pymove.models.pattern\_mining.periodic\_patterns module
+-------------------------------------------------------
+
+.. automodule:: pymove.models.pattern_mining.periodic_patterns
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.models.rst b/docs/references/pymove.models.rst
@@ -12,6 +12,22 @@ Subpackages
 Submodules
 ----------
 
+pymove.models.anomaly\_detection module
+---------------------------------------
+
+.. automodule:: pymove.models.anomaly_detection
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pymove.models.classification module
+-----------------------------------
+
+.. automodule:: pymove.models.classification
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.preprocessing.rst b/docs/references/pymove.preprocessing.rst
@@ -20,14 +20,6 @@ pymove.preprocessing.filters module
    :undoc-members:
    :show-inheritance:
 
-pymove.preprocessing.map\_matching module
------------------------------------------
-
-.. automodule:: pymove.preprocessing.map_matching
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 pymove.preprocessing.segmentation module
 ----------------------------------------
 
@@ -44,7 +36,6 @@ pymove.preprocessing.stay\_point\_detection module
    :undoc-members:
    :show-inheritance:
 
-
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.rst b/docs/references/pymove.rst
@@ -10,12 +10,11 @@ Subpackages
    pymove.core
    pymove.models
    pymove.preprocessing
-   pymove.query
    pymove.semantic
+   pymove.uncertainty
    pymove.utils
    pymove.visualization
 
-
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.semantic.rst b/docs/references/pymove.semantic.rst
@@ -12,7 +12,6 @@ pymove.semantic.semantic module
    :undoc-members:
    :show-inheritance:
 
-
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.uncertainty.rst b/docs/references/pymove.uncertainty.rst
@@ -0,0 +1,29 @@
+pymove.uncertainty package
+==========================
+
+Submodules
+----------
+
+pymove.uncertainty.privacy module
+---------------------------------
+
+.. automodule:: pymove.uncertainty.privacy
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+pymove.uncertainty.reducing module
+----------------------------------
+
+.. automodule:: pymove.uncertainty.reducing
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
+Module contents
+---------------
+
+.. automodule:: pymove.uncertainty
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docs/references/pymove.utils.rst b/docs/references/pymove.utils.rst
@@ -20,8 +20,8 @@ pymove.utils.conversions module
    :undoc-members:
    :show-inheritance:
 
-pymove.utils.data_augmentation module
--------------------------------------
+pymove.utils.data\_augmentation module
+--------------------------------------
 
 .. automodule:: pymove.utils.data_augmentation
    :members:
@@ -100,7 +100,6 @@ pymove.utils.visual module
    :undoc-members:
    :show-inheritance:
 
-
 Module contents
 ---------------
 
diff --git a/docs/references/pymove.visualization.rst b/docs/references/pymove.visualization.rst
@@ -20,7 +20,6 @@ pymove.visualization.matplotlib module
    :undoc-members:
    :show-inheritance:
 
-
 Module contents
 ---------------
 
diff --git a/pymove/__init__.py b/pymove/__init__.py
@@ -7,7 +7,6 @@
 
 """
 
-from ._version import __version__
 from .core import grid
 from .core.dask import DaskMoveDataFrame
 from .core.dataframe import MoveDataFrame
@@ -31,3 +30,5 @@
 )
 from .utils.trajectories import read_csv
 from .visualization import folium, matplotlib
+
+__version__ = '2.6.1'
diff --git a/pymove/_version.py b/pymove/_version.py
diff --git a/setup.py b/setup.py
@@ -24,6 +24,7 @@
         'Programming Language :: Python :: 3',
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
+        'Typing :: Typed'
     ],
     install_requires=DEPENDENCIES,
     include_package_data=True

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +pymove
 +======
++
 +.. toctree::
 +   :maxdepth: 4
++
 +   pymove