fish 3 compatbilityrelease-16.2.0

5 files changed, 53 insertions, 36 deletions

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e4716fd..c082cbd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -129,19 +129,20 @@ jobs:
       reportDirectory: '$(System.DefaultWorkingDirectory)/.tox/htmlcov'
       failIfCoverageEmpty: true
 
-- job: publish
-  dependsOn:
-  - report_coverage
-  - linux_fix_lint
-  - linux_docs
-  - linux_embed
-  - linux_package_readme
-  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'))
-  pool: {vmImage: 'Ubuntu 16.04'}
-  steps:
-  - task: UsePythonVersion@0
-    displayName: setup python3.7
-    inputs: {versionSpec: '3.7'}
-  - script: 'python3.7 -m pip -U install twine pip'
-  - script: 'python3.7 -m pip wheel -w "$(System.DefaultWorkingDirectory)/w" --no-deps'
-  - script: 'python3.7 -m twine -r pypi-gb --config-file $(PYPIRC_PATH) "$(System.DefaultWorkingDirectory)/w/*"'
+- ${{ if startsWith(variables['Build.SourceBranch'], 'refs/tags/') }}:
+  - job: publish
+    dependsOn:
+    - report_coverage
+    - linux_fix_lint
+    - linux_docs
+    - linux_embed
+    - linux_package_readme
+    condition: succeeded()
+    pool: {vmImage: 'Ubuntu 16.04'}
+    steps:
+    - task: UsePythonVersion@0
+      displayName: setup python3.7
+      inputs: {versionSpec: '3.7'}
+    - script: 'python3.7 -m pip install -U twine pip'
+    - script: 'python3.7 -m pip wheel -w "$(System.DefaultWorkingDirectory)/w" --no-deps .'
+    - script: 'python3.7 -m twine -r pypi-gb --config-file $(PYPIRC_PATH) "$(System.DefaultWorkingDirectory)/w/*"'
diff --git a/docs/changes.rst b/docs/changes.rst
index e634839..1bc5a29 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -21,6 +21,7 @@ Bugfixes
 Features
 ^^^^^^^^
 
+- ``fish`` version 3 support for the activation script. (`#1275 <https://github.com/pypa/virtualenv/issues/1275>`_)
 - ``powershell`` activator is no longer signed. (`#816 <https://github.com/pypa/virtualenv/issues/816>`_)
 - ``pyproject.toml`` with ``PEP-517`` and ``PEP-518`` is now provided. ``tox.ini`` is now packaged with the ``sdist``. Distributions repackaging the library should use ``tox -e py`` to run the test suite on the ``sdist``. (`#909 <https://github.com/pypa/virtualenv/issues/909>`_)
 - ``activate_this.py`` improvements: set ``VIRTUAL_ENV`` environment variable; ``pypy``, ``pypy3`` and ``jython`` support. (`#1057 <https://github.com/pypa/virtualenv/issues/1057>`_)
diff --git a/tests/activation/test_activation.py b/tests/activation/test_activation.py
index 26060ae..d2ad1c1 100644
--- a/tests/activation/test_activation.py
+++ b/tests/activation/test_activation.py
@@ -116,7 +116,10 @@ class Activation(object):
         env = get_env()
         env.update(self.env)
 
-        raw = subprocess.check_output(invoke_shell, universal_newlines=True, stderr=subprocess.STDOUT, env=env)
+        try:
+            raw = subprocess.check_output(invoke_shell, universal_newlines=True, stderr=subprocess.STDOUT, env=env)
+        except subprocess.CalledProcessError as exception:
+            assert not exception.returncode, exception.output
         out = re.sub(r"pydev debugger: process \d+ is connecting\n\n", "", raw, re.M).strip().split("\n")
 
         # pre-activation
diff --git a/virtualenv.py b/virtualenv.py
index 75e65c5..ba42590 100755
--- a/virtualenv.py
+++ b/virtualenv.py
@@ -2126,23 +2126,25 @@ Ac1FhrMbX+3UzW8yB99gBv7n/Puf2ffa3CPN/gKu/HeT
 # file activate.fish
 ACTIVATE_FISH = convert(
     """
-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
+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
 """
 )
 
diff --git a/virtualenv_embedded/activate.fish b/virtualenv_embedded/activate.fish
index 028ca61..4e8a09b 100644
--- a/virtualenv_embedded/activate.fish
+++ b/virtualenv_embedded/activate.fish
@@ -17,7 +17,12 @@ end
 function deactivate -d 'Exit virtualenv mode and return to the normal environment.'
     # reset old environment variables
     if test -n "$_OLD_VIRTUAL_PATH"
-        set -gx PATH (_fishify_path $_OLD_VIRTUAL_PATH)
+        # https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling
+        if test (echo $FISH_VERSION | tr "." "\n")[1] -lt 3
+            set -gx PATH (_fishify_path $_OLD_VIRTUAL_PATH)
+        else
+            set -gx PATH $_OLD_VIRTUAL_PATH
+        end
         set -e _OLD_VIRTUAL_PATH
     end
 
@@ -53,7 +58,12 @@ deactivate nondestructive
 
 set -gx VIRTUAL_ENV "__VIRTUAL_ENV__"
 
-set -gx _OLD_VIRTUAL_PATH (_bashify_path $PATH)
+# https://github.com/fish-shell/fish-shell/issues/436 altered PATH handling
+if test (echo $FISH_VERSION | tr "." "\n")[1] -lt 3
+   set -gx _OLD_VIRTUAL_PATH (_bashify_path $PATH)
+else
+    set -gx _OLD_VIRTUAL_PATH $PATH
+end
 set -gx PATH "$VIRTUAL_ENV/__BIN_NAME__" $PATH
 
 # Unset `$PYTHONHOME` if set.