Skip to content
This repository was archived by the owner on Jun 22, 2025. It is now read-only.

Fixed Tests v2 #651

Merged
samuelhwilliams merged 27 commits into from
Feb 5, 2023
Merged

Fixed Tests v2 #651

samuelhwilliams merged 27 commits into from
Feb 5, 2023

Conversation

@doug-benn
Copy link
Contributor

@doug-benn doug-benn commented Dec 10, 2022

Hello,

Sorry I did a really bad job of the first PR so I am trying again,

Copy of the original comments #632 :

@samuelhwilliams

Amazing work - the tests do indeed all seem to run and pass which is more than we've had for a long time 🎉 I do think we need to revisit some of this code and clean it up though. I'm particularly not fond of vendoring the binaries and would like to find a solution that doesn't require us to do that. 🤔 Could you squash the commits down into either: a set of logical separate commits, or just a single commit if there's not a sensible separation between them?

The code is definitely a mess and very "hacky". Do you have any suggestion for testing without the binary? I'm not sure how else tests could be done on Eel

Thank you

  • Doug

samuelhwilliams
samuelhwilliams reviewed Dec 12, 2022
View reviewed changes
Copy link
Collaborator

@samuelhwilliams samuelhwilliams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks much better 👍

There seem to be quite a lot of unrelated formatting changes - tweaking spacing or the quotes used. Can we remove those just to keep the change cleaner and more focused please? They're a bit distracting :)

tox.ini Outdated
Comment on lines 17 to 21
commands = '{envpython}' -m pytest {posargs}
# this ugly hack is here because:
# https://github.com/tox-dev/tox/issues/149
pip install -q -r {toxinidir}/requirements-test.txt
{envpython} -m pytest {posargs}
; pip install -q -r {toxinidir}/requirements-test.txt
; {envpython} -m pytest {posargs}
Copy link
Collaborator

@samuelhwilliams samuelhwilliams Dec 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain this change a bit for me please?

@doug-benn
Reverting as they where edited for testing
cc28f61
@doug-benn
Reverted formatting changes and cleaned up some comments
eb42ab8
@doug-benn
Fixed getting processes port number
ec4e433
@doug-benn
Removed "Fix" for Mac&Linux
a10b105
@doug-benn
Timeout to 30
4efbaee
@doug-benn
Timeout to 60s
7665068
@doug-benn
Timeout back to 5s
86a2f57
@doug-benn
Timeout 60
6e12962
@doug-benn
Getting child processes
e6c490c
@doug-benn
Python 3.6 Fix
12e4235
@doug-benn
Timeout?
9c4cfd9
@doug-benn
Python 3.6 Fix
05fc06d 
Timeout to 60s

Timeout 60

Getting child processes

Python 3.6 Fix

Timeout?
@doug-benn
Merge branch 'Tests' of https://github.com/doug-benn/Eel into Tests
ca99588
@doug-benn
Linux & Mac subprocess changes
267714e
@doug-benn
Running Tests!
d78d758
@doug-benn
Formatting Test.yml
63a74d1
@doug-benn
Fixed subprocess port numbers
c631c0a
@doug-benn
Getting child processes
e78a5e6 
Python 3.6 Fix

Timeout?

Linux & Mac subprocess changes
@doug-benn
Running Tests!
bbf1d90
@doug-benn
Formatting Test.yml
5bb30a3
@doug-benn
Merge branch 'Tests' of https://github.com/doug-benn/Eel into Tests
194130d
@doug-benn
Copy link
Contributor Author

doug-benn commented Dec 14, 2022

Hello,

@samuelhwilliams Thank you for the feedback!

I have sorted out my lazy time.sleep(1) fix so be more robust now hopefully. I have also removed my formatting changes.
Sorry about the commit history, I really can't work out how to shorten it down. I squashed them down and rebased it but they are all still showing on here. I think my inexperience is really showing with this messy PR

Thank you

  • Doug

@samuelhwilliams
Copy link
Collaborator

samuelhwilliams commented Feb 5, 2023 •
edited
Loading

Thanks @doug-benn - this looks good, let's take it 👍

The tests haven't come through on here but they look good from the actions panel https://github.com/python-eel/Eel/actions/runs/3663716177

@samuelhwilliams samuelhwilliams merged commit e524660 into python-eel:master Feb 5, 2023
thatfloflo added a commit to thatfloflo/Eel that referenced this pull request Feb 12, 2023
@thatfloflo
Add type hints to eel (squashed)
41abc23 
Squashed commit of the following:

commit a291573b084c25d093f0f355e02491d7a70dc0ee
Author: Florian <[email protected]>
Date:   Sun Feb 12 21:01:23 2023 +0000

    Merged requirements-typecheck.txt into requirements-test.txt

commit e54f4bf
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 12 20:46:39 2023 +0000

    Add line endings to files

commit 08c5f8d
Author: Florian <[email protected]>
Date:   Sun Feb 12 20:37:48 2023 +0000

    Update tox and GitHub Actions to have typechecks in CI

commit e16bea0
Author: Florian <[email protected]>
Date:   Sun Feb 12 19:32:02 2023 +0000

    CI/GitHub Actions workflow test config

commit 270eaf0
Author: Florian <[email protected]>
Date:   Sun Feb 12 19:30:07 2023 +0000

    Integrate typechecks into CI/tox

commit ae32024
Author: Florian <[email protected]>
Date:   Sun Feb 12 17:41:37 2023 +0000

    Added py.typed to package_data (PEP 561)

commit 5f06430
Author: Florian <[email protected]>
Date:   Sun Feb 12 16:42:52 2023 +0000

    Added mypy configuration

commit c5bfe28
Author: Florian <[email protected]>
Date:   Sun Feb 12 16:30:48 2023 +0000

    Use explicit TypeAlias definition if supported

commit e34981b
Author: Florian <[email protected]>
Date:   Sun Feb 12 16:01:12 2023 +0000

    Type hint modifications for Python3.6 backward compatibility

commit 65c1fe3
Author: Florian <[email protected]>
Date:   Sun Feb 12 14:49:22 2023 +0000

    Refined inline types and added type guards to pass mypy --strict typechecking

commit 3ca09bd
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:25:10 2023 +0000

    Moved type hints inline for electron.py

commit 59a494e
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:23:06 2023 +0000

    Annotated name in edge.py

commit 95ac744
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:22:00 2023 +0000

    Moved type hints inline for edge.py

commit 234a2a4
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:20:20 2023 +0000

    Added return type for run() in chrome.py

commit b3cf69a
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:17:37 2023 +0000

    Narrowed types and moved type hints inline for chrome.py

commit be7e70e
Author: Florian <[email protected]>
Date:   Fri Feb 10 21:08:39 2023 +0000

    Refined type hints and moved them inline for browsers.py

commit 007fe81
Author: Florian <[email protected]>
Date:   Fri Feb 10 20:47:16 2023 +0000

    Moved type hints for __main__.py inline

commit 248d543
Author: Florian <[email protected]>
Date:   Fri Feb 10 20:39:06 2023 +0000

    Moved type hints into .py and narrowed further

commit 88527c5
Merge: 7f1b8e3 5051761
Author: Florian Breit <[email protected]>
Date:   Thu Feb 9 15:15:37 2023 +0100

    Merge branch 'main' into typed

commit 5051761
Merge: 2b39a34 76ba80e
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:55:21 2023 +0000

    Merge pull request python-eel#550 from MichaelCurrin/patch-2

    docs: add README.md for example 4

commit 2b39a34
Merge: 649214f 6fbc91e
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:54:32 2023 +0000

    Merge pull request python-eel#658 from python-eel/dont-fail-fast

    Don't cancel all jobs if one fails

commit 649214f
Merge: 6b01349 c83f4f8
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:52:02 2023 +0000

    Merge pull request python-eel#573 from Sentinent/eel-routes-on-custom-app

    Add eel routes to `Bottle` instances passed in to `eel.start`

commit 6fbc91e
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:49:15 2023 +0000

    Don't cancel all jobs if one fails

commit c83f4f8
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:43:46 2023 +0000

    Bump to v0.15.2

    To release `eel.register_eel_routes`

commit cc7eea5
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:42:44 2023 +0000

    Rename to `register_eel_routes`

commit fa7b30c
Author: Sentinent <[email protected]>
Date:   Sat Mar 12 00:37:23 2022 -0800

    typo: "default eel routes" -> "custom routes"

commit ff5a7ef
Author: Sentinent <[email protected]>
Date:   Fri Mar 11 23:59:01 2022 -0800

    Update custom_app_routes example to not use beaker middleware, but include middleware usage in comments

commit 474fe7e
Author: Sentinent <[email protected]>
Date:   Fri Mar 11 23:36:53 2022 -0800

    Fix default eel routes not being added to custom app instances

commit 6b01349
Merge: 37d9480 6003c3d
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 16:33:52 2023 +0000

    Merge pull request python-eel#386 from mo0haned/patch-1

    Update hello.py

commit 6003c3d
Author: Mohaned Abd Elmonsef <[email protected]>
Date:   Wed Aug 26 20:16:45 2020 +0200

    Update hello.py

    "options" is not supported anymore
    so I changed it with mode = 'electron'

commit 37d9480
Merge: e524660 91c11cc
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 11:12:50 2023 +0000

    Merge pull request python-eel#657 from python-eel/broaden-requirements

    Broaden requirements

commit 91c11cc
Author: Samuel Williams <[email protected]>
Date:   Sun Feb 5 11:04:49 2023 +0000

    Broaden requirements

    Eel should be usable with a fairly generous set of package versions so
    that it meets more of our users requirements without being overly
    strict.

commit e524660
Author: doug-benn <[email protected]>
Date:   Sun Feb 5 10:55:10 2023 +0000

    Fixed Tests v2 (python-eel#651)

    Fix tests for Windows

commit 7f1b8e3
Merge: 6981451 eb705d1
Author: Florian Breit <[email protected]>
Date:   Sat Dec 10 03:25:56 2022 +0100

    Merge branch 'master' into typed

commit eb705d1
Merge: bdfaed2 4d5e1d8
Author: Samuel Williams <[email protected]>
Date:   Fri Dec 9 20:44:09 2022 +0000

    Merge pull request python-eel#645 from python-eel/SW-bump-bottle

    Bump bottle from v0.12.13 to v0.12.20

commit 4d5e1d8
Author: Samuel Williams <[email protected]>
Date:   Fri Dec 9 20:12:17 2022 +0000

    Bump bottle from v0.12.13 to v0.12.20

    Addresses two CVEs flagged by dependabot:

    * Critical: CVE-2022-31799
    * Moderate: CVE-2020-28473

commit bdfaed2
Merge: eb26589 2f27d00
Author: Samuel Williams <[email protected]>
Date:   Fri Dec 9 20:24:40 2022 +0000

    Merge pull request python-eel#646 from python-eel/SW-pin-tox-below-4

    Pin tox version for tests below v4

commit 2f27d00
Author: Samuel Williams <[email protected]>
Date:   Fri Dec 9 20:19:09 2022 +0000

    Pin tox version for tests below v4

commit 6981451
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 11:10:22 2022 +0000

    Renamed __init__.pyi to remove typo from filename

commit 0a2b5b2
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 11:03:32 2022 +0000

    Added type stub for electron.py

commit ae2519c
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 10:58:07 2022 +0000

    Added type stub for edge.py

commit ce0823f
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 10:50:55 2022 +0000

    Added type stub for chrome.py

commit b2c3371
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 10:46:23 2022 +0000

    Added type stub for browsers.py

commit 8859e85
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 10:38:43 2022 +0000

    Added type stub for __main__.py

commit 76ba80e
Author: Michael Currin <[email protected]>
Date:   Fri Dec 3 15:28:16 2021 +0200

    docs: add README.md for example 4
thatfloflo added a commit to thatfloflo/Eel that referenced this pull request Feb 12, 2023
@thatfloflo
Add type hints to eel
c47b488 
commit 8b04430
Merge: 41abc23 5051761
Author: Florian Breit <[email protected]>
Date:   Sun Feb 12 21:16:51 2023 +0000

    Merge branch 'main' into typed

commit 41abc23
Author: Florian <[email protected]>
Date:   Sun Feb 12 21:07:17 2023 +0000

    Add type hints to eel (squashed):

    commit a291573b084c25d093f0f355e02491d7a70dc0ee
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 21:01:23 2023 +0000

        Merged requirements-typecheck.txt into requirements-test.txt

    commit e54f4bf
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 12 20:46:39 2023 +0000

        Add line endings to files

    commit 08c5f8d
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 20:37:48 2023 +0000

        Update tox and GitHub Actions to have typechecks in CI

    commit e16bea0
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 19:32:02 2023 +0000

        CI/GitHub Actions workflow test config

    commit 270eaf0
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 19:30:07 2023 +0000

        Integrate typechecks into CI/tox

    commit ae32024
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 17:41:37 2023 +0000

        Added py.typed to package_data (PEP 561)

    commit 5f06430
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 16:42:52 2023 +0000

        Added mypy configuration

    commit c5bfe28
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 16:30:48 2023 +0000

        Use explicit TypeAlias definition if supported

    commit e34981b
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 16:01:12 2023 +0000

        Type hint modifications for Python3.6 backward compatibility

    commit 65c1fe3
    Author: Florian <[email protected]>
    Date:   Sun Feb 12 14:49:22 2023 +0000

        Refined inline types and added type guards to pass mypy --strict typechecking

    commit 3ca09bd
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:25:10 2023 +0000

        Moved type hints inline for electron.py

    commit 59a494e
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:23:06 2023 +0000

        Annotated name in edge.py

    commit 95ac744
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:22:00 2023 +0000

        Moved type hints inline for edge.py

    commit 234a2a4
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:20:20 2023 +0000

        Added return type for run() in chrome.py

    commit b3cf69a
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:17:37 2023 +0000

        Narrowed types and moved type hints inline for chrome.py

    commit be7e70e
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 21:08:39 2023 +0000

        Refined type hints and moved them inline for browsers.py

    commit 007fe81
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 20:47:16 2023 +0000

        Moved type hints for __main__.py inline

    commit 248d543
    Author: Florian <[email protected]>
    Date:   Fri Feb 10 20:39:06 2023 +0000

        Moved type hints into .py and narrowed further

    commit 88527c5
    Merge: 7f1b8e3 5051761
    Author: Florian Breit <[email protected]>
    Date:   Thu Feb 9 15:15:37 2023 +0100

        Merge branch 'main' into typed

    commit 5051761
    Merge: 2b39a34 76ba80e
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:55:21 2023 +0000

        Merge pull request python-eel#550 from MichaelCurrin/patch-2

        docs: add README.md for example 4

    commit 2b39a34
    Merge: 649214f 6fbc91e
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:54:32 2023 +0000

        Merge pull request python-eel#658 from python-eel/dont-fail-fast

        Don't cancel all jobs if one fails

    commit 649214f
    Merge: 6b01349 c83f4f8
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:52:02 2023 +0000

        Merge pull request python-eel#573 from Sentinent/eel-routes-on-custom-app

        Add eel routes to `Bottle` instances passed in to `eel.start`

    commit 6fbc91e
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:49:15 2023 +0000

        Don't cancel all jobs if one fails

    commit c83f4f8
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:43:46 2023 +0000

        Bump to v0.15.2

        To release `eel.register_eel_routes`

    commit cc7eea5
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:42:44 2023 +0000

        Rename to `register_eel_routes`

    commit fa7b30c
    Author: Sentinent <[email protected]>
    Date:   Sat Mar 12 00:37:23 2022 -0800

        typo: "default eel routes" -> "custom routes"

    commit ff5a7ef
    Author: Sentinent <[email protected]>
    Date:   Fri Mar 11 23:59:01 2022 -0800

        Update custom_app_routes example to not use beaker middleware, but include middleware usage in comments

    commit 474fe7e
    Author: Sentinent <[email protected]>
    Date:   Fri Mar 11 23:36:53 2022 -0800

        Fix default eel routes not being added to custom app instances

    commit 6b01349
    Merge: 37d9480 6003c3d
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 16:33:52 2023 +0000

        Merge pull request python-eel#386 from mo0haned/patch-1

        Update hello.py

    commit 6003c3d
    Author: Mohaned Abd Elmonsef <[email protected]>
    Date:   Wed Aug 26 20:16:45 2020 +0200

        Update hello.py

        "options" is not supported anymore
        so I changed it with mode = 'electron'

    commit 37d9480
    Merge: e524660 91c11cc
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 11:12:50 2023 +0000

        Merge pull request python-eel#657 from python-eel/broaden-requirements

        Broaden requirements

    commit 91c11cc
    Author: Samuel Williams <[email protected]>
    Date:   Sun Feb 5 11:04:49 2023 +0000

        Broaden requirements

        Eel should be usable with a fairly generous set of package versions so
        that it meets more of our users requirements without being overly
        strict.

    commit e524660
    Author: doug-benn <[email protected]>
    Date:   Sun Feb 5 10:55:10 2023 +0000

        Fixed Tests v2 (python-eel#651)

        Fix tests for Windows

    commit 7f1b8e3
    Merge: 6981451 eb705d1
    Author: Florian Breit <[email protected]>
    Date:   Sat Dec 10 03:25:56 2022 +0100

        Merge branch 'master' into typed

    commit eb705d1
    Merge: bdfaed2 4d5e1d8
    Author: Samuel Williams <[email protected]>
    Date:   Fri Dec 9 20:44:09 2022 +0000

        Merge pull request python-eel#645 from python-eel/SW-bump-bottle

        Bump bottle from v0.12.13 to v0.12.20

    commit 4d5e1d8
    Author: Samuel Williams <[email protected]>
    Date:   Fri Dec 9 20:12:17 2022 +0000

        Bump bottle from v0.12.13 to v0.12.20

        Addresses two CVEs flagged by dependabot:

        * Critical: CVE-2022-31799
        * Moderate: CVE-2020-28473

    commit bdfaed2
    Merge: eb26589 2f27d00
    Author: Samuel Williams <[email protected]>
    Date:   Fri Dec 9 20:24:40 2022 +0000

        Merge pull request python-eel#646 from python-eel/SW-pin-tox-below-4

        Pin tox version for tests below v4

    commit 2f27d00
    Author: Samuel Williams <[email protected]>
    Date:   Fri Dec 9 20:19:09 2022 +0000

        Pin tox version for tests below v4

    commit 6981451
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 11:10:22 2022 +0000

        Renamed __init__.pyi to remove typo from filename

    commit 0a2b5b2
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 11:03:32 2022 +0000

        Added type stub for electron.py

    commit ae2519c
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 10:58:07 2022 +0000

        Added type stub for edge.py

    commit ce0823f
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 10:50:55 2022 +0000

        Added type stub for chrome.py

    commit b2c3371
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 10:46:23 2022 +0000

        Added type stub for browsers.py

    commit 8859e85
    Author: thatfloflo <[email protected]>
    Date:   Mon Mar 21 10:38:43 2022 +0000

        Added type stub for __main__.py

    commit 76ba80e
    Author: Michael Currin <[email protected]>
    Date:   Fri Dec 3 15:28:16 2021 +0200

        docs: add README.md for example 4

commit ff3fb69
Author: thatfloflo <[email protected]>
Date:   Mon Mar 21 10:27:56 2022 +0000

    Added type stub for __init__.py
@doug-benn
Copy link
Contributor Author

doug-benn commented Feb 13, 2023

Thank you!

@doug-benn doug-benn deleted the Tests branch February 13, 2023 22:22
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

1 more reviewer

@samuelhwilliams samuelhwilliams samuelhwilliams left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@doug-benn @samuelhwilliams