From a5e34323f93e17a664477481a13ecb8fdf0db478 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 01/13] chore: update flywire requirements --- dev_requirements.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 76168610..1bc5ec8b 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev_requirements.txt # --e git+https://github.com/seung-lab/PyChunkedGraph.git@vminnie-118#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs diff --git a/requirements.in b/requirements.in index f20ad921..c2cf38aa 100644 --- a/requirements.in +++ b/requirements.in @@ -25,5 +25,5 @@ gcsfs>=0.8.0 pyarrow flask_cors numpy>=1.20 --e git+https://github.com/seung-lab/PyChunkedGraph.git@vminnie-118#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph dynamicannotationdb>=3.0.2 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 084fdd4e..96f44aa9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile # --e git+https://github.com/seung-lab/PyChunkedGraph.git@vminnie-118#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs From 3ec40e46f22b3b0ed5dec740fb3c6faaae48fc26 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:01:10 -0700 Subject: [PATCH 02/13] fix: bump pcg version --- dev_requirements.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 1bc5ec8b..a2e43948 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev_requirements.txt # --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs diff --git a/requirements.in b/requirements.in index c2cf38aa..51d77332 100644 --- a/requirements.in +++ b/requirements.in @@ -25,5 +25,5 @@ gcsfs>=0.8.0 pyarrow flask_cors numpy>=1.20 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph dynamicannotationdb>=3.0.2 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 96f44aa9..472c97b7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile # --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.13.2#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs From 30d836144cdc5b7f0d78cec20df0bc23f56286d1 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:02:24 -0700 Subject: [PATCH 03/13] =?UTF-8?q?Bump=20version:=202.8.5=20=E2=86=92=202.8?= =?UTF-8?q?.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- docs/conf.py | 2 +- materializationengine/__init__.py | 2 +- materializationengine/blueprints/client/api.py | 2 +- materializationengine/blueprints/materialize/api.py | 2 +- materializationengine/views.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index acd33514..b4451bab 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.8.5 +current_version = 2.8.6 commit = True tag = True diff --git a/docs/conf.py b/docs/conf.py index 646da4b4..35407015 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -24,7 +24,7 @@ author = "Derrick Brittain, Forrest Collman, Sven Dorkenwald" # The full version, including alpha/beta/rc tags -release = "2.8.5" +release = "2.8.6" master_doc = 'index' diff --git a/materializationengine/__init__.py b/materializationengine/__init__.py index 79a53d3a..26101721 100644 --- a/materializationengine/__init__.py +++ b/materializationengine/__init__.py @@ -1 +1 @@ -__version__ = "2.8.5" +__version__ = "2.8.6" diff --git a/materializationengine/blueprints/client/api.py b/materializationengine/blueprints/client/api.py index 1d6efc94..bdb491af 100644 --- a/materializationengine/blueprints/client/api.py +++ b/materializationengine/blueprints/client/api.py @@ -42,7 +42,7 @@ import time -__version__ = "2.8.5" +__version__ = "2.8.6" authorizations = { diff --git a/materializationengine/blueprints/materialize/api.py b/materializationengine/blueprints/materialize/api.py index c089a333..10c07c6f 100644 --- a/materializationengine/blueprints/materialize/api.py +++ b/materializationengine/blueprints/materialize/api.py @@ -18,7 +18,7 @@ from sqlalchemy.exc import NoSuchTableError -__version__ = "2.8.5" +__version__ = "2.8.6" bulk_upload_parser = reqparse.RequestParser() diff --git a/materializationengine/views.py b/materializationengine/views.py index a0dbd63a..95ff0c38 100644 --- a/materializationengine/views.py +++ b/materializationengine/views.py @@ -27,7 +27,7 @@ ) -__version__ = "2.8.5" +__version__ = "2.8.6" views_bp = Blueprint("views", __name__, url_prefix="/materialize/views") From 84a21ad6ed1e24cc2b8e5ebbf0f94bd6dfd12cdc Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 04/13] chore: update flywire requirements --- dev_requirements.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 28053366..9835308a 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev_requirements.txt # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs diff --git a/requirements.in b/requirements.in index a1db8e89..73a5983a 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 emannotationschemas>=3.5.0 dynamicannotationdb>=3.1.0 --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph diff --git a/requirements.txt b/requirements.txt index f4d772da..535fa22c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs From 66f00fdb342e9c6faf48c93e230bae71a332c875 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:01:10 -0700 Subject: [PATCH 05/13] fix: bump pcg version --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 73a5983a..6f7a600f 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 emannotationschemas>=3.5.0 dynamicannotationdb>=3.1.0 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file From de1c633f7958c3afcb5e2533a23a2a193a4ad289 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 06/13] chore: update flywire requirements --- dev_requirements.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 13b03581..3d529f0e 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev_requirements.txt # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs diff --git a/requirements.in b/requirements.in index 9751fc69..55082f83 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 emannotationschemas>=3.5.1 dynamicannotationdb>=3.1.2 --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph diff --git a/requirements.txt b/requirements.txt index 15b77fc1..d8bd335a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs From 93cf2055ea965eed7ac9412acf6fd155be1722c4 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:01:10 -0700 Subject: [PATCH 07/13] fix: bump pcg version --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 55082f83..48cfe603 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 emannotationschemas>=3.5.1 dynamicannotationdb>=3.1.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file From 2b7c76b7c85c7af670bf1d8b75575e8fd75b8756 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 08/13] chore: update flywire requirements --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 48cfe603..55082f83 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 emannotationschemas>=3.5.1 dynamicannotationdb>=3.1.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph From 3fee77b11e5e7b139241e80a949e773bd1913ef4 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 09/13] chore: update flywire requirements --- dev_requirements.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev_requirements.txt b/dev_requirements.txt index 52fad8b4..a8b61ee9 100644 --- a/dev_requirements.txt +++ b/dev_requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=dev_requirements.txt # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs diff --git a/requirements.in b/requirements.in index be911f5e..b2edd3aa 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 dynamicannotationdb>=3.1.4 emannotationschemas>=3.5.2 --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph diff --git a/requirements.txt b/requirements.txt index 00688e56..0ff7f7c0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile # --e git+git://github.com/seung-lab/PyChunkedGraph.git@vminnie-125#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph # via -r requirements.in aiohttp==3.7.4.post0 # via gcsfs From 739e2031db0acfd6ae6175a55b2ef55636781447 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:01:10 -0700 Subject: [PATCH 10/13] fix: bump pcg version --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index b2edd3aa..04589af2 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 dynamicannotationdb>=3.1.4 emannotationschemas>=3.5.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file From 5a1405f23d23b2771cf6ec7414c5ca0a6bd41efa Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 11/13] chore: update flywire requirements --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 04589af2..b2edd3aa 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 dynamicannotationdb>=3.1.4 emannotationschemas>=3.5.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph From d83fb4cef27a2bb1a8a24063e4f63ef7aa905c07 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Thu, 4 Nov 2021 15:01:10 -0700 Subject: [PATCH 12/13] fix: bump pcg version --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index b2edd3aa..04589af2 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 dynamicannotationdb>=3.1.4 emannotationschemas>=3.5.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file From ad01f733ad5fbc12700fbf34e9c0cf498c204d43 Mon Sep 17 00:00:00 2001 From: Derrick Brittain Date: Tue, 2 Nov 2021 15:05:07 -0700 Subject: [PATCH 13/13] chore: update flywire requirements --- requirements.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.in b/requirements.in index 04589af2..b2edd3aa 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,4 @@ flask_cors numpy>=1.20 dynamicannotationdb>=3.1.4 emannotationschemas>=3.5.2 --e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph \ No newline at end of file +-e git+https://github.com/seung-lab/PyChunkedGraph.git@v1.16.0#egg=pychunkedgraph