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

Bypass the entrypoint mechanism #156

Merged
merged 2 commits into from
Mar 3, 2020
Merged

Bypass the entrypoint mechanism #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bfce656
Bypass the entrypoint mechanism
mcg1969 Mar 3, 2020
84c8dc9
Increment the Python 3 matrix
mcg1969 Mar 3, 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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ env:
secure: Vf0mo4VkI/AgebH9WmFSzwj7sEKCrydW3H0EOegvx1tNLieq9i38ZTyoW/srLX2N60T9xuf+J8+Ntwo978/Iu69O+SD4ghCBa4SThS+b7R2wtRXa3TL3uV1n1GRY8ybCl1bOARQ1wgoPYOQUZ6oAIrmAUjeM7g2Y63vp1y8nVYJPFjJuToJ3JNiB+l0FUA43MuHMhVFaO0U6vwbkmOPc5a4hk+NQYCCTa36XRb5BscQwzfhFKsQ295tHxmK5ZFiU8PhzK/fRyKUnkDhGa0PyQnHoBztHjJgHmcMQOfvgMctOZiFFgQP6yiwV5BzB4eYYH7eDk5rbyK5PT3ptsPJQmLrjFCDyp6lbRMRvyvdN08Rw3mjQyPhqeo9UNwNc3iFHHBSNqtXx+AtZKxYeJru3eLH6B+FgBdw6fy+Wire1sRzPLnIzQbaG70siIDS6nVlyynaxXfpbrzEJYH8cSib9XB2YqK+fHmfDa21n4U6aVJuQdC5Z0NudWqp3utNvWlwMbVLyffMgZjfLyfhu6mVyzWpYWJ5wehveBP4gd3eMhihOco0SzBicvbzE5eS2ndQPIGv/PtC3t/mLWMIRo72hnaxhhxWbeeh7K++idJRz7PMiIXwP3hKFLNc8RfbLriKBponK29Vv3aVWN2zc2NyWr9kKL9rt+6kAmj69gbRmQHA=
matrix:
- PYTHON_VERSION=2.7
- PYTHON_VERSION=3.5
- PYTHON_VERSION=3.6
- PYTHON_VERSION=3.7
- PYTHON_VERSION=3.8

install:
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ environment:
ANACONDA_TOKEN:
secure: ARz+fIEDJ03ENwXTyuy0pkzmxddWXFc+pN9+mwBcCnT7ytqlQ/ojcnH3gYsLp9TB
matrix:
- PYTHON_VERSION: 3.8
- PYTHON_VERSION: 3.7
- PYTHON_VERSION: 3.6
- PYTHON_VERSION: 3.5
- PYTHON_VERSION: 2.7

init:
Expand Down
6 changes: 5 additions & 1 deletion nb_conda_kernels/install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,11 @@ def install(enable=False, disable=False, status=None, prefix=None, path=None, ve
log.info("{}ing nb_conda_kernels...".format(ENDIS[enable][:-2].capitalize()))

is_enabled_entry = False
has_entrypoints = int(jc_version.split('.', 1)[0]) >= 6
# Disable the entry-point based mechanism. Most if this code will need
Copy link

Choose a reason for hiding this comment

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

nit: Most if -> Most of

# to be removed, because the kernel discovery mechanism was changed
# before jupyter_client 6 was released. For now we're dropping back to
# the jupyter_client 5 model until we leverage the new mechanism.
has_entrypoints = False # int(jc_version.split('.', 1)[0]) >= 6
log.debug('Entry points:')
for ep in iter_entry_points(group=JCKP):
log.debug(' - {}'.format(ep))
Expand Down