Merge branch 'master' of github.com:dxFeed/dxfeed-python-api

Author: iamishalkin

README.md

@@ -23,13 +23,6 @@ Install package via PyPI
 pip3 install dxfeed
 ``` 
 
----
-**NOTE**
-
-MacOS is not supported yet
-
----
-
 ## Basic usage
 
 All the functions in C API have similar ones in Python with the same name. Not all arguments are

build.py

@@ -17,19 +17,29 @@
 source_files_directory = Path(__file__).resolve().parent.joinpath('dxfeed', 'dxfeed-c-api', 'src')
 source_files_paths = [str(path) for path in source_files_directory.glob('*.c')]
 libs = list()
+include_dirs = [str(source_files_directory.parent.joinpath('include')),
+                str(source_files_directory)]
+### Build dxfeed c library
+dxfeed_c_lib_args = dict()
 if platform.system() == 'Windows':
     source_files_paths.remove(str(source_files_directory.joinpath('Linux.c')))
-    libs = ['ws2_32']
+    libs.append('ws2_32')
 else:
     source_files_paths.remove(str(source_files_directory.joinpath('Win32.c')))
+dxfeed_c_lib_args.update({'sources': source_files_paths,
+                          'include_dirs': include_dirs})
 
-# Separate dxfeed c api library
-dxfeed_c = ('dxfeed_c', {'sources': source_files_paths,
-                         'libraries': libs})
+if platform.system() == 'Darwin':
+    dxfeed_c_lib_args.update({'macros': [('MACOSX', 'TRUE')]})
 
-extensions = [Extension('dxfeed.core.utils.helpers', ['dxfeed/core/utils/helpers.' + ext]),
-              Extension('dxfeed.core.listeners.listener', ['dxfeed/core/listeners/listener.' + ext]),
-              Extension('dxfeed.core.DXFeedPy', ['dxfeed/core/DXFeedPy.' + ext_pp], libraries=libs)]
+dxfeed_c = ('dxfeed_c', dxfeed_c_lib_args)
+
+extensions = [Extension('dxfeed.core.utils.helpers', ['dxfeed/core/utils/helpers.' + ext],
+                        include_dirs=include_dirs),
+              Extension('dxfeed.core.listeners.listener', ['dxfeed/core/listeners/listener.' + ext],
+                        include_dirs=include_dirs),
+              Extension('dxfeed.core.DXFeedPy', ['dxfeed/core/DXFeedPy.' + ext_pp], libraries=libs,
+                        include_dirs=include_dirs)]
 
 if use_cython:
     extensions = cythonize(extensions, language_level=3)
@@ -41,8 +51,7 @@ def build(setup_kwargs):
         'zip_safe': False,
         'libraries': [dxfeed_c],
         'packages': find_packages(),
-        'include_dirs': ['dxfeed/dxfeed-c-api/include',
-                         'dxfeed/dxfeed-c-api/src'],
+        'include_dirs': include_dirs,
     })
 
 def build_extensions():

docs/installation.rst

@@ -10,11 +10,9 @@ Installation
 
         pip3 install pandas
 
-The easiest way to install dxfeed is to use pip
+Install package itself with PyPI
 
 .. code-block:: bash
 
     pip3 install dxfeed
 
-.. warning::
-    Package is not available on MacOS for now

pyproject.toml

@@ -9,6 +9,7 @@ readme = "README.md"
 classifiers = ["Development Status :: 4 - Beta",
                "Operating System :: Microsoft :: Windows",
                "Operating System :: POSIX :: Linux",
+               "Operating System :: MacOS",
                "Programming Language :: Cython",
                "Programming Language :: Python :: 3 :: Only",
                "Topic :: Office/Business :: Financial",
@@ -24,7 +25,7 @@ exclude = ["dxfeed/dxfeed-c-api/wrappers*",
            "dxfeed/dxfeed-c-api/.github*"]
 
 [tool.poetry.urls]
-"Repository" = "https://github.com/dxFeed/dxfeed-python-api"
+"Source code" = "https://github.com/dxFeed/dxfeed-python-api"
 "Documentation" = "https://docs.dxfeed.com/python/index.html"
 
 [tool.poetry.dependencies]
@@ -41,7 +42,7 @@ sphinx_rtd_theme = "^0.4.3"
 
 
 [tool.taskipy.tasks]
-clear = "find dxfeed/core/* -type f ( -name '*.c*' -or -name '*.pyd' ) -delete"
+clear = "find dxfeed/core -type f \\( -iname \\*.c -o -iname \\*.cpp -o -iname \\*.pyd -o -iname \\*.so \\) -delete"
 build = "python build.py && poetry build"
 html_docs = "make html -C docs"
 test =  "pytest tests"

tests/conftest.py

@@ -1,3 +1,6 @@
+import sys
+from pathlib import Path
+sys.path.append(str(Path(__file__).parents[1]))
 from build import build_extensions