Skip to content

Commit 26c4f78

Browse files
author
Aleksandr Salynskii
authored
Merge pull request #39 from ttldtor/EN-3260-add-compatibility-with-python-3.9-2
[EN-3260] [PythonAPI] Add compatibility of PythonAPI with Python 3.9+
2 parents 5f3694a + 0610ece commit 26c4f78

20 files changed

+569
-128
lines changed

‎.github/workflows/publishpackage.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
build:
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, windows-latest, macos-latest]
15-
python-version: [3.6, 3.7, 3.8]
14+
os: [ubuntu-18.04, windows-latest, macos-latest]
15+
python-version: [3.6, 3.7, 3.8, 3.9]
1616

1717
runs-on: ${{ matrix.os }}
1818

@@ -34,12 +34,11 @@ jobs:
3434
poetry install --no-root
3535
shell: bash
3636
- name: Create tarball
37-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.7
37+
if: matrix.python-version == 3.7
3838
run: |
3939
task build -f sdist
4040
shell: bash
4141
- name: Create wheel
42-
if: matrix.os == 'windows-latest' || matrix.os == 'macos-latest'
4342
run: |
4443
task build -f wheel
4544
shell: bash
@@ -52,7 +51,7 @@ jobs:
5251

5352

5453
publish:
55-
runs-on: ubuntu-latest
54+
runs-on: ubuntu-18.04
5655
needs: build
5756
steps:
5857
- uses: actions/checkout@v2

‎.github/workflows/test_on_pr.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# This workflow will check package installation and runs tests on PR
2+
name: Test on PR
3+
4+
on:
5+
pull_request:
6+
types: [opened, reopened, synchronize]
7+
8+
jobs:
9+
installation:
10+
strategy:
11+
matrix:
12+
os: [ubuntu-18.04, windows-latest, macos-latest]
13+
python-version: [3.6, 3.7, 3.8, 3.9]
14+
15+
runs-on: ${{ matrix.os }}
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
with:
20+
submodules: true
21+
- name: Set up Python ${{ matrix.python-version }}
22+
uses: actions/setup-python@v1
23+
with:
24+
python-version: ${{ matrix.python-version }}
25+
- name: Install poetry
26+
run: |
27+
pip install poetry
28+
shell: bash
29+
- name: Set poetry env
30+
run: |
31+
poetry config virtualenvs.create false
32+
poetry install --no-root --no-dev
33+
pip install taskipy cython
34+
task build -f sdist
35+
pip uninstall --yes taskipy cython
36+
shell: bash
37+
- name: Install package artifact
38+
run: |
39+
pip install dist/dxfeed*
40+
pip uninstall --yes dxfeed
41+
shell: bash
42+
tests:
43+
needs: installation
44+
strategy:
45+
matrix:
46+
os: [ubuntu-18.04, windows-latest, macos-latest]
47+
python-version: [3.6, 3.7, 3.8, 3.9]
48+
49+
runs-on: ${{ matrix.os }}
50+
51+
steps:
52+
- uses: actions/checkout@v2
53+
with:
54+
submodules: true
55+
- name: Set up Python ${{ matrix.python-version }}
56+
uses: actions/setup-python@v1
57+
with:
58+
python-version: ${{ matrix.python-version }}
59+
- name: Install poetry
60+
run: |
61+
pip install poetry
62+
shell: bash
63+
- name: Set poetry env
64+
run: |
65+
poetry config virtualenvs.create false
66+
poetry install --no-root
67+
shell: bash
68+
- name: Run tests
69+
run: |
70+
task test
71+
shell: bash
72+
- name: Generate doc
73+
run: |
74+
task html_docs
75+
shell: bash
76+
if: matrix.os == 'ubuntu-18.04' && matrix.python-version == 3.7

‎.github/workflows/testdevelop.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
installation:
1313
strategy:
1414
matrix:
15-
os: [ubuntu-latest, windows-latest, macos-latest]
15+
os: [ubuntu-18.04, windows-latest, macos-latest]
1616
python-version: [3.6, 3.7, 3.8, 3.9]
1717

1818
runs-on: ${{ matrix.os }}
@@ -46,7 +46,7 @@ jobs:
4646
needs: installation
4747
strategy:
4848
matrix:
49-
os: [ubuntu-latest, windows-latest, macos-latest]
49+
os: [ubuntu-18.04, windows-latest, macos-latest]
5050
python-version: [3.6, 3.7, 3.8, 3.9]
5151

5252
runs-on: ${{ matrix.os }}
@@ -76,4 +76,4 @@ jobs:
7676
run: |
7777
task html_docs
7878
shell: bash
79-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.7
79+
if: matrix.os == 'ubuntu-18.04' && matrix.python-version == 3.7

‎.github/workflows/testpackage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
installation:
1414
strategy:
1515
matrix:
16-
os: [ubuntu-latest, windows-latest, macos-latest]
17-
python-version: [3.6, 3.7, 3.8]
16+
os: [ubuntu-18.04, windows-latest, macos-latest]
17+
python-version: [3.6, 3.7, 3.8, 3.9]
1818

1919
runs-on: ${{ matrix.os }}
2020

@@ -47,7 +47,7 @@ jobs:
4747
needs: installation
4848
strategy:
4949
matrix:
50-
os: [ubuntu-latest, windows-latest, macos-latest]
50+
os: [ubuntu-18.04, windows-latest, macos-latest]
5151
python-version: [3.6, 3.7, 3.8]
5252

5353
runs-on: ${{ matrix.os }}
@@ -77,4 +77,4 @@ jobs:
7777
run: |
7878
task html_docs
7979
shell: bash
80-
if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.7
80+
if: matrix.os == 'ubuntu-18.04' && matrix.python-version == 3.7

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,11 @@ _build*
1717

1818
Pipfile*
1919
dist*
20+
dist
21+
build/**
22+
dxfeed/core/**/*.c
23+
dxfeed/tmp
24+
25+
setup.py
26+
poetry.lock
27+
dxfeed.egg-info

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎README.md‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ pip3 install dxfeed
3434

3535
## Installation from sources
3636

37-
Reminder: initialize and pull git submodule after cloning the repo:
38-
```bash
39-
git submodule init
40-
git submodule update
41-
```
42-
4337
To install dxfeed from source you need Poetry. It provides a custom installer.
4438
This is the recommended way of installing poetry according to [documentation](https://python-poetry.org/docs/)
4539

0 commit comments

Comments
 (0)