Skip to content

Commit b98edf2

Browse files
author
rllin
authored
also allow 36 (#66)
* also allow 36 * changelog * 3.6 * yapf * ignore * fix ignore * parallel * split * one version * parallel
1 parent ed6a7a8 commit b98edf2

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

.github/workflows/python-package.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
strategy:
1515
max-parallel: 1
1616
matrix:
17-
python-version: [3.7, 3.8]
17+
# TODO: unlock parallel testing by using more API keys
18+
python-version: [3.6]
1819

1920
steps:
2021

@@ -57,7 +58,7 @@ jobs:
5758
mypy -p labelbox --pretty --show-error-codes
5859
- name: Install package and test dependencies
5960
run: |
60-
pip install tox==3.18.1 tox-gh-actions==1.3.0
61+
pip install tox==3.18.1 tox-gh-actions==1.3.0 pytest-parallel==0.1.0
6162
6263
# TODO: replace tox.ini with what the Makefile does
6364
# to make sure local testing is
@@ -72,4 +73,4 @@ jobs:
7273
# randall+staging-python@labelbox.com
7374
LABELBOX_TEST_API_KEY_STAGING: ${{ secrets.STAGING_LABELBOX_API_KEY }}
7475
run: |
75-
tox -- -svv
76+
pytest --workers 2 -svv

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## Version 2.4.7 (2020-09-10)
4+
### Added
5+
* `Ontology` schema for interacting with ontologies and their schema nodes
6+
37
## Version 2.4.6 (2020-09-03)
48
### Fix
59
* fix failing `create_metadata` calls

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3
1+
FROM python:3.6
22

33
COPY . /usr/src/labelbox
44
WORKDIR /usr/src/labelbox

labelbox/schema/project.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
from labelbox.orm.model import Entity, Field, Relationship
1616
from labelbox.pagination import PaginatedCollection
1717

18+
try:
19+
datetime.fromisoformat # type: ignore[attr-defined]
20+
except AttributeError:
21+
from backports.datetime_fromisoformat import MonkeyPatch
22+
MonkeyPatch.patch_fromisoformat()
23+
1824
logger = logging.getLogger(__name__)
1925

2026

setup.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="labelbox",
8-
version="2.4.6",
8+
version="2.4.7",
99
author="Labelbox",
1010
author_email="engineering@labelbox.com",
1111
description="Labelbox Python API",
@@ -15,6 +15,8 @@
1515
packages=setuptools.find_packages(),
1616
install_requires=[
1717
"backoff==1.10.0",
18+
"backports-datetime-fromisoformat",
19+
"dataclasses",
1820
"ndjson==0.3.1",
1921
"requests>=2.22.0",
2022
"google-api-core>=1.22.1",
@@ -23,9 +25,10 @@
2325
'Development Status :: 3 - Alpha',
2426
'License :: OSI Approved :: Apache Software License',
2527
'Programming Language :: Python :: 3',
28+
'Programming Language :: Python :: 3.6',
2629
'Programming Language :: Python :: 3.7',
2730
'Programming Language :: Python :: 3.8',
2831
],
29-
python_requires='>=3.7',
32+
python_requires='>=3.6',
3033
keywords=["labelbox"],
3134
)

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# content of: tox.ini , put in same dir as setup.py
22
[tox]
3-
envlist = py37, py38
3+
envlist = py36, py37, py38
44

55
[gh-actions]
66
python =
7+
3.6: py36
78
3.7: py37
89
3.8: py38
910

0 commit comments

Comments
 (0)