From f63324afe19cbc386461ea5998b3caf3c2d5c989 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 5 Dec 2023 16:13:11 +0100 Subject: [PATCH 1/4] Reintroduce load_by_url end tag --- .gitignore | 2 +- scripts/build_library.sh | 2 +- src/workers/python/PythonWorker.ts | 2 +- src/workers/python/build_package.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 90ede921..3f9ac36b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,4 +30,4 @@ yarn-error.log* translationIssues.txt # Ignore output of local pip install when building the tar src/workers/python/python_package/ -src/workers/python/python_package.tar.gz \ No newline at end of file +src/workers/python/python_package.tar.gz.load_by_url \ No newline at end of file diff --git a/scripts/build_library.sh b/scripts/build_library.sh index 1d558b32..1ca80b5d 100644 --- a/scripts/build_library.sh +++ b/scripts/build_library.sh @@ -4,5 +4,5 @@ cd src/workers/python python3 build_package.py cd - tsc -mv src/workers/python/python_package.tar.gz dist/workers/python +mv src/workers/python/python_package.tar.gz.load_by_url dist/workers/python npx tailwindcss -i ./src/Papyros.css -o ./dist/Papyros.css \ No newline at end of file diff --git a/src/workers/python/PythonWorker.ts b/src/workers/python/PythonWorker.ts index 2e6e8404..acd68724 100644 --- a/src/workers/python/PythonWorker.ts +++ b/src/workers/python/PythonWorker.ts @@ -4,7 +4,7 @@ import { PyodideInterface, PyProxy } from "pyodide"; import { pyodideExpose, PyodideExtras, loadPyodideAndPackage } from "pyodide-worker-runner"; /* eslint-disable-next-line */ -const pythonPackageUrl = require("!!file-loader!./python_package.tar.gz").default; +const pythonPackageUrl = require("!!file-loader!./python_package.tar.gz.load_by_url").default; /** * Implementation of a Python backend for Papyros diff --git a/src/workers/python/build_package.py b/src/workers/python/build_package.py index b58ff3e8..5054e861 100644 --- a/src/workers/python/build_package.py +++ b/src/workers/python/build_package.py @@ -27,7 +27,7 @@ def create_package(package_name, dependencies, extra_deps): except Exception as e: # Always seems to result in a harmless permission denied error pass - tar_name = f"{package_name}.tar.gz" + tar_name = f"{package_name}.tar.gz.load_by_url" if os.path.exists(tar_name): os.remove(tar_name) with tarfile.open(tar_name, "w:gz") as tar: From b84f7f8c1ca85b51d652a71f6ca3f5f3673ff02f Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 5 Dec 2023 16:13:29 +0100 Subject: [PATCH 2/4] 2.0.0-beta.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b6e52e82..fd016706 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dodona/papyros", - "version": "2.0.0-beta.0", + "version": "2.0.0-beta.1", "private": false, "homepage": ".", "devDependencies": { From d5a6dafb37e4ed69a4a711866a0787ba1fffc5fa Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Tue, 5 Dec 2023 16:14:10 +0100 Subject: [PATCH 3/4] 2.0.0-beta.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fd016706..5635a530 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dodona/papyros", - "version": "2.0.0-beta.1", + "version": "2.0.0-beta.2", "private": false, "homepage": ".", "devDependencies": { From 44c9ade8c2451ae9ec526d55b9bb0bf505931306 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Wed, 6 Dec 2023 15:04:02 +0100 Subject: [PATCH 4/4] 2.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5635a530..b221686f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dodona/papyros", - "version": "2.0.0-beta.2", + "version": "2.0.0", "private": false, "homepage": ".", "devDependencies": {