Merge branch 'master' into hide-methods-from-objects

Author: skogsbaer

.github/workflows/github-action-test-python.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # You need to change to branch protection rules if you change the versions here
-        python-version: [3.12.1, 3.13.0]
+        python-version: [3.12.11, 3.13.7]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
@@ -24,5 +24,4 @@ jobs:
           cd python && ./allTestsForPyVersion
       - name: Test pytrace-generator
         run: |
-          python3 python/src/runYourProgram.py --install-mode installOnly
           python3 pytrace-generator/test/runTests.py

ChangeLog.md

@@ -1,5 +1,13 @@
 # Write Your Python Program - CHANGELOG
 
+* 2.0.0 (2025-09-24)
+  * Remove wrappers, only check types at function enter/exit points
+  * Restructure directory layout
+  * RUN button now longer copies files to the site-lib directory
+* 1.3.2 (2025-05-11)
+  * Fix release (version 1.3.1. did no include the latest changes)
+* 1.3.1 (2025-05-10)
+  * Fix bug with python 3.13 and wrappers
 * 1.3.0 (2024-12-01)
   * Fix bug with union of unions
   * Improve scrolling #148

README.md

@@ -1,6 +1,3 @@
-[![Python CI](https://github.com/skogsbaer/write-your-python-program/actions/workflows/github-action-test-python.yml/badge.svg)](https://github.com/skogsbaer/write-your-python-program/actions/workflows/github-action-test-python.yml)
-[![Node.js CI](https://github.com/skogsbaer/write-your-python-program/actions/workflows/github-action-test-js.yml/badge.svg)](https://github.com/skogsbaer/write-your-python-program/actions/workflows/github-action-test-js.yml)
-
 # Write Your Python Program
 
 A user-friendly python programming environment for beginners.
@@ -40,6 +37,11 @@ Run `wypp --help` for usage information.
 
 Here is the [Changelog](ChangeLog.md).
 
+* **Breaking change** in version 2.0.0 (2025-0-24): type annotations are now only
+  checked when entering/exiting a function. Before, certain things such as lists
+  or callable were put behind wrapper objects. For example, these wrappers ensured
+  that only ints could be appended to a list of type `list[int]`. However, these
+  wrappers came with several drawbacks, so they were removed in release 2.0.0
 * **Breaking change** in version 0.12.0 (2021-09-28): type annotations are now checked
   dynamically when the code is executed.
   This behavior can be deactivated in the settings of the extension.
@@ -50,7 +52,10 @@ You need an explicit import statement such as `from wypp import *`.
 
 Here is a screen shot:
 
-![Screenshot](screenshot.jpg)
+![Screenshot](screenshot.png)
+
+There is also a visualization mode, similar to [Python Tutor](https://pythontutor.com/):
+![Screenshot](screenshot2.png)
 
 When hitting the RUN button, the vscode extension saves the current file, opens
 a terminal and executes the file with Python, staying in interactive mode after
@@ -59,7 +64,7 @@ all definitions have been executed.
 The file being executed should contain the following import statement in the first line:
 
 ~~~python
-from wypp import*
+from wypp import *
 ~~~
 
 Running the file with the RUN button makes the following features available:
@@ -193,39 +198,6 @@ before the type being defined, for example to define recursive types or as
 the type of `self` inside of classes. In fact, there is no check at all to make sure
 that anotations refer to existing types.
 
-For builtin `list[T]` the following operations are typechecked:
-- `list[idx]`
-- `list[idx] = value`
-- `list += [...]`
-- `list.append(value)`
-- `list.insert(idx, value)`
-- `list.extend(iterator)`
-- `for i in list:` (Iterator)
-
-For builtin `set[T]` these operations are typechecked:
-- `set.add(value)`
-- `set.pop()`
-- `set.remove(value)` Value must be of `T`
-- `set.update(other, ...)`
-- `value in set` Value must be of `T`
-- `for i in set:` (Iterator)
-
-For builtin `dict[K,V]` the supported typechecked operations are:
-- `dict.get(key)`
-- `dict.items()`
-- `dict.keys()`
-- `dict.pop()`
-- `dict.popitem()`
-- `dict.setdefault(key, default)` <br/>_Note:_ In contrast to the standard library `default` is required, to avoid inserting `None` as value into otherwise typed dicts.
-- `dict.update(other)`
-- `dict.update(key=value, ...)`
-- `dict.values()`
-- `key in dict` Key must be of `K`
-- `del dict[key]`
-- `for k in dict` (Iterator)
-- `reversed(dict)`
-- `dict[key]`
-- `dict[key] = value`
 
 ## Module name and current working directory
 

package.json

@@ -3,11 +3,11 @@
 	"displayName": "Write Your Python Program!",
 	"description": "A user friendly python environment for beginners",
 	"license": "See license in LICENSE",
-	"version": "1.3.0",
+	"version": "2.0.0",
 	"publisher": "StefanWehr",
 	"icon": "icon.png",
 	"engines": {
-		"vscode": "^1.85.0"
+		"vscode": "^1.94.2"
 	},
 	"keywords": [
 		"Python",

python/.ignore

@@ -0,0 +1,6 @@
+{
+    "python.analysis.diagnosticMode": "workspace",
+    "python.autoComplete.extraPaths": [
+        "/Users/swehr/.vscode/extensions/stefanwehr.write-your-python-program-1.3.2/python/src/"
+    ]
+}

python/.vscode/settings.json

@@ -0,0 +1,2 @@
+* Code duplication
+- wrappedclass.py, protocol.py and typedfunction.py

python/TODO.org

@@ -0,0 +1,4 @@
+* Test windows
+* location matcher for vscode
+* show "@record\nclass C" for record attributes
+

python/TODO_nowrappers.md

@@ -15,5 +15,5 @@ function run()
     echo
 }
 
-PYENV_VERSION=3.12.1 run
-PYENV_VERSION=3.13.0 run
+PYENV_VERSION=3.12 run
+PYENV_VERSION=3.13 run

python/allTests

@@ -5,64 +5,61 @@ set -u
 
 cd $(dirname $0)
 
-unit_test_path=src:tests:deps/untypy
-
-function prepare_integration_tests()
-{
-    echo "Preparing integration tests by install the WYPP library"
-    local d=$(mktemp -d)
-    trap "rm -rf $d" EXIT
-    WYPP_INSTALL_DIR=$d python3 src/runYourProgram.py --install-mode installOnly
-    integ_test_path=integration-tests:$d
-}
+unit_test_path=code/wypp:tests:code
+integration_test_path=code/wypp:integration-tests:code
 
 function usage()
 {
     echo "USAGE: $0 [--unit | --integration] [ FILE ]"
     exit 1
 }
 
-if [ -z "${1:-}" ]; then
-    echo "Python version:"
-    python3 --version
-    echo "Running untypy tests"
-    pushd deps/untypy > /dev/null
-    ./runtests.sh || exit 1
-    popd > /dev/null
-    echo "Done with untypy tests"
-    echo "Running all unit tests, PYTHONPATH=$unit_test_path"
-    PYTHONPATH=$unit_test_path python3 -m unittest tests/test*.py
-    echo "Done with unit tests"
-    echo
-    prepare_integration_tests
-    echo "Running all integration tests, PYTHONPATH=$integ_test_path"
-    PYTHONPATH=$integ_test_path python3 -m unittest integration-tests/test*.py
-    echo "Done with integration tests"
-else
-    if [ "$1" == "--unit" ]; then
-        what="unit"
-        dir=tests
-        p=$unit_test_path
-    elif [ "$1" == "--integration" ]; then
-        what="integration"
-        dir=integration-tests
-        prepare_integration_tests
-        p=$integ_test_path
+function run_unit_tests()
+{
+   echo "Running unit tests, PYTHONPATH=$unit_test_path"
+    if [ -z "${1:-}" ]; then
+         PYTHONPATH=$unit_test_path python3 -m unittest tests/test*.py
+        ecode=$?
     else
-        usage
+        PYTHONPATH=$unit_test_path python3 -m unittest "$@"
+        ecode=$?
     fi
-    shift
-    echo "Running $what tests $@ with PYTHONPATH=$p"
+    echo "Done with unit tests"
+}
+
+function run_integration_tests()
+{
+    echo "Running all integration tests, PYTHONPATH=$integration_test_path"
     if [ -z "${1:-}" ]; then
-        PYTHONPATH=$p python3 -m unittest $dir/test*.py
+        PYTHONPATH=$integration_test_path python3 -m unittest integration-tests/test*.py
         ecode=$?
     else
-        PYTHONPATH=$p python3 -m unittest "$@"
+        PYTHONPATH=$integration_test_path python3 -m unittest "$@"
         ecode=$?
     fi
-    echo "$what tests finished with exit code $ecode"
+    echo "Done with integration tests"
+}
+
+
+echo "Python version:"
+python3 --version
+
+if [ -z "${1:-}" ]; then
+    run_unit_tests
+    echo
+    run_integration_tests
+    echo
+    echo "Running file tests ..."
+    python3 ./fileTests.py
+elif [ "$1" == "--unit" ]; then
+    shift
+    run_unit_tests "$@"
     exit $ecode
+elif [ "$1" == "--integration" ]; then
+    shift
+    run_integration_tests "$@"
+    exit $ecode
+else
+    usage
 fi
 
-echo "Running file tests ..."
-./fileTests