Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove pytest11 entrypoint and plugin, require tornado 6.1, remove asyncio patch, CI work #339

Merged
merged 27 commits into from
Nov 17, 2020
Merged

Remove pytest11 entrypoint and plugin, require tornado 6.1, remove asyncio patch, CI work #339

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3617344
remote pytest11 entrypoint
bollwyvl Nov 13, 2020
ec6a9c6
try dotted import
bollwyvl Nov 13, 2020
f35144d
add conftest to example
bollwyvl Nov 13, 2020
c076f84
merge master
bollwyvl Nov 13, 2020
d7709fa
remove un-needed conftest.py
bollwyvl Nov 13, 2020
2a3a2a0
tweak some metadata
bollwyvl Nov 13, 2020
b96c939
update fixtures in example
bollwyvl Nov 13, 2020
933b4f5
actually use renamed fixtures
bollwyvl Nov 14, 2020
20ec9ec
add some more ci trappings
bollwyvl Nov 14, 2020
d925e67
recursive-include to grab spec.yaml
bollwyvl Nov 14, 2020
fd94f12
inject server config properly
bollwyvl Nov 14, 2020
3c99dff
fix workflow
bollwyvl Nov 14, 2020
02579a7
collect coverage
bollwyvl Nov 14, 2020
47f07a4
paramaterize (un)hidden file tests
bollwyvl Nov 14, 2020
ba40f81
log some more
bollwyvl Nov 14, 2020
d026e83
try adding winpty
bollwyvl Nov 14, 2020
b86e72d
fix pywinpty name
bollwyvl Nov 14, 2020
631e075
rever winpty, try longer request timeouts
bollwyvl Nov 14, 2020
0d0ac3c
just connect_timeout
bollwyvl Nov 14, 2020
8694e53
try with unlimited connect_timeout
bollwyvl Nov 14, 2020
20816c4
overload jp_fetch
bollwyvl Nov 14, 2020
0e8a00f
fix imports
bollwyvl Nov 14, 2020
480d6d6
try new tornado hotness
bollwyvl Nov 14, 2020
a0640b3
more work on removing asyncio patch
bollwyvl Nov 14, 2020
da0fef5
updates from review
bollwyvl Nov 15, 2020
e09ba05
fix minimum tornado error message
bollwyvl Nov 16, 2020
2ce063a
move min tornado outside translation block
bollwyvl Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions examples/simple/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,14 @@ def add_data_files(path):
version = VERSION,
description = 'Jupyter Server Example',
long_description = open('README.md').read(),
python_requires = '>=3.5',
python_requires = '>=3.6',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

☠️

Copy link
Member

Choose a reason for hiding this comment

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

I guess I'm not following the skull & crossbones commentary here, sorry about that. The change seems fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just meant 3.5 is EOL!

install_requires = [
'jupyter_server',
'jinja2',
],
extras_require = {
'test': ['pytest-jupyter'],
Copy link
Contributor Author

Choose a reason for hiding this comment

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

not strictly required, but if the example is supposed to be illustrative...

},
include_package_data=True,
cmdclass = cmdclass,
entry_points = {
Expand All @@ -52,4 +55,4 @@ def add_data_files(path):


if __name__ == '__main__':
setup(**setup_args)
setup(**setup_args)
3 changes: 0 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
entry_points = {
'console_scripts': [
'jupyter-server = jupyter_server.serverapp:main',
],
'pytest11': [
'pytest_jupyter_server = jupyter_server.pytest_plugin'
]
},
)
Expand Down
Empty file added tests/conftest.py
View file
Open in desktop
Empty file.