Merge branch 'master' of github.com:seung-lab/MaterializationEngine

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.34.3
+current_version = 4.34.4
 commit = True
 tag = True
 

docs/conf.py

@@ -23,7 +23,7 @@
 author = "Derrick Brittain,  Forrest Collman, Sven Dorkenwald"
 
 # The full version, including alpha/beta/rc tags
-release = "4.34.3"
+release = "4.34.4"
 
 
 master_doc = "index"

materializationengine/__init__.py

@@ -1 +1 @@
-__version__ = "4.34.3"
+__version__ = "4.34.4"

materializationengine/app.py

@@ -58,13 +58,13 @@ def create_app(config_name: str = None):
         app = configure_app(app)
     # register blueprints
 
-    apibp = Blueprint("api", __name__, url_prefix="/materialize/api")
+    apibp = Blueprint("api", __name__, url_prefix="/materialize")
 
-    @apibp.route("/versions")
+    @apibp.route("/api/versions")
     def versions():
         return jsonify([2, 3]), 200
 
-    @apibp.route("/materialize/version")
+    @apibp.route("/version")
     def version():
         return jsonify(__version__), 200
 
@@ -75,9 +75,9 @@ def version():
         api = Api(
             apibp, title="Materialization Engine API", version=__version__, doc="/doc"
         )
-        api.add_namespace(mat_bp, path="/v2")
-        api.add_namespace(client_bp, path="/v2")
-        api.add_namespace(client_bp2, path="/v3")
+        api.add_namespace(mat_bp, path="/api/v2")
+        api.add_namespace(client_bp, path="/api/v2")
+        api.add_namespace(client_bp2, path="/api/v3")
 
         app.register_blueprint(apibp)
         app.register_blueprint(views_bp)

materializationengine/blueprints/client/api.py

@@ -30,7 +30,7 @@
 from materializationengine.blueprints.client.datastack import validate_datastack
 
 
-__version__ = "4.34.3"
+__version__ = "4.34.4"
 
 
 authorizations = {

materializationengine/blueprints/client/api2.py

@@ -64,7 +64,7 @@
 from materializationengine.blueprints.client.utils import update_notice_text_warnings
 from materializationengine.blueprints.client.utils import after_request
 
-__version__ = "4.34.3"
+__version__ = "4.34.4"
 
 
 authorizations = {

materializationengine/blueprints/materialize/api.py

@@ -36,7 +36,7 @@
 )
 
 
-__version__ = "4.34.3"
+__version__ = "4.34.4"
 
 
 bulk_upload_parser = reqparse.RequestParser()

materializationengine/views.py

@@ -56,7 +56,7 @@
 import caveclient
 
 
-__version__ = "4.34.3"
+__version__ = "4.34.4"
 
 views_bp = Blueprint("views", __name__, url_prefix="/materialize/views")