Skip to content

Free Motion Capture for Everyone πŸ’€βœ¨

TypeScript

Cleaning up repo

jon matthis14c347ac9eec
diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644
index 4ac1b0af..00000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-# show coverage in CI status, not as a comment.
-comment: off
-coverage:
- status:
- project:
- default:
- target: auto
- patch:
- default:
- target: auto
diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index aa9e0b9b..00000000
--- a/.coveragerc
+++ /dev/null
@@ -1,13 +0,0 @@
-[run]
-source =
- freemocap
-[report]
-omit =
- */python?.?/*
- */site-packages/nose/*
- # ignore _version.py and versioneer.py
- .*version.*
- *_version.py
-
-exclude_lines =
- if __name__ == '__main__':
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index 6406dbc8..00000000
--- a/.flake8
+++ /dev/null
@@ -1,10 +0,0 @@
-[flake8]
-exclude =
- .git,
- __pycache__,
- build,
- dist,
- versioneer.py,
- freemocap/_version.py,
- docs/source/conf.py
-max-line-length = 115
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index b3a31efd..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-language: python
-python:
- - 3.7
-cache:
- directories:
- - $HOME/.cache/pip
- - $HOME/.ccache # https://github.com/travis-ci/travis-ci/issues/5853
-
-dist: bionic # use Ubuntu 18.04
-
-env:
- global:
- # Doctr deploy key for jonmatthis/freemocap
- - secure: "XP8R3/9jzF71gUJVzg49XcPDKc5lvME0X3iOFf3dKii8IVyvBFM0bc5JBVIPwV7nVJQTHCX0AGEdZSAjT85ie+EoTSm1smD1tHx0gfPJRXfHm6AXXQch7l4kDs9LpEY8S30DVgXiQdgQKTlcl8bwNl4gCpWLG8mclJoQ9hF4OyTkPBsutUjcIiB2Jp8v02CBqXNK0/dQ7dzZzLuu8UK4IwLp80yLK7WVEQGBGF/h+X4eWelRgxpXDHbtLf/OF/YunJYm6bNNXBZnaBHSL9xbmztvn7UWB9gCoJ/9afj2enGesQqlO1pHB7Zmsmz3KsNQjPADQWdd1CXN9nGGceTn7CP0Mfph6hIFnD38nBD7OWwnV3jCKpBCCYXGmc+qwBm0Drbx/wnZOiOxYS3ih+aD4Zkh9FocPwYoKq+U9/urHxtmOxjy0N+aDR3WlzjdAbTybgyX15KCjYpXHSSHG3IIP7NuFnlyRN86XKNLREsFoZvhA0kGqKrZnPojC0OZYyZ7tJl9Plho2GSt66MArJYg8npH5ELV8S/UehlG9PGMZiyvaih1Y5gJqYWddRMBuVy4y4jPQD0FIc53qJeuXBzWLUH2TyJ97zzX5Ri9gwl8Ayr+60XjWel9mNowHLsN18IkqwLfNXElCRgli3L/1iB+LEAmDlpLNp5DnoHzM0qcBKw="
-
-# Setup virtual frame buffer for GUI tests
-services:
- - xvfb
-
-before_install:
- # Upgrade pip to latest version to avoid problems.
- - pip install --upgrade pip
-
-install:
- # wxPython Linux wheels are downloaded separately
- # https://wxpython.org/pages/downloads/
- - pip install -U
- -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04
- "wxPython < 4.1"
- # The versions of numpy that come pre-installed are often too old and
- # can cause problems. Upgrade it.
- - pip install --upgrade numpy
- # Install this package and the packages listed in requirements.txt.
- - pip install .
- # Install extra requirements for running tests and building docs.
- - pip install -r requirements-dev.txt
-
-script:
- - coverage run -m pytest # Run the tests and check for test coverage.
- - coverage report -m # Generate test coverage report.
- - codecov # Upload the report to codecov.
- #- flake8 # Enforce code style ('relaxed' line length limit is set in .flake8 config file).
- - set -e
- - make -C docs html # Build the documentation.
- # Publish the documentation
- - if [ "$TRAVIS_BRANCH" = "main" ]; then pip install doctr; fi
- - if [ "$TRAVIS_BRANCH" = "main" ]; then doctr deploy --built-docs docs/build/html .; fi
diff --git a/AUTHORS.rst b/AUTHORS.rst
deleted file mode 100644
index 4b5a4472..00000000
--- a/AUTHORS.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-=======
-Credits
-=======
-
-Maintainers
-----------
-
-* Jonathan Samir Matthis <[email protected]>
-Aaron Charian @aaroncherian
-
-Contributors
-------------
-
-
-None yet. Why not be the first? See: CONTRIBUTING.rst
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
deleted file mode 100644
index bf5e9f42..00000000
--- a/CONTRIBUTING.rst
+++ /dev/null
@@ -1,104 +0,0 @@
-============
-Contributing
-============
-
-Contributions are welcome, and they are greatly appreciated! Every
-little bit helps, and credit will always be given.
-
-You can contribute in many ways:
-
-Types of Contributions
-----------------------
-
-Report Bugs
-~~~~~~~~~~~
-
-Report bugs at https://github.com/jonmatthis/freemocap/issues.
-
-If you are reporting a bug, please include:
-
-* Any details about your local setup that might be helpful in troubleshooting.
-* Detailed steps to reproduce the bug.
-
-Fix Bugs
-~~~~~~~~
-
-Look through the GitHub issues for bugs. Anything tagged with "bug"
-is open to whoever wants to implement it.
-
-Implement Features
-~~~~~~~~~~~~~~~~~~
-
-Look through the GitHub issues for features. Anything tagged with "feature"
-is open to whoever wants to implement it.
-
-Write Documentation
-~~~~~~~~~~~~~~~~~~~
-
-The FreeMoCap Project could always use more documentation, whether
-as part of the official The FreeMoCap Project docs, in docstrings,
-or even on the web in blog posts, articles, and such.
-
-Submit Feedback
-~~~~~~~~~~~~~~~
-
-The best way to send feedback is to file an issue at https://github.com/jonmatthis/freemocap/issues.
-
-If you are proposing a feature:
-
-* Explain in detail how it would work.
-* Keep the scope as narrow as possible, to make it easier to implement.
-* Remember that this is a volunteer-driven project, and that contributions
- are welcome :)
-
-Get Started!
-------------
-
-Ready to contribute? Here's how to set up `freemocap` for local development.
-
-1. Fork the `freemocap` repo on GitHub.
-2. Clone your fork locally::
-
- $ git clone [email protected]:your_name_here/freemocap.git
-
-3. Install your local copy into a virtualenv. Assuming you have virtualenvwrapper installed, this is how you set up your fork for local development::
-
- $ mkvirtualenv freemocap
- $ cd freemocap/
- $ python setup.py develop
-
-4. Create a branch for local development::
-
- $ git checkout -b name-of-your-bugfix-or-feature
-
- Now you can make your changes locally.
-
-5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
-
- $ flake8 freemocap tests
- $ python setup.py test
- $ tox
-
- To get flake8 and tox, just pip install them into your virtualenv.
-
-6. Commit your changes and push your branch to GitHub::
-
- $ git add .
- $ git commit -m "Your detailed description of your changes."
- $ git push origin name-of-your-bugfix-or-feature
-
-7. Submit a pull request through the GitHub website.
-
-Pull Request Guidelines
------------------------
-
-Before you submit a pull request, check that it meets these guidelines:
-
-1. The pull request should include tests.
-2. If the pull request adds functionality, the docs should be updated. Put
- your new functionality into a function with a docstring, and add the
- feature to the list in README.rst.
-3. The pull request should work for Python 2.7, 3.3, 3.4, 3.5 and for PyPy. Check
- https://travis-ci.org/jonmatthis/freemocap/pull_requests
- and make sure that the tests pass for all supported Python versions.
-
diff --git a/MANIFEST.in b/MANIFEST.in
index fd9ea7df..86ad7a67 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -13,6 +13,7 @@ include versioneer.py
include freemocap/_version.py
include freemocap/logo/*
+
# If including data files in the package, add them like:
# include path/to/data_file
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 04fd79c3..00000000
--- a/README.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-=================
-Your Project Name
-=================
-
-.. image:: https://img.shields.io/travis//your-project-name.svg
- :target: https://travis-ci.org//your-project-name
-
-.. image:: https://img.shields.io/pypi/v/your-project-name.svg
- :target: https://pypi.python.org/pypi/your-project-name
-
-
-Python package for doing science.
-
-* Free software: Affero GNU Public Licence (AGPLv3)
-* Documentation: (COMING SOON!) https://.github.io/your-project-name.
-
-Features
---------
-
-* TODO
diff --git a/docs/Makefile b/docs/Makefile
deleted file mode 100644
index b4a5893b..00000000
--- a/docs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS = "-W" # This flag turns warnings into errors.
-SPHINXBUILD = sphinx-build
-SPHINXPROJ = PackagingScientificPython
-SOURCEDIR = source
-BUILDDIR = build
-
-# Put it first so that "make" without argument is like "make help".
-help:
- @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/__init__.py b/docs/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/make.bat b/docs/make.bat
deleted file mode 100644
index 2be83069..00000000
--- a/docs/make.bat
+++ /dev/null
@@ -1,36 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
- set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-set SPHINXPROJ=PackagingScientificPython
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
- echo.
- echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
- echo.installed, then set the SPHINXBUILD environment variable to point
- echo.to the full path of the 'sphinx-build' executable. Alternatively you
- echo.may add the Sphinx directory to PATH.
- echo.
- echo.If you don't have Sphinx installed, grab it from
- echo.http://sphinx-doc.org/
- exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
-
-:end
-popd
diff --git a/docs/source/__init__.py b/docs/source/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/source/_static/.placeholder b/docs/source/_static/.placeholder
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/source/conf.py b/docs/source/conf.py
deleted file mode 100644
index 5ff90304..00000000
--- a/docs/source/conf.py
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# The FreeMoCap Project documentation build configuration file, created by
-# sphinx-quickstart on Thu Jun 28 12:35:56 2018.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#
-# needs_sphinx = '1.0'
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
- "sphinx.ext.autodoc",
- "sphinx.ext.autosummary",
- "sphinx.ext.githubpages",
- "sphinx.ext.intersphinx",
- "sphinx.ext.mathjax",
- "sphinx.ext.viewcode",
- "IPython.sphinxext.ipython_directive",
- "IPython.sphinxext.ipython_console_highlighting",
- "matplotlib.sphinxext.plot_directive",
- "numpydoc",
- "sphinx_copybutton",
-]
-
-# Configuration options for plot_directive. See:
-# https://github.com/matplotlib/matplotlib/blob/f3ed922d935751e08494e5fb5311d3050a3b637b/lib/matplotlib/sphinxext/plot_directive.py#L81
-plot_html_show_source_link = False
-plot_html_show_formats = False
-
-# Generate the API documentation when building
-autosummary_generate = True
-numpydoc_show_class_members = False
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
-
-# The suffix(es) of source filenames.
-# You can specify multiple suffix as a list of string:
-#
-# source_suffix = ['.rst', '.md']
-source_suffix = ".rst"
-
-# The master toctree document.
-master_doc = "index"
-
-# General information about the project.
-project = "The FreeMoCap Project"
-copyright = "2021, Jonathan Samir Matthis"
-author = "Jonathan Samir Matthis"
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-import freemocap
-
-# The short X.Y version.
-version = freemocap.__version__
-# The full version, including alpha/beta/rc tags.
-release = freemocap.__version__
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#
-# This is also used if you do content translation via gettext catalogs.
-# Usually you set "language" from the command line for these cases.
-language = None
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = []
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
-
-# If true, `todo` and `todoList` produce output, else they produce nothing.
-todo_include_todos = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages. See the documentation for
-# a list of builtin themes.
-#
-html_theme = "sphinx_rtd_theme"
-import sphinx_rtd_theme
-
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further. For a list of options available for each theme, see the
-# documentation.
-#
-# html_theme_options = {}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# This is required for the alabaster theme
-# refs: http://alabaster.readthedocs.io/en/latest/installation.html#sidebars
-html_sidebars = {
- "**": [
- "relations.html", # needs 'show_related': True theme option to display
- "searchbox.html",
- ]
-}
-
-
-# -- Options for HTMLHelp output ------------------------------------------
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "freemocap"
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
- # The paper size ('letterpaper' or 'a4paper').
- #
- # 'papersize': 'letterpaper',
- # The font size ('10pt', '11pt' or '12pt').
- #
- # 'pointsize': '10pt',
- # Additional stuff for the LaTeX preamble.
- #
- # 'preamble': '',
- # Latex figure (float) alignment
- #
- # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-# author, documentclass [howto, manual, or own class]).
-latex_documents = [
- (
- master_doc,
- "freemocap.tex",
- "The FreeMoCap Project Documentation",
- "Contributors",
- "manual",
- ),
-]
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
- (master_doc, "freemocap", "The FreeMoCap Project Documentation", [author], 1)
-]
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-# dir menu entry, description, category)
-texinfo_documents = [
- (
- master_doc,
- "freemocap",
- "The FreeMoCap Project Documentation",
- author,
- "freemocap",
- "The FreeMoCap Project: A free-and-open-source, hardware-and-software-agnostic, research-grade, minimal-cost motion capture system and platform for decentralized scientific research, education, and training",
- "Miscellaneous",
- ),
-]
-
-
-# Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {
- "python": ("https://docs.python.org/3/", None),
- "numpy": ("https://numpy.org/doc/stable/", None),
- "scipy": ("https://docs.scipy.org/doc/scipy/reference/", None),
- "pandas": ("https://pandas.pydata.org/pandas-docs/stable", None),
- "matplotlib": ("https://matplotlib.org/stable", None),
-}
diff --git a/docs/source/index.rst b/docs/source/index.rst
deleted file mode 100644
index cd0047ad..00000000
--- a/docs/source/index.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-.. Packaging Scientific Python documentation master file, created by
- sphinx-quickstart on Thu Jun 28 12:35:56 2018.
- You can adapt this file completely to your liking, but it should at least
- contain the root `toctree` directive.
-
-The FreeMoCap Project Documentation
-===================================
-
-.. toctree::
- :maxdepth: 2
-
- installation
- usage
- release-history
- min_versions
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
deleted file mode 100644
index cfb389ee..00000000
--- a/docs/source/installation.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-============
-Installation
-============
-
-At the command line::
-
- $ pip install freemocap
diff --git a/docs/source/min_versions.rst b/docs/source/min_versions.rst
deleted file mode 100644
index d28e7475..00000000
--- a/docs/source/min_versions.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-===================================
-Minimum Version of Python and NumPy
-===================================
-
-
-- This project supports at least the minor versions of Python
- initially released 42 months prior to a planned project release
- date.
-- The project will always support at least the 2 latest minor
- versions of Python.
-- The project will support minor versions of ``numpy`` initially
- released in the 24 months prior to a planned project release date or
- the oldest version that supports the minimum Python version
- (whichever is higher).
-- The project will always support at least the 3 latest minor
- versions of NumPy.
-
-The minimum supported version of Python will be set to
-``python_requires`` in ``setup``. All supported minor versions of
-Python will be in the test matrix and have binary artifacts built
-for releases.
-
-The project should adjust upward the minimum Python and NumPy
-version support on every minor and major release, but never on a
-patch release.
-
-This is consistent with NumPy `NEP 29
-<https://numpy.org/neps/nep-0029-deprecation_policy.html>`__.
diff --git a/docs/source/release-history.rst b/docs/source/release-history.rst
deleted file mode 100644
index 53707fbb..00000000
--- a/docs/source/release-history.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-===============
-Release History
-===============
-
-Initial Release (YYYY-MM-DD)
-----------------------------
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
deleted file mode 100644
index 72e8a6ee..00000000
--- a/docs/source/usage.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=====
-Usage
-=====
-
-Start by importing The FreeMoCap Project.
-
-.. code-block:: python
-
- import freemocap
diff --git a/freemocap-0.0.17/freemocap/__init__.py b/freemocap-0.0.17/freemocap/__init__.py
deleted file mode 100644
index 11f5d922..00000000
--- a/freemocap-0.0.17/freemocap/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from ._version import get_versions
-
-__version__ = get_versions()["version"]
-del get_versions
-
-from freemocap import fmc_runme, fmc_demo
-
-def RunMe(sessionID=None,stage=1,useOpenPose=True,useMediaPipe=False,useDLC=True,dlcConfigPath=None,debug=False,setDataPath=False,userDataPath = None):
- fmc_runme.Run(sessionID,stage,useOpenPose,useMediaPipe,useDLC,dlcConfigPath,debug,setDataPath,userDataPath)
-
-def RunDemo():
- sample_data_location = fmc_demo.DemoSetup() #run a bunch of GUIs, get the location of the directory where the data folder with the sample data is
- fmc_runme.Run(sessionID = 'sesh_21-07-18_170130',stage = 6,useOpenPose = True,useDLC = True, userDataPath = sample_data_location)
-
diff --git a/freemocap/user_preferences.yaml b/freemocap/user_preferences.yaml
index 0b348102..c7d4a449 100644
--- a/freemocap/user_preferences.yaml
+++ b/freemocap/user_preferences.yaml
@@ -12,10 +12,8 @@ saved:
path_to_save: C:/Users/jonma/Dropbox/FreeMoCapProject
rotations:
0: 0
- 1: 0
2: 0
3: 0
- 4: 0
parameters:
exposure: -7
resWidth: 640
diff --git a/freemocap_runme_script.py b/freemocap_runme_script.py
index ec3deb8d..55c808b0 100644
--- a/freemocap_runme_script.py
+++ b/freemocap_runme_script.py
@@ -4,15 +4,15 @@ from pathlib import Path
import sys
fmc.RunMe(
- # sessionID = 'sesh_2021-08-29_17_55_45',
- sessionID=None,
+ sessionID = 'sesh_2021-09-09_17_23_44',
+ # sessionID=None,
stage = 5,
- useOpenPose=True,
+ useOpenPose=False,
runOpenPose=True,
- useMediaPipe=False,
+ useMediaPipe=True,
runMediaPipe = True,
useDLC=False,
recordVid = True ,
- reconstructionConfidenceThreshold = 0.0,
+ reconstructionConfidenceThreshold = 0.5,
calVideoFrameLength = 60,
)
diff --git a/freemocap_test.py b/freemocap_test.py
deleted file mode 100644
index 44eff2d1..00000000
--- a/freemocap_test.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import freemocap
-
-# sessionID = ''
-# stage = 1
-# useOpenPose = True
-# useMediaPipe = False
-# useDLC = False
-# debug = False
-
-
-# freemocap.RunMe(sessionID,stage,useOpenPose,useMediaPipe,useDLC,debug)
-
-freemocap.RunMe( stage = 1, useDLC=True,setDataPath=False)
-
diff --git a/requirements-dev.txt b/requirements-dev.txt
deleted file mode 100644
index 3b54a372..00000000
--- a/requirements-dev.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-# These are required for developing the package (running the tests, building
-# the documentation) but not necessarily required for _using_ it.
-codecov
-coverage
-flake8
-pytest
-sphinx
-twine
-# These are dependencies of various sphinx extensions for documentation.
-ipython
-matplotlib
-numpydoc
-sphinx-copybutton
-sphinx_rtd_theme
diff --git a/requirements.txt b/requirements.txt
index 52d36442..915558ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,21 +1,11 @@
aniposelib~=0.4.1
h5py>=3.1.0
imutils~=0.5.4
-matplotlib
+matplotlib~=3.1.3
mediapipe~=0.8.6
opencv-contrib-python~=3.4.14.51
pandas~=1.2.5
-pyqtgraph~=0.12.1
rich~=10.4.0
-scipy~=1.7.0
-toml~=0.10.2
tqdm~=4.61.1
-tensorflow-gpu>=2.0
-pyqt5>=5.15.4
-pyopengl>=3.1.5
-tf_slim>=1.1.0
-deeplabcut>=2.2
-ruamel.yaml>=0.15.0
-typed-ast<1.5,>=1.4.0
-numpy<=1.19
-ffmpeg
\ No newline at end of file
+ruamel.yaml<0.17
+numpy<=1.19
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 7080aaf8..00000000
--- a/setup.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-[versioneer]
-VCS = git
-style = pep440-pre
-versionfile_source = freemocap/_version.py
-versionfile_build = freemocap/_version.py
-tag_prefix = v
diff --git a/setup.py b/setup.py
index d58b4acb..8272cea1 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ setup(
name="freemocap",
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
- description="The FreeMoCap Project: A free-and-open-source, hardware-and-software-agnostic, research-grade, minimal-cost motion capture system and platform for decentralized scientific research, education, and training",
+ description="The FreeMoCap Project: A free-and-open-source, hardware-and-software-agnostic, minimal-cost, research-grade, motion capture system and platform for decentralized scientific research, education, and training",
long_description=readme,
author="Jonathan Samir Matthis",
author_email="[email protected]",
@@ -63,6 +63,10 @@ setup(
]
},
install_requires=requirements,
+ extras_require={"dlc": ["tensorflow-gpu>=2.0",
+ "tf_slim>=1.1.0",
+ "deeplabcut>=2.2",
+ "typed-ast<1.5,>=1.4.0"]},
license="AGPLv3",
classifiers=[
"Development Status :: 2 - Pre-Alpha",
diff --git a/test_script_data_handler.py b/test_script_data_handler.py
deleted file mode 100644
index aec2751f..00000000
--- a/test_script_data_handler.py
+++ /dev/null
@@ -1,26 +0,0 @@
-from freemocap import fmc_trackdata_handler as df
-from freemocap import openpose_data_mappings as data_mapping
-
-### Make empty data structure
-data_handler = df.FmcTracDataHandler()
-
-### Set mapping
-data_handler.set_parent_mapping(data_mapping.parent_mapping)
-data_handler.set_point_name_mapping(data_mapping.point_name_mapping)
-
-### Load openpose npy data into variable
-import numpy as np
-datafile_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.npy"
-data = np.load(datafile_path)
-
-### Import data into data handler as an actor.
-# This step can be repeated for multiple datasets, adding each as an individual actor
-actor_name = "tester"
-data_handler.import_actor_raw_data(actor_name, data)
-
-### Saving data handler object to file
-file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d" # Suffix is being set to FILE_SUFFIX automatically
-df.save_obj_to_file(file_path, data_handler, override=False)
-### Loading data handler from file
-file_path = r"C:\Users\Rontc\Documents\GitHub\freemocap\FreeMocap_Data\sesh_21-07-29_104227\DataArrays\openPoseSkel_3d.fmcData"
-data_h = df.load_obj_from_file(file_path)