Merge pull request #835 from Labelbox/develop

release 3.35.0

Author: msokoloff1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# Version 3.35.0 (2023-01-18)
+### Fixed
+* Retry 520 errors when uploading files
+
 # Version 3.34.0 (2022-12-22)
 ### Added
 * Added `get_by_name()` method to MetadataOntology object to access both custom and reserved metadata by name.

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.9-slim-bullseye
 
 RUN pip install pytest pytest-cases pytest-rerunfailures
 RUN apt-get -y update

Makefile

@@ -4,18 +4,24 @@ build:
 
 
 test-local: build
+
+	@# if PATH_TO_TEST we asuume you know what you are doing
+	@if [ -z ${PATH_TO_TEST} ]; then \
+		./scripts/ensure_local_setup.sh; \
+	fi
+
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="local" \
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_LOCAL=${LABELBOX_TEST_API_KEY_LOCAL} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST) 
+		local/labelbox-python:test pytest $(PATH_TO_TEST)
 
 test-staging: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="staging" \
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST) 
+		local/labelbox-python:test pytest $(PATH_TO_TEST)
 
 test-prod: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
@@ -30,12 +36,12 @@ test-onprem: build
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_ONPREM=${LABELBOX_TEST_API_KEY_ONPREM} \
 		-e LABELBOX_TEST_ONPREM_HOSTNAME=${LABELBOX_TEST_ONPREM_HOSTNAME} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST) 
+		local/labelbox-python:test pytest $(PATH_TO_TEST)
 
 test-custom: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="custom" \
 		-e DA_GCP_LABELBOX_API_KEY=${DA_GCP_LABELBOX_API_KEY} \
 		-e LABELBOX_TEST_API_KEY_CUSTOM=${LABELBOX_TEST_API_KEY_CUSTOM} \
 		-e LABELBOX_TEST_GRAPHQL_API_ENDPOINT=${LABELBOX_TEST_GRAPHQL_API_ENDPOINT} \
-		local/labelbox-python:test pytest $(PATH_TO_TEST) 		
+		local/labelbox-python:test pytest $(PATH_TO_TEST)

docs/source/conf.py

@@ -21,7 +21,7 @@
 copyright = '2021, Labelbox'
 author = 'Labelbox'
 
-release = '3.34.0'
+release = '3.35.0'
 
 # -- General configuration ---------------------------------------------------