Merge branch 'master' into dorian/fix-staging-deploy

dorian-writes-code · web-flow · commit 3a682068ec77 · 2021-08-06T12:16:32.000+02:00
diff --git a/codecov/settings_base.py b/codecov/settings_base.py
@@ -228,3 +228,5 @@
 
 IS_ENTERPRISE = get_settings_module() == SettingsModule.ENTERPRISE.value
 IS_DEV = get_settings_module() == SettingsModule.DEV.value
+DATA_UPLOAD_MAX_MEMORY_SIZE = get_config("setup", "http", "upload_max_memory_size", default=2621440)
+FILE_UPLOAD_MAX_MEMORY_SIZE = get_config("setup", "http", "file_upload_max_memory_size", default=2621440)
diff --git a/enterprise/generate_pyinstaller_args.py b/enterprise/generate_pyinstaller_args.py
@@ -82,7 +82,9 @@ def main():
             "whitenoise.middleware",
             "graphql_api",
             "legacy_migrations",
-            "shared.celery_config"
+            "legacy_migrations.migrations",
+            "shared.celery_config",
+            "kombu.transport.pyamqp"
         ]
     )
 
diff --git a/enterprise/hooks/hook-core.py b/enterprise/hooks/hook-core.py
@@ -1,3 +1,3 @@
 from PyInstaller.utils.hooks import collect_submodules, collect_data_files
 
-datas = collect_data_files("core", include_py_files=True, subdir="migrations")
+datas = collect_data_files("core", include_py_files=True, subdir="migrations") + collect_data_files("legacy_migrations", include_py_files=True, subdir="migrations")

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,9 @@ def main():`
`82`	`82`	`"whitenoise.middleware",`
`83`	`83`	`"graphql_api",`
`84`	`84`	`"legacy_migrations",`
`85`		`- "shared.celery_config"`
	`85`	`+ "legacy_migrations.migrations",`
	`86`	`+ "shared.celery_config",`
	`87`	`+ "kombu.transport.pyamqp"`
`86`	`88`	`]`
`87`	`89`	`)`
`88`	`90`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`from PyInstaller.utils.hooks import collect_submodules, collect_data_files`
`2`	`2`
`3`		`-datas = collect_data_files("core", include_py_files=True, subdir="migrations")`
	`3`	`+datas = collect_data_files("core", include_py_files=True, subdir="migrations") + collect_data_files("legacy_migrations", include_py_files=True, subdir="migrations")`