Skip to content

Commit

Permalink
update pywin32 to get past horrible PATH hack
Browse files Browse the repository at this point in the history
Signed-off-by: Kale Franz <[email protected]>
  • Loading branch information
kalefranz committed Jun 15, 2018
1 parent 1891bf4 commit 82a515f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ init:
# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

install:
- "%PYTHON_ROOT%\\Scripts\\conda install -y -c defaults -c conda-forge python=%PYTHON_VERSION% pycosat conda requests ruamel_yaml pytest pytest-cov pytest-timeout mock responses pexpect"
- "%PYTHON_ROOT%\\Scripts\\conda install -y -c defaults -c conda-forge python=%PYTHON_VERSION% pycosat conda requests ruamel_yaml pytest pytest-cov pytest-timeout mock responses pexpect pywin32"
# conda install -y -c defaults -c conda-forge pytest pytest-cov pytest-timeout mock responses pexpect xonsh
# TODO: add xonsh for PY3 builds
- "%PYTHON_ROOT%\\Scripts\\pip install codecov==2.0.5"
Expand Down
5 changes: 2 additions & 3 deletions tests/test_activate.py
Original file line number Diff line number Diff line change
Expand Up @@ -1272,12 +1272,14 @@ def basic_posix(self, shell):
shell.assert_env_var('PS1', '(base).*')
shell.assert_env_var('CONDA_SHLVL', '1')
PATH1 = shell.get_env_var('PATH').strip(':')
assert len(PATH0.split(':')) + num_paths_added == len(PATH1.split(':'))

shell.sendline('conda activate "%s"' % self.prefix)
# shell.sendline('env | sort')
shell.assert_env_var('CONDA_SHLVL', '2')
shell.assert_env_var('CONDA_PREFIX', self.prefix, True)
PATH2 = shell.get_env_var('PATH').strip(':')
assert len(PATH0.split(':')) + num_paths_added == len(PATH2.split(':'))

shell.sendline('env | sort | grep CONDA')
shell.expect('CONDA_')
Expand All @@ -1291,9 +1293,6 @@ def basic_posix(self, shell):
shell.assert_env_var('PS1', '(charizard).*')
shell.assert_env_var('CONDA_SHLVL', '3')
PATH3 = shell.get_env_var('PATH').strip(':')

assert len(PATH0.split(':')) + num_paths_added == len(PATH1.split(':'))
assert len(PATH0.split(':')) + num_paths_added == len(PATH2.split(':'))
assert len(PATH0.split(':')) + num_paths_added == len(PATH3.split(':'))

shell.sendline('conda install -yq sqlite=3.21 openssl') # TODO: this should be a relatively light package, but also one that has activate.d or deactivate.d scripts
Expand Down

0 comments on commit 82a515f

Please sign in to comment.