rbx 3.28.0__tar.gz → 3.28.0.dev208__tar.gz

{rbx-3.28.0 → rbx-3.28.0.dev208}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.28.0
+Version: 3.28.0.dev208
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

{rbx-3.28.0 → rbx-3.28.0.dev208}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rbx"
-version = "3.28.0"
+version = "3.28.0.dev208"
 description = "A collection of common tools for Scoota services."
 authors = [
     { name = "The Scoota Engineering Team", email = "engineering@scoota.com" }
@@ -80,7 +80,7 @@ homepage = "https://github.com/rockabox/rbx"
 repository = "https://github.com/rockabox/rbx.git"
 
 [tool.bumpversion]
-current_version = "3.28.0"
+current_version = "3.28.0.dev208"
 commit = true
 parse = """
 	(?P<major>\\d+)\\.

rbx-3.28.0.dev208/rbx/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.28.0.dev208"

{rbx-3.28.0 → rbx-3.28.0.dev208}/rbx/auth/__init__.py

@@ -1,5 +1,4 @@
 from .keystore import Keystore
 from .mock import KeystoreMock
 
-
 __all__ = ["Keystore", "KeystoreMock"]

{rbx-3.28.0 → rbx-3.28.0.dev208}/rbx/buildtools/tasks/ec2.py

@@ -37,12 +37,22 @@ def deploy(host, user, key_filename, service, environment, sandboxed, version):
         echo=True,
     )
 
+    # Pull the new version before restarting the services.
+    connection.run(
+        f"docker compose -p {service}{environment} -f {service}/docker-compose.yml pull",
+        echo=True,
+        env={
+            "SANDBOXED": sandboxed,
+            "VERSION": version,
+        },
+    )
+
     # Restart the Docker container forcing recreate so that new version is used.
     # Using `force-recreate` alone doesn't seem to be enough to use the latest version. So we
     # do `down` and then `up`.
     connection.run(
-        "docker-compose -p {service}{env} -f {service}/docker-compose.yml down"
-        " --volumes --remove-orphans".format(service=service, env=environment),
+        f"docker compose -p {service}{environment} -f {service}/docker-compose.yml down"
+        " --volumes --remove-orphans",
         echo=True,
         env={
             "SANDBOXED": sandboxed,
@@ -51,9 +61,7 @@ def deploy(host, user, key_filename, service, environment, sandboxed, version):
         warn=True,
     )
     connection.run(
-        "docker-compose -p {service}{env} -f {service}/docker-compose.yml up -d".format(
-            service=service, env=environment
-        ),
+        f"docker compose -p {service}{environment} -f {service}/docker-compose.yml up -d",
         echo=True,
         env={
             "SANDBOXED": sandboxed,

{rbx-3.28.0 → rbx-3.28.0.dev208}/rbx/clients/place_exchange.py

@@ -8,7 +8,6 @@ from requests.auth import AuthBase
 from . import Client
 from ..exceptions import ClientError, ServerError
 
-
 logger = logging.getLogger(__name__)
 
 

{rbx-3.28.0 → rbx-3.28.0.dev208}/rbx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.28.0
+Version: 3.28.0.dev208
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License: 

rbx-3.28.0/rbx/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.28.0"