pyscript · madhur-tandon · Oct 4, 2023 · Oct 4, 2023 · Oct 4, 2023 · ntoll
diff --git a/.github/workflows/publish-unstable.yml b/.github/workflows/publish-unstable.yml
@@ -1,20 +1,13 @@
 name: "Publish Unstable"
 
 on:
-    push: # Only run on merges into main that modify files under pyscriptjs/ and examples/
+    push: # Only run on merges into main that modify files under pyscript.core/ and examples/
         branches:
             - main
         paths:
             - pyscript.core/**
             - examples/**
 
-    pull_request: # Run on any PR that modifies files under pyscriptjs/ and examples/
-        branches:
-            - main
-        paths:
-            - pyscriptjs/**
-            - examples/**
-
     workflow_dispatch:
 
 jobs:

diff --git a/.gitignore b/.gitignore
@@ -51,7 +51,6 @@ coverage.xml
 *.py,cover
 .hypothesis/
 .pytest_cache/
-pyscriptjs/examples
 
 # Translations
 *.mo

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,15 +51,3 @@ repos:
           - id: prettier
             exclude: pyscript\.core/test|pyscript\.core/dist|pyscript\.core/types|pyscript.core/src/stdlib/pyscript.js|pyscript\.sw/
             args: [--tab-width, "4"]
-
-    - repo: https://github.com/pre-commit/mirrors-eslint
-      rev: v8.36.0
-      hooks:
-          - id: eslint
-            files: pyscriptjs/src/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
-            types: [file]
-            additional_dependencies:
-                - eslint@8.25.0
-                - typescript@5.0.4
-                - "@typescript-eslint/eslint-plugin@5.58.0"
-                - "@typescript-eslint/parser@5.58.0"
diff --git a/Makefile b/Makefile
@@ -2,7 +2,6 @@ tag := latest
 git_hash ?= $(shell git log -1 --pretty=format:%h)
 
 base_dir ?= $(shell git rev-parse --show-toplevel)
-src_dir ?= $(base_dir)/pyscriptjs/src
 examples ?=  ../$(base_dir)/examples
 app_dir ?= $(shell git rev-parse --show-prefix)
 
@@ -101,14 +100,6 @@ test-examples:
 	mkdir -p test_results
 	$(PYTEST_EXE) -vv $(ARGS) pyscript.core/tests/integration/ --log-cli-level=warning --junitxml=test_results/integration.xml -k 'zz_examples'
 
-test-py:
-	@echo "Tests from $(src_dir)"
-	mkdir -p test_results
-	$(PYTEST_EXE) -vv $(ARGS) tests/py-unit/ --log-cli-level=warning --junitxml=test_results/py-unit.xml
-
-test-ts:
-	npm run test
-
 fmt: fmt-py fmt-ts
 	@echo "Format completed"
 

diff --git a/examples/handtrack/say_hello.html b/examples/handtrack/say_hello.html
@@ -11,8 +11,7 @@
             rel="stylesheet"
             href="https://pyscript.net/latest/pyscript.css"
         />
-        <script defer src="../../pyscriptjs/build/pyscript.js"></script>
-        <!-- <script defer src="https://pyscript.net/latest/pyscript.js"></script> -->
+        <script defer src="https://pyscript.net/latest/pyscript.js"></script>
     </head>
 
     <body>

diff --git a/pyproject.toml b/pyproject.toml
@@ -7,7 +7,6 @@ dynamic = ["version"]
 
 [tool.codespell]
 ignore-words-list = "afterall"
-skip = "pyscriptjs/node_modules/*,*.js,*.json"
 
 [tool.ruff]
 builtins = [

diff --git a/pyscript.core/tests/integration/conftest.py b/pyscript.core/tests/integration/conftest.py
@@ -54,7 +54,7 @@ def pytest_configure(config):
     --no-fake-server, but because of how pytest works, they are available only
     if this is the "root conftest" for the test session.
 
-    This means that if you are in the pyscriptjs directory:
+    This means that if you are in the pyscript.core directory:
 
     $ py.test                       # does NOT work
     $ py.test tests/integration/    # works
@@ -70,10 +70,9 @@ def pytest_configure(config):
     """
     if not hasattr(config.option, "dev"):
         msg = """
-        Running a bare "pytest" command from the pyscriptjs directory
+        Running a bare "pytest" command from the pyscript.core directory
         is not supported. Please use one of the following commands:
             - pytest tests/integration
-            - pytest tests/py-unit
             - pytest tests/*
             - cd tests/integration; pytest
         """

diff --git a/pyscript.core/tests/integration/test_zz_examples.py b/pyscript.core/tests/integration/test_zz_examples.py
@@ -15,7 +15,6 @@
     reason="SKIPPING EXAMPLES: these should be moved elsewhere and updated"
 )
 @with_execution_thread(None)
-@pytest.mark.usefixtures("chdir")
 class TestExamples(PyScriptTest):
     """
     Each example requires the same three tests:
@@ -26,11 +25,6 @@ class TestExamples(PyScriptTest):
         - Testing that the page contains appropriate content after rendering
     """
 
-    @pytest.fixture()
-    def chdir(self):
-        # make sure that the http server serves from the right directory
-        ROOT.join("pyscriptjs").chdir()
-
     def test_hello_world(self):
         self.goto("examples/hello_world.html")
         self.wait_for_pyscript()

diff --git a/pyscriptjs/.eslintrc.js b/pyscriptjs/.eslintrc.js
diff --git a/pyscriptjs/.prettierignore b/pyscriptjs/.prettierignore
diff --git a/pyscriptjs/.prettierrc.js b/pyscriptjs/.prettierrc.js
diff --git a/pyscriptjs/Makefile b/pyscriptjs/Makefile
diff --git a/pyscriptjs/README.md b/pyscriptjs/README.md
diff --git a/pyscriptjs/__mocks__/_pyscript.js b/pyscriptjs/__mocks__/_pyscript.js
diff --git a/pyscriptjs/__mocks__/cssMock.js b/pyscriptjs/__mocks__/cssMock.js
diff --git a/pyscriptjs/__mocks__/fileMock.js b/pyscriptjs/__mocks__/fileMock.js