Skip to content

Commit

Permalink
Merge pull request #568 from dodona-edu/fix/simple-naming
Browse files Browse the repository at this point in the history
Release version 2.0.0
  • Loading branch information
jorg-vr authored Dec 6, 2023
2 parents 01ff421 + 44c9ade commit 7beaf84
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
src/workers/python/python_package.tar.gz.load_by_url
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@dodona/papyros",
"version": "2.0.0-beta.0",
"version": "2.0.0",
"private": false,
"homepage": ".",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/workers/python/PythonWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/workers/python/build_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 7beaf84

Please sign in to comment.