v0.1.0

DynamicsAndNeuralSystems · Jun 21, 2020 · e1cbde8 · e1cbde8
1 parent 4e317ab
commit e1cbde8
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -18,40 +18,40 @@ For information on the full set of over 7000 features, see the following (open :
 
 The fast C-coded functions in this repository can be used in Python, Matlab, and R following the instructions below.
 Time series are _z_-scored internally which means e.g., constant time series will lead to NaN outputs.
-The wrappers are only tested on OS X so far and require Clang.
+The wrappers for Matlab and Python run using either GCC or MSVC as compiler. The R wrapper so far only runs using GCC and was only tested on OS X.
 
 ## Python
 
 Installation of the Python wrapper differs slightly between Python 2 and 3.
 
-### Installation Python 2
+### Installation Python 3
 
-Go to the directory `wrap_Python` and run the following
+Manual installation through `distutils`
 
 ```
-python setup.py build
-python setup.py install
+python3 setup_P3.py build
+python3 setup_P3.py install
 ```
 
-or alternatively, using pip, go to main directory and run
+Or using pip
 
 ```
-pip install -e wrap_Python
+pip install catch22
 ```
 
-### Installation Python 3
+### Installation Python 2
 
-Manual installation through `distutils`
+Go to the directory `wrap_Python` and run the following
 
 ```
-python3 setup_P3.py build
-python3 setup_P3.py install
+python setup.py build
+python setup.py install
 ```
 
-Or using pip
+or alternatively, using pip, go to main directory and run
 
 ```
-pip install catch22
+pip install -e wrap_Python
 ```
 
 ### Test Python 2 and 3

diff --git a/wrap_Python/setup.py b/wrap_Python/setup.py
@@ -10,4 +10,19 @@
 	sources=["catch22_wrap.c"] + sourceFileList, 
 	include_dirs=[sourceDir])
 
-setup(name = "catch22", ext_modules=[extension_mod])
+# setup(name = "catch22", ext_modules=[extension_mod])
+
+setup(
+name="catch22",
+version="0.1.0",
+author="Carl H Lubba",
+url="https://github.com/chlubba/catch22",
+description="CAnonical Time-series Features, see description and license on GitHub.",
+ext_modules=[extension_mod],
+packages=['catch22'],
+classifiers=[
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+    ],
+)
diff --git a/wrap_Python/setup_P3.py b/wrap_Python/setup_P3.py
@@ -10,4 +10,19 @@
 	sources=["catch22_wrap_P3.c"] + sourceFileList, 
 	include_dirs=[sourceDir])
 
-setup(name = "catch22", ext_modules=[extension_mod], packages=['catch22'])
+# setup(name = "catch22", ext_modules=[extension_mod], packages=['catch22'])
+
+setup(
+name="catch22",
+version="0.1.0",
+author="Carl H Lubba",
+url="https://github.com/chlubba/catch22",
+description="CAnonical Time-series Features, see description and license on GitHub.",
+ext_modules=[extension_mod],
+packages=['catch22'],
+classifiers=[
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+    ],
+)