Skip to content

Commit 2eee513

Browse files
authored
Merge pull request #417 from superannotateai/develop
Develop
2 parents 597949b + 8c4cf24 commit 2eee513

File tree

111 files changed

+53551
-4480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+53551
-4480
lines changed

.github/workflows/checks_and_dev_deploy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
pip install setuptools wheel twine yapf sphinx sphinx_rtd_theme
2020
pip install shapely
2121
pip install -r requirements.txt
22+
pip install -r requirements_prod.txt
2223
- name: Check formatting
2324
run: yapf -p -r --diff superannotate
2425
- name: Check docs

.readthedocs.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ python:
2222
version: 3.7
2323
install:
2424
- requirements: requirements.txt
25-
- requirements: requirements_extra.txt
25+
- requirements: requirements_extra.txt
26+
- requirements: requirements_prod.txt

MANIFEST.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include README.md
22
include requirements.txt
3-
include requirements_extra.txt
3+
include requirements_dev.txt
4+
include requirements_prod.txt
45
include LICENSE

docs/source/superannotate.sdk.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ Exports
6161
_______
6262

6363
.. autofunction:: superannotate.prepare_export
64+
.. autofunction:: superannotate.get_annotations
65+
.. autofunction:: superannotate.get_annotations_per_frame
6466
.. _ref_download_export:
6567
.. autofunction:: superannotate.download_export
6668
.. autofunction:: superannotate.get_exports

pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
minversion = 3.0
33
log_cli=true
44
python_files = test_*.py
5-
;addopts = -n auto --dist=loads cope
5+
;addopts = -n auto --dist=loadscope

requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ffmpeg-python>=0.2.0
1616
fire==0.4.0
1717
mixpanel==4.8.3
1818
pydantic>=1.8.2
19-
pydantic[email]
2019
setuptools~=57.4.0
21-
superannotate_schemas
20+
aiohttp==3.8.1
21+
email-validator>=1.0.3
22+
nest-asyncio==1.5.4

requirements_dev.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1 @@
1-
Sphinx==3.1.2
2-
tox==3.24.2
3-
pytest==6.2.4
4-
pytest-xdist==2.3.0
5-
pytest-parallel==0.1.0
6-
pytest-rerunfailures==10.2
7-
sphinx_rtd_theme==1.0.0
8-
1+
superannotate_schemas>=1.0.38.b1

requirements_extra.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
11
Sphinx==3.1.2
22
tox==3.24.2
3+
pytest==6.2.4
4+
pytest-xdist==2.3.0
5+
pytest-parallel==0.1.0
6+
pytest-rerunfailures==10.2
7+
sphinx_rtd_theme==1.0.0

requirements_prod.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
superannotate_schemas

setup.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
import sys
2-
1+
from packaging.version import parse
32
from setuptools import find_packages, setup
43

54

65
with open('src/superannotate/version.py') as f:
76
version = f.read().rstrip()[15:-1]
87

8+
requirements_path = "requirements_{}.txt".format('dev' if parse(version).is_prerelease else 'prod')
9+
requirements = []
910

10-
with open('requirements.txt') as f:
11-
requirements = f.read()
12-
requirements = requirements.splitlines()
11+
with open("requirements.txt") as f:
12+
requirements.extend(f.read().splitlines())
1313

14-
if sys.platform == 'linux':
15-
with open('requirements_extra.txt') as f:
16-
requirements_extra = f.read()
14+
with open(requirements_path) as f:
15+
requirements.extend(f.read().splitlines())
1716

18-
requirements_extra = requirements_extra.splitlines()
19-
requirements += requirements_extra
2017

2118
with open('README.md') as f:
2219
readme = f.read()
20+
2321
readme = "\n".join(readme.split('\n')[2:])
2422

2523

0 commit comments

Comments
 (0)