From 5321e698768e95a6d702f6a611338ac51ced2e2f Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 11:10:12 +0300 Subject: [PATCH 01/10] [EN-2047] cython in docs requirements --- pyproject.toml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5a2d6da..e47a489 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,8 @@ exclude = ['dxfeed/dxfeed-c-api/wrappers*', 'dxfeed/dxfeed-c-api/scripts*', 'dxfeed/dxfeed-c-api/lib*', 'dxfeed/dxfeed-c-api/docs*', - 'dxfeed/dxfeed-c-api/.github*'] + 'dxfeed/dxfeed-c-api/.github*', + 'setup.py'] [tool.poetry.urls] 'Source code' = 'https://github.com/dxFeed/dxfeed-python-api' @@ -38,6 +39,7 @@ toml = '^0.10.0' # Refer to: https://github.com/sdispater/poetry/issues/129 # Issue to watch for: https://github.com/python-poetry/poetry/issues/1644 jupyter = { version = '^1.0.0', optional = true } +cython = { version = '^0.29.13', optional = true } [tool.poetry.dev-dependencies] cython = '^0.29.13' @@ -48,7 +50,7 @@ sphinx_rtd_theme = '^0.4.3' pygments = '^2.6.1' [tool.poetry.extras] -docs = ['jupyter'] +docs = ['jupyter', 'cython'] [tool.taskipy.tasks] clear = 'find dxfeed/core -type f \( -iname *.c -o -iname *.cpp -o -iname *.pyd -o -iname *.so \) -delete' From d05f0f670b2fac2fe63a0696e81f38065303fb17 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 11:14:40 +0300 Subject: [PATCH 02/10] [EN-1980] drop setup.py from exclude --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e47a489..5aa7e71 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,8 +22,7 @@ exclude = ['dxfeed/dxfeed-c-api/wrappers*', 'dxfeed/dxfeed-c-api/scripts*', 'dxfeed/dxfeed-c-api/lib*', 'dxfeed/dxfeed-c-api/docs*', - 'dxfeed/dxfeed-c-api/.github*', - 'setup.py'] + 'dxfeed/dxfeed-c-api/.github*'] [tool.poetry.urls] 'Source code' = 'https://github.com/dxFeed/dxfeed-python-api' From ec87b9280493bd672e355338aba3e7e4db8cebb1 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 11:27:41 +0300 Subject: [PATCH 03/10] [EN-2047] setup.py edit --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fec8e2a..71d0423 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ global setup_kwargs -setup_kwargs = {} +setup_kwargs = {'extras_require': {'docs': ['cython>=0.29.13']}} build(setup_kwargs) setup(**setup_kwargs) From 575077ad20035312e661be12a671dbd747a89756 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 11:33:22 +0300 Subject: [PATCH 04/10] [EN-2047] install_requires to setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 71d0423..13f4da7 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ global setup_kwargs -setup_kwargs = {'extras_require': {'docs': ['cython>=0.29.13']}} +setup_kwargs = {'install_requires': ['cython>=0.29.13']} build(setup_kwargs) setup(**setup_kwargs) From 18df43c478fb9d42b699e475e802e5d361917507 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 11:58:31 +0300 Subject: [PATCH 05/10] [EN-2047] docs/requirements.txt --- .readthedocs.yml | 1 + docs/requirements.txt | 1 + pyproject.toml | 1 - setup.py | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 docs/requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml index 4bb28bc..efd085c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,6 +12,7 @@ formats: all python: version: 3.7 install: + - requirements: docs/requirements.txt - method: pip path: . extra_requirements: diff --git a/docs/requirements.txt b/docs/requirements.txt new file mode 100644 index 0000000..62b366d --- /dev/null +++ b/docs/requirements.txt @@ -0,0 +1 @@ +cython \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 5aa7e71..3afcf3a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,7 +38,6 @@ toml = '^0.10.0' # Refer to: https://github.com/sdispater/poetry/issues/129 # Issue to watch for: https://github.com/python-poetry/poetry/issues/1644 jupyter = { version = '^1.0.0', optional = true } -cython = { version = '^0.29.13', optional = true } [tool.poetry.dev-dependencies] cython = '^0.29.13' diff --git a/setup.py b/setup.py index 13f4da7..fec8e2a 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ global setup_kwargs -setup_kwargs = {'install_requires': ['cython>=0.29.13']} +setup_kwargs = {} build(setup_kwargs) setup(**setup_kwargs) From 37e11d4eb234202ff98afce749c3eb18de43fad1 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 12:03:33 +0300 Subject: [PATCH 06/10] [EN-2047] build_extensions --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index fec8e2a..e33b2da 100644 --- a/setup.py +++ b/setup.py @@ -5,5 +5,6 @@ setup_kwargs = {} +build_extensions() build(setup_kwargs) setup(**setup_kwargs) From 71715a1b56e06fb78d5319328eaa6dfa84b90d78 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 12:09:46 +0300 Subject: [PATCH 07/10] [EN-2047] drop setup.py --- setup.py | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index e33b2da..0000000 --- a/setup.py +++ /dev/null @@ -1,10 +0,0 @@ -from setuptools import setup -from build import * - -global setup_kwargs - -setup_kwargs = {} - -build_extensions() -build(setup_kwargs) -setup(**setup_kwargs) From 269c2ed16ae46d84357cff5b0f8d7a8fed7812a6 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 12:13:07 +0300 Subject: [PATCH 08/10] [EN-2047] cython again in build-system --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3afcf3a..c534e5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,5 +60,5 @@ post_build = 'task clear' post_test = 'task clear' [build-system] -requires = ['poetry_core>=1.0.0', 'setuptools'] +requires = ['poetry_core>=1.0.0', 'setuptools', 'cython'] build-backend = 'poetry.core.masonry.api' From b38edbc1d107d8bd85fd2f18a49dc38ab1e6d3db Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 12:21:14 +0300 Subject: [PATCH 09/10] [EN-2047] back to working state --- .readthedocs.yml | 1 - docs/requirements.txt | 1 - pyproject.toml | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 docs/requirements.txt diff --git a/.readthedocs.yml b/.readthedocs.yml index efd085c..4bb28bc 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -12,7 +12,6 @@ formats: all python: version: 3.7 install: - - requirements: docs/requirements.txt - method: pip path: . extra_requirements: diff --git a/docs/requirements.txt b/docs/requirements.txt deleted file mode 100644 index 62b366d..0000000 --- a/docs/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -cython \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index c534e5b..23221d8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,7 @@ toml = '^0.10.0' # Refer to: https://github.com/sdispater/poetry/issues/129 # Issue to watch for: https://github.com/python-poetry/poetry/issues/1644 jupyter = { version = '^1.0.0', optional = true } +cython = { version = '^0.29.13', optional = true } [tool.poetry.dev-dependencies] cython = '^0.29.13' From 62e6a4ec9ec2d03f9418f83ac069934cd2526030 Mon Sep 17 00:00:00 2001 From: iamishalkin Date: Thu, 8 Oct 2020 12:38:19 +0300 Subject: [PATCH 10/10] [EN-2047] change version --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 23221d8..c954472 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = 'dxfeed' -version = '0.5.1' +version = '0.5.2' description = 'DXFeed Python API via C API' authors = ['Index Management Team '] build = 'build.py'