Skip to content

Commit b4503ef

Browse files
madhur-tandonmadhur-tandon
authored
remove pyscriptjs and synclink (pyscript#1787)
* remove pyscriptjs and synclink * remove chdir fixture
1 parent a00a675 commit b4503ef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+4
-17149
lines changed

‎.github/workflows/publish-unstable.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
name: "Publish Unstable"
22

33
on:
4-
push: # Only run on merges into main that modify files under pyscriptjs/ and examples/
4+
push: # Only run on merges into main that modify files under pyscript.core/ and examples/
55
branches:
66
- main
77
paths:
88
- pyscript.core/**
99
- examples/**
1010

11-
pull_request: # Run on any PR that modifies files under pyscriptjs/ and examples/
12-
branches:
13-
- main
14-
paths:
15-
- pyscriptjs/**
16-
- examples/**
17-
1811
workflow_dispatch:
1912

2013
jobs:

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ coverage.xml
5151
*.py,cover
5252
.hypothesis/
5353
.pytest_cache/
54-
pyscriptjs/examples
5554

5655
# Translations
5756
*.mo

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,3 @@ repos:
5151
- id: prettier
5252
exclude: pyscript\.core/test|pyscript\.core/dist|pyscript\.core/types|pyscript.core/src/stdlib/pyscript.js|pyscript\.sw/
5353
args: [--tab-width, "4"]
54-
55-
- repo: https://github.com/pre-commit/mirrors-eslint
56-
rev: v8.36.0
57-
hooks:
58-
- id: eslint
59-
files: pyscriptjs/src/.*\.[jt]sx?$ # *.js, *.jsx, *.ts and *.tsx
60-
types: [file]
61-
additional_dependencies:
62-
- eslint@8.25.0
63-
- typescript@5.0.4
64-
- "@typescript-eslint/eslint-plugin@5.58.0"
65-
- "@typescript-eslint/parser@5.58.0"

‎Makefile‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ tag := latest
22
git_hash ?= $(shell git log -1 --pretty=format:%h)
33

44
base_dir ?= $(shell git rev-parse --show-toplevel)
5-
src_dir ?= $(base_dir)/pyscriptjs/src
65
examples ?= ../$(base_dir)/examples
76
app_dir ?= $(shell git rev-parse --show-prefix)
87

@@ -101,14 +100,6 @@ test-examples:
101100
mkdir -p test_results
102101
$(PYTEST_EXE) -vv $(ARGS) pyscript.core/tests/integration/ --log-cli-level=warning --junitxml=test_results/integration.xml -k 'zz_examples'
103102

104-
test-py:
105-
@echo "Tests from $(src_dir)"
106-
mkdir -p test_results
107-
$(PYTEST_EXE) -vv $(ARGS) tests/py-unit/ --log-cli-level=warning --junitxml=test_results/py-unit.xml
108-
109-
test-ts:
110-
npm run test
111-
112103
fmt: fmt-py fmt-ts
113104
@echo "Format completed"
114105

‎examples/handtrack/say_hello.html‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
rel="stylesheet"
1212
href="https://pyscript.net/latest/pyscript.css"
1313
/>
14-
<script defer src="../../pyscriptjs/build/pyscript.js"></script>
15-
<!-- <script defer src="https://pyscript.net/latest/pyscript.js"></script> -->
14+
<script defer src="https://pyscript.net/latest/pyscript.js"></script>
1615
</head>
1716

1817
<body>

‎pyproject.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dynamic = ["version"]
77

88
[tool.codespell]
99
ignore-words-list = "afterall"
10-
skip = "pyscriptjs/node_modules/*,*.js,*.json"
1110

1211
[tool.ruff]
1312
builtins = [

‎pyscript.core/tests/integration/conftest.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def pytest_configure(config):
5454
--no-fake-server, but because of how pytest works, they are available only
5555
if this is the "root conftest" for the test session.
5656
57-
This means that if you are in the pyscriptjs directory:
57+
This means that if you are in the pyscript.core directory:
5858
5959
$ py.test # does NOT work
6060
$ py.test tests/integration/ # works
@@ -70,10 +70,9 @@ def pytest_configure(config):
7070
"""
7171
if not hasattr(config.option, "dev"):
7272
msg = """
73-
Running a bare "pytest" command from the pyscriptjs directory
73+
Running a bare "pytest" command from the pyscript.core directory
7474
is not supported. Please use one of the following commands:
7575
- pytest tests/integration
76-
- pytest tests/py-unit
7776
- pytest tests/*
7877
- cd tests/integration; pytest
7978
"""

‎pyscript.core/tests/integration/test_zz_examples.py‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
reason="SKIPPING EXAMPLES: these should be moved elsewhere and updated"
1616
)
1717
@with_execution_thread(None)
18-
@pytest.mark.usefixtures("chdir")
1918
class TestExamples(PyScriptTest):
2019
"""
2120
Each example requires the same three tests:
@@ -26,11 +25,6 @@ class TestExamples(PyScriptTest):
2625
- Testing that the page contains appropriate content after rendering
2726
"""
2827

29-
@pytest.fixture()
30-
def chdir(self):
31-
# make sure that the http server serves from the right directory
32-
ROOT.join("pyscriptjs").chdir()
33-
3428
def test_hello_world(self):
3529
self.goto("examples/hello_world.html")
3630
self.wait_for_pyscript()

‎pyscriptjs/.eslintrc.js‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎pyscriptjs/.prettierignore‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)