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.

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

Merge point release back into main #14171

Merged
merged 16 commits into from
Sep 30, 2020
Merged

Merge point release back into main #14171

merged 16 commits into from
Sep 30, 2020

Commits on Sep 17, 2020

  1. Port ipykernel install fix to release (#13975)

    * Fix installing ipykernel into interpreters for raw kernel (#13959)
    
    * update news
    
    Co-authored-by: Ian Huff <ianhuff@CEIDCCEVIPSVC01.redmond.corp.microsoft.com>
    IanMatthewHuff and Ian Huff committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    8c44490 View commit details
    Browse the repository at this point in the history
  2. Merge in changes to release (#13976)

    * Up release version for new release (#13928)
    
    * Up release version
    
    * Update changelog
    
    * Update changelog
    
    * Workaround test issue (#13930)
    
    * Try different version of VS code in release
    
    * Change to make it use the actual variable
    
    * Use a real version
    
    * More tests failing with gpu error (#13935)
    
    * Try different version of VS code in release
    
    * Change to make it use the actual variable
    
    * Use a real version
    
    * Two more version changes
    
    * Fix kernel and server name missing in certain situations (#13974)
    
    * Fix kernel name and server name
    
    * Fixup server name for remote situations
    
    * Add some functional tests
    
    * Add news entry
    
    * Delete news file
    rchiodo committed Sep 17, 2020
    Configuration menu
    Copy the full SHA
    b92203a View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2020

  1. Port two fixes to the release branch (#13995)

    * Disable split views of custom editors (#13985)
    
    * Fix backup storage by looking at the options correctly (#13983)
    
    * Fix backup storage by looking at the options correctly
    
    * Fix backup by being more explicit
    
    * Only linux tests are failing. Hopefully fix them
    
    * Fixup changelog
    
    Co-authored-by: Don Jayamanne <don.jayamanne@yahoo.com>
    rchiodo and DonJayamanne committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    8c4a0ec View commit details
    Browse the repository at this point in the history
  2. add jedi-language-server to 3rd party notices (#13977)

    * add jedi-language-server to 3rd party notices
    
    * move license from distribution to repository file
    David Kutugata committed Sep 18, 2020
    Configuration menu
    Copy the full SHA
    6cb43d5 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2020

  1. disable test_discover_complex_default and (#14024)

    test_discover_complex_doctest
    David Kutugata committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    832025a View commit details
    Browse the repository at this point in the history
  2. Upgrade isort to 5.5.3 (#14035) (#14037)

    Kartik Raj committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    074024c View commit details
    Browse the repository at this point in the history
  3. prepare release (#14042)

    David Kutugata committed Sep 22, 2020
    Configuration menu
    Copy the full SHA
    c1258f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2020

  1. fixed annoying warnings (#14049)

    David Kutugata committed Sep 23, 2020
    Configuration menu
    Copy the full SHA
    0b41a86 View commit details
    Browse the repository at this point in the history

Commits on Sep 28, 2020

  1. Cherry pick to address path issues. (#14125)

    * Do not quote isolated in exec module (#14108)
    
    * Do not quote isolated in exec module
    
    * Revert "Do not quote isolated in exec module"
    
    This reverts commit b9fa04c.
    
    * Revert "IPyKernel install issue with windows paths (#13667)"
    
    This reverts commit 23725ab.
    
    * Fix unit test broken by recent revert (#14122)
    karthiknadig committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    8d337a7 View commit details
    Browse the repository at this point in the history
  2. Port escape fix to release branch (#14133)

    * Fix HTML escaping to match what Jupyter does (#14038)
    
    * Basic idea
    
    * add some functional tests
    
    * Add news entry
    
    * Fix functional tests
    
    * Update changelog
    rchiodo committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    5da34fc View commit details
    Browse the repository at this point in the history
  3. update version and changelog (#14139)

    David Kutugata committed Sep 28, 2020
    Configuration menu
    Copy the full SHA
    5065d31 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2020

  1. Escaping fix broke a number of things (#14145) (#14154)

    * Fixes for escaping
    
    * Push a comment ot start PR again
    
    * Cache task is failing
    
    * Remove cache task
    
    * Not fixing so just put back cache task
    rchiodo committed Sep 29, 2020
    Configuration menu
    Copy the full SHA
    f276e07 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2020

  1. Merge branch 'main' into david/mergeReleaseBack

    David Kutugata committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    200e099 View commit details
    Browse the repository at this point in the history
  2. remove leftovers

    David Kutugata committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    ec93163 View commit details
    Browse the repository at this point in the history
  3. import pytest

    David Kutugata committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    c8827ff View commit details
    Browse the repository at this point in the history
  4. stop skipping python tests

    David Kutugata committed Sep 30, 2020
    Configuration menu
    Copy the full SHA
    77b527b View commit details
    Browse the repository at this point in the history