diff options
author | Vratko Polak <vrpolak@cisco.com> | 2018-06-14 14:04:03 +0200 |
---|---|---|
committer | Tibor Frank <tifrank@cisco.com> | 2018-06-15 10:44:11 +0000 |
commit | 6149ec451efff00068f38e3343e66cdec7b943f4 (patch) | |
tree | ec51cb4339782d37889f29383f303f9bdf35faa0 | |
parent | 2f99b522d591a95d6ac4f11db8a34b8162258ecd (diff) |
CSIT-1110: Use jumpavg library from pip
+ Move the jumpavg library code to separate directory.
- Bump to 0.1.2 has to be done later.
Change-Id: I9722ede48f00e99eeb68ca3f91e0bdeee2937973
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
-rw-r--r-- | PyPI/README.txt | 6 | ||||
-rw-r--r-- | PyPI/jumpavg/.gitignore | 104 | ||||
-rw-r--r-- | PyPI/jumpavg/LICENSE.txt (renamed from resources/tools/presentation/new/jumpavg/LICENSE.txt) | 1 | ||||
-rw-r--r-- | PyPI/jumpavg/MANIFEST.in (renamed from resources/tools/presentation/new/jumpavg/MANIFEST.in) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/README.rst (renamed from resources/tools/presentation/new/jumpavg/README.rst) | 6 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/AbstractGroupClassifier.py (renamed from resources/tools/presentation/new/jumpavg/AbstractGroupClassifier.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/AbstractGroupMetadata.py (renamed from resources/tools/presentation/new/jumpavg/AbstractGroupMetadata.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/AvgStdevMetadata.py (renamed from resources/tools/presentation/new/jumpavg/AvgStdevMetadata.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/AvgStdevMetadataFactory.py (renamed from resources/tools/presentation/new/jumpavg/AvgStdevMetadataFactory.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/BitCountingClassifier.py (renamed from resources/tools/presentation/new/jumpavg/BitCountingClassifier.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/BitCountingGroup.py (renamed from resources/tools/presentation/new/jumpavg/BitCountingGroup.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/BitCountingGroupList.py (renamed from resources/tools/presentation/new/jumpavg/BitCountingGroupList.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/BitCountingMetadata.py (renamed from resources/tools/presentation/new/jumpavg/BitCountingMetadata.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/BitCountingMetadataFactory.py (renamed from resources/tools/presentation/new/jumpavg/BitCountingMetadataFactory.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/ClassifiedBitCountingMetadata.py (renamed from resources/tools/presentation/new/jumpavg/ClassifiedBitCountingMetadata.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/ClassifiedMetadataFactory.py (renamed from resources/tools/presentation/new/jumpavg/ClassifiedMetadataFactory.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/RunGroup.py (renamed from resources/tools/presentation/new/jumpavg/RunGroup.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/jumpavg/__init__.py (renamed from resources/tools/presentation/new/jumpavg/__init__.py) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/setup.cfg (renamed from resources/tools/presentation/new/jumpavg/setup.cfg) | 0 | ||||
-rw-r--r-- | PyPI/jumpavg/setup.py (renamed from resources/tools/presentation/new/jumpavg/setup.py) | 14 | ||||
-rw-r--r-- | resources/tools/presentation/new/jumpavg/.gitignore | 10 | ||||
-rw-r--r-- | resources/tools/presentation/new/requirements.txt | 1 | ||||
-rw-r--r-- | resources/tools/presentation/requirements.txt | 1 |
23 files changed, 124 insertions, 19 deletions
diff --git a/PyPI/README.txt b/PyPI/README.txt new file mode 100644 index 0000000000..5dd27e3ac7 --- /dev/null +++ b/PyPI/README.txt @@ -0,0 +1,6 @@ +Directories here hold code to be released into Python Package Index (PyPI). + +Mosly libraries, so people could expect them in resources/libraries/python/. +But these libraries cannot be there, because that is a package hierarchy +used by robot code, but we want the libraries here +to be NOT read from cloned CSIT git repo, but from pip. diff --git a/PyPI/jumpavg/.gitignore b/PyPI/jumpavg/.gitignore new file mode 100644 index 0000000000..894a44cc06 --- /dev/null +++ b/PyPI/jumpavg/.gitignore @@ -0,0 +1,104 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery beat schedule file +celerybeat-schedule + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ diff --git a/resources/tools/presentation/new/jumpavg/LICENSE.txt b/PyPI/jumpavg/LICENSE.txt index d645695673..261eeb9e9f 100644 --- a/resources/tools/presentation/new/jumpavg/LICENSE.txt +++ b/PyPI/jumpavg/LICENSE.txt @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/resources/tools/presentation/new/jumpavg/MANIFEST.in b/PyPI/jumpavg/MANIFEST.in index 58073271d1..58073271d1 100644 --- a/resources/tools/presentation/new/jumpavg/MANIFEST.in +++ b/PyPI/jumpavg/MANIFEST.in diff --git a/resources/tools/presentation/new/jumpavg/README.rst b/PyPI/jumpavg/README.rst index 732af5e9d9..2bdde2b9d0 100644 --- a/resources/tools/presentation/new/jumpavg/README.rst +++ b/PyPI/jumpavg/README.rst @@ -11,8 +11,9 @@ project of fd.io_ (Fast Data), one of LFN_ (Linux Foundation Networking) projects. In order to make this code available in PyPI_ (Python Package Index), -and to avoid rigid release cadence of CSIT, -the library has been moved into this standalone project. +the setuputils stuff has been added, +and the code has been moved into a separate directory_, +in order to not intervere of otherwise tightly coupled CSIT code. Usage ----- @@ -24,3 +25,4 @@ TODO. .. _fd.io: https://fd.io/ .. _LFN: https://www.linuxfoundation.org/projects/networking/ .. _PyPI: https://pypi.org/ +.. _directory: https://gerrit.fd.io/r/gitweb?p=csit.git;a=tree;f=PyPI/jumpavg;hb=refs/heads/master diff --git a/resources/tools/presentation/new/jumpavg/AbstractGroupClassifier.py b/PyPI/jumpavg/jumpavg/AbstractGroupClassifier.py index 2612b009da..2612b009da 100644 --- a/resources/tools/presentation/new/jumpavg/AbstractGroupClassifier.py +++ b/PyPI/jumpavg/jumpavg/AbstractGroupClassifier.py diff --git a/resources/tools/presentation/new/jumpavg/AbstractGroupMetadata.py b/PyPI/jumpavg/jumpavg/AbstractGroupMetadata.py index 3235dbd485..3235dbd485 100644 --- a/resources/tools/presentation/new/jumpavg/AbstractGroupMetadata.py +++ b/PyPI/jumpavg/jumpavg/AbstractGroupMetadata.py diff --git a/resources/tools/presentation/new/jumpavg/AvgStdevMetadata.py b/PyPI/jumpavg/jumpavg/AvgStdevMetadata.py index efc1a90cd4..efc1a90cd4 100644 --- a/resources/tools/presentation/new/jumpavg/AvgStdevMetadata.py +++ b/PyPI/jumpavg/jumpavg/AvgStdevMetadata.py diff --git a/resources/tools/presentation/new/jumpavg/AvgStdevMetadataFactory.py b/PyPI/jumpavg/jumpavg/AvgStdevMetadataFactory.py index 6d2e967a88..6d2e967a88 100644 --- a/resources/tools/presentation/new/jumpavg/AvgStdevMetadataFactory.py +++ b/PyPI/jumpavg/jumpavg/AvgStdevMetadataFactory.py diff --git a/resources/tools/presentation/new/jumpavg/BitCountingClassifier.py b/PyPI/jumpavg/jumpavg/BitCountingClassifier.py index 9a723199d2..9a723199d2 100644 --- a/resources/tools/presentation/new/jumpavg/BitCountingClassifier.py +++ b/PyPI/jumpavg/jumpavg/BitCountingClassifier.py diff --git a/resources/tools/presentation/new/jumpavg/BitCountingGroup.py b/PyPI/jumpavg/jumpavg/BitCountingGroup.py index 2071c061ea..2071c061ea 100644 --- a/resources/tools/presentation/new/jumpavg/BitCountingGroup.py +++ b/PyPI/jumpavg/jumpavg/BitCountingGroup.py diff --git a/resources/tools/presentation/new/jumpavg/BitCountingGroupList.py b/PyPI/jumpavg/jumpavg/BitCountingGroupList.py index 1f69c0635d..1f69c0635d 100644 --- a/resources/tools/presentation/new/jumpavg/BitCountingGroupList.py +++ b/PyPI/jumpavg/jumpavg/BitCountingGroupList.py diff --git a/resources/tools/presentation/new/jumpavg/BitCountingMetadata.py b/PyPI/jumpavg/jumpavg/BitCountingMetadata.py index d25d355cab..d25d355cab 100644 --- a/resources/tools/presentation/new/jumpavg/BitCountingMetadata.py +++ b/PyPI/jumpavg/jumpavg/BitCountingMetadata.py diff --git a/resources/tools/presentation/new/jumpavg/BitCountingMetadataFactory.py b/PyPI/jumpavg/jumpavg/BitCountingMetadataFactory.py index 567c3d4fe6..567c3d4fe6 100644 --- a/resources/tools/presentation/new/jumpavg/BitCountingMetadataFactory.py +++ b/PyPI/jumpavg/jumpavg/BitCountingMetadataFactory.py diff --git a/resources/tools/presentation/new/jumpavg/ClassifiedBitCountingMetadata.py b/PyPI/jumpavg/jumpavg/ClassifiedBitCountingMetadata.py index 29359f0908..29359f0908 100644 --- a/resources/tools/presentation/new/jumpavg/ClassifiedBitCountingMetadata.py +++ b/PyPI/jumpavg/jumpavg/ClassifiedBitCountingMetadata.py diff --git a/resources/tools/presentation/new/jumpavg/ClassifiedMetadataFactory.py b/PyPI/jumpavg/jumpavg/ClassifiedMetadataFactory.py index 7fdea7c162..7fdea7c162 100644 --- a/resources/tools/presentation/new/jumpavg/ClassifiedMetadataFactory.py +++ b/PyPI/jumpavg/jumpavg/ClassifiedMetadataFactory.py diff --git a/resources/tools/presentation/new/jumpavg/RunGroup.py b/PyPI/jumpavg/jumpavg/RunGroup.py index 9de8ae8919..9de8ae8919 100644 --- a/resources/tools/presentation/new/jumpavg/RunGroup.py +++ b/PyPI/jumpavg/jumpavg/RunGroup.py diff --git a/resources/tools/presentation/new/jumpavg/__init__.py b/PyPI/jumpavg/jumpavg/__init__.py index 8e41ed9fe2..8e41ed9fe2 100644 --- a/resources/tools/presentation/new/jumpavg/__init__.py +++ b/PyPI/jumpavg/jumpavg/__init__.py diff --git a/resources/tools/presentation/new/jumpavg/setup.cfg b/PyPI/jumpavg/setup.cfg index b4abd1bd30..b4abd1bd30 100644 --- a/resources/tools/presentation/new/jumpavg/setup.cfg +++ b/PyPI/jumpavg/setup.cfg diff --git a/resources/tools/presentation/new/jumpavg/setup.py b/PyPI/jumpavg/setup.py index 86a38893d0..aa56efd9c9 100644 --- a/resources/tools/presentation/new/jumpavg/setup.py +++ b/PyPI/jumpavg/setup.py @@ -14,11 +14,12 @@ with open(path.join(here, "README.rst"), encoding="utf-8") as f: setup( name="jumpavg", - version="0.1.0", # This is currently the only place listing the version. - description="Library for finding changes in time series by grouping results", + version="0.1.2", # This is currently the only place listing the version. + description="Library for finding changes in time series by grouping results.", long_description=long_description, long_description_content_type="text/x-rst", - url="https://github.com/vrpolakatcisco/jumpavg", + # TODO: Create a separate webpage for jumpavg library. + url="https://gerrit.fd.io/r/gitweb?p=csit.git;a=tree;f=PyPI/jumpavg;hb=refs/heads/master", author="Cisco Systems Inc. and/or its affiliates", author_email="csit-dev@lists.fd.io", classifiers=[ @@ -26,13 +27,14 @@ setup( "Intended Audience :: Science/Research", # Pick your license as you wish "License :: OSI Approved :: Apache Software License", - "Natural Language :: English" + "Natural Language :: English", # TODO: Test which Python versions is the code compatible with. "Programming Language :: Python :: 2.7", "Topic :: Scientific/Engineering :: Information Analysis" ], keywords="progression regression anomaly detection", packages=find_packages(exclude=[]), + # TODO: python_requires="~=2.7" install_requires=[], # TODO: Include simulator and tests. extras_require={ @@ -44,7 +46,7 @@ setup( ], }, project_urls={ - "Bug Reports": "https://github.com/vrpolakatcisco/jumpavg/issues", - "Source": "https://github.com/vrpolakatcisco/jumpavg/", + "Bug Reports": "https://jira.fd.io/projects/CSIT/issues", + "Source": "https://gerrit.fd.io/r/gitweb?p=csit.git;a=tree;f=PyPI/jumpavg;hb=refs/heads/master", }, ) diff --git a/resources/tools/presentation/new/jumpavg/.gitignore b/resources/tools/presentation/new/jumpavg/.gitignore deleted file mode 100644 index bb8ed49b5c..0000000000 --- a/resources/tools/presentation/new/jumpavg/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ - -# general things to ignore -build/ -dist/ -*.egg-info/ -*.egg -*.py[cod] -__pycache__/ -*.so -*~ diff --git a/resources/tools/presentation/new/requirements.txt b/resources/tools/presentation/new/requirements.txt index a33848d681..b7b3c13dad 100644 --- a/resources/tools/presentation/new/requirements.txt +++ b/resources/tools/presentation/new/requirements.txt @@ -1,3 +1,4 @@ +jumpavg==0.1.0 Sphinx sphinx-rtd-theme robotframework==2.9.2 diff --git a/resources/tools/presentation/requirements.txt b/resources/tools/presentation/requirements.txt index a33848d681..b7b3c13dad 100644 --- a/resources/tools/presentation/requirements.txt +++ b/resources/tools/presentation/requirements.txt @@ -1,3 +1,4 @@ +jumpavg==0.1.0 Sphinx sphinx-rtd-theme robotframework==2.9.2 |