set previous version manually, fix first notebook server conn

Author: eelcovdw

notebooks/tutorials/version-upgrades/0-prepare-migration-data.ipynb

@@ -69,9 +69,9 @@
     "    name=\"test_upgradability\",\n",
     "    dev_mode=True,\n",
     "    reset=True,\n",
-    "    local_db=True,\n",
     "    n_consumers=2,\n",
     "    create_producer=True,\n",
+    "    port=\"auto\",\n",
     ")"
    ]
   },

notebooks/tutorials/version-upgrades/1-dump-database-to-file.ipynb

@@ -25,9 +25,8 @@
     "server = sy.orchestra.launch(\n",
     "    name=\"test_upgradability\",\n",
     "    dev_mode=True,\n",
-    "    local_db=True,\n",
-    "    n_consumers=2,\n",
-    "    create_producer=True,\n",
+    "    reset=False,\n",
+    "    port=\"auto\",\n",
     "    migrate=False,\n",
     ")\n",
     "\n",

notebooks/tutorials/version-upgrades/2-migrate-from-file.ipynb

@@ -72,7 +72,6 @@
    "outputs": [],
    "source": [
     "migration_data_dir = Path(os.getenv(\"MIGRATION_DATA_DIR\", \".\"))\n",
-    "# migration_data_dir = Path(\"/Users/eelco/dev/PySyft/.tox/.tmp/migration\")\n",
     "blob_path = migration_data_dir / \"migration.blob\"\n",
     "yaml_path = migration_data_dir / \"migration.yaml\"\n",
     "\n",

tox.ini

@@ -1077,21 +1077,15 @@ commands =
 [testenv:migration.prepare]
 description = Prepare Migration Data
 pip_pre = True
+setenv =
+    MIGRATION_DATA_DIR = {env:MIGRATION_DATA_DIR:{temp_dir}/migration}
 deps =
     nbmake
     requests
+    syft==0.9.0
 allowlist_externals =
     bash
     python
-
-commands_pre =
-    bash -c '\
-        LATEST_SYFT_VERSION=$(python ./scripts/latest_pypi_version.py) &&\
-        export LATEST_SYFT_VERSION &&\
-        python -m pip install syft==$LATEST_SYFT_VERSION\
-    '
-setenv =
-    MIGRATION_DATA_DIR = {env:MIGRATION_DATA_DIR:{temp_dir}/migration}
 commands =
     ; Run notebooks to prepare migration data
     bash -c 'python -c "import syft as sy; print(\"Migrating from syft version:\", sy.__version__)"'
@@ -1128,6 +1122,7 @@ passenv=HOME, USER, EXTERNAL_REGISTRY_USERNAME, EXTERNAL_REGISTRY_PASSWORD
 deps =
     requests
     nbmake
+    syft==0.9.0
 allowlist_externals =
     bash
     tox
@@ -1140,6 +1135,7 @@ setenv =
     CLUSTER_NAME = syft-migration-source
     CLUSTER_HTTP_PORT = {env:SERVER_PORT:8080}
     MIGRATION_DATA_DIR = {env:MIGRATION_DATA_DIR:{temp_dir}/migration}
+    LATEST_SYFT_VERSION = 0.9.0
 commands =
     bash -c "env; date; k3d version"
     bash -c "k3d cluster delete ${CLUSTER_NAME} || true"
@@ -1148,7 +1144,6 @@ commands =
 
     # Deploy cluster from latest stable syft version with Helm
     bash -c '\
-        LATEST_SYFT_VERSION=$(python ./scripts/latest_pypi_version.py) &&\
         echo "Installing helm charts from repo for syft version: ${LATEST_SYFT_VERSION}"; \
         helm repo add openmined https://openmined.github.io/PySyft/helm; \
         helm repo update openmined; \
@@ -1158,11 +1153,6 @@ commands =
     ; wait for everything else to be loaded
     tox -e dev.k8s.ready -- frontend backend mongo proxy seaweedfs registry
 
-    ; Install latest stable syft version
-    bash -c '\
-        LATEST_SYFT_VERSION=$(python ./scripts/latest_pypi_version.py) &&\
-        python -m pip install syft==$LATEST_SYFT_VERSION\
-    '
     bash -c 'python -c "import syft as sy; print(\"Migrating from syft version:\", sy.__version__)"'
 
     ; Run notebooks to prepare migration data
@@ -1202,7 +1192,7 @@ allowlist_externals =
     echo
 commands =
     # create migration data files on previous syft version
-    tox -e migration.prepare
+    tox -e migration.k8s.prepare
 
     # Make migration.yaml available for devspace migration
     bash -c 'cp ${MIGRATION_DATA_DIR}/migration.yaml packages/grid/helm/examples/dev/migration.yaml'