Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
strategy:
max-parallel: 1
matrix:
python-version: [3.7, 3.8]
# TODO: unlock parallel testing by using more API keys
python-version: [3.6]

steps:

Expand Down Expand Up @@ -57,7 +58,7 @@ jobs:
mypy -p labelbox --pretty --show-error-codes
- name: Install package and test dependencies
run: |
pip install tox==3.18.1 tox-gh-actions==1.3.0
pip install tox==3.18.1 tox-gh-actions==1.3.0 pytest-parallel==0.1.0

# TODO: replace tox.ini with what the Makefile does
# to make sure local testing is
Expand All @@ -72,4 +73,4 @@ jobs:
# randall+staging-python@labelbox.com
LABELBOX_TEST_API_KEY_STAGING: ${{ secrets.STAGING_LABELBOX_API_KEY }}
run: |
tox -- -svv
pytest --workers 2 -svv
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Version 2.4.7 (2020-09-10)
### Added
* `Ontology` schema for interacting with ontologies and their schema nodes

## Version 2.4.6 (2020-09-03)
### Fix
* fix failing `create_metadata` calls
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3
FROM python:3.6

COPY . /usr/src/labelbox
WORKDIR /usr/src/labelbox
Expand Down
6 changes: 6 additions & 0 deletions labelbox/schema/project.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
from labelbox.orm.model import Entity, Field, Relationship
from labelbox.pagination import PaginatedCollection

try:
datetime.fromisoformat # type: ignore[attr-defined]
except AttributeError:
from backports.datetime_fromisoformat import MonkeyPatch
MonkeyPatch.patch_fromisoformat()

logger = logging.getLogger(__name__)


Expand Down
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="labelbox",
version="2.4.6",
version="2.4.7",
author="Labelbox",
author_email="engineering@labelbox.com",
description="Labelbox Python API",
Expand All @@ -15,6 +15,8 @@
packages=setuptools.find_packages(),
install_requires=[
"backoff==1.10.0",
"backports-datetime-fromisoformat",
"dataclasses",
"ndjson==0.3.1",
"requests>=2.22.0",
"google-api-core>=1.22.1",
Expand All @@ -23,9 +25,10 @@
'Development Status :: 3 - Alpha',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
python_requires='>=3.7',
python_requires='>=3.6',
keywords=["labelbox"],
)
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
envlist = py37, py38
envlist = py36, py37, py38

[gh-actions]
python =
3.6: py36
3.7: py37
3.8: py38

Expand Down