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

Update vendored dependencies, relevant API usage, and CI config #4169

Merged
merged 49 commits into from
Apr 12, 2020
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
d9cddcb
Updated and re-patched vendored dependencies
techalchemy Dec 21, 2019
b5892c1
Add missing dependencies, fix patched pip path
techalchemy Mar 4, 2020
e629c0c
Update vendor.txt and ecosystem libraries
techalchemy Mar 25, 2020
1456675
Fix outline table conversion for new tomlkit release
techalchemy Mar 25, 2020
e7fc6e9
Re-vendor dependencies
techalchemy Mar 25, 2020
662e7c7
Update tomlkit patch
techalchemy Mar 26, 2020
01157a2
Fix tomlkit patch and update library
techalchemy Mar 26, 2020
bff39c5
Update piptools patches
techalchemy Mar 30, 2020
00bef5e
Fix outline table test to avoid pep517 builder
techalchemy Mar 30, 2020
ee093c5
Update pip version-specific code
techalchemy Mar 30, 2020
7923151
Update vendoring script
techalchemy Mar 30, 2020
6aa9d66
Update test url for discord link in tests
techalchemy Mar 30, 2020
5ef9598
Add importlib_resources package to vendored pkgs
techalchemy Mar 30, 2020
ed8ae21
Fix tomlkit functools32 import
techalchemy Mar 31, 2020
feed2dd
Update requirementslib
techalchemy Mar 31, 2020
e03878d
Add news entry and fix lockfile
techalchemy Mar 31, 2020
a79c91f
Update azure templates
techalchemy Apr 3, 2020
d91a9d4
Normalize paths in test_run_in_virtualenv for windows
techalchemy Apr 3, 2020
c1061bd
Use vistir path normalization for shortened windows paths
techalchemy Apr 3, 2020
13c91f7
stop using verbose mode in windows tests
techalchemy Apr 3, 2020
fdea18e
Only use wrapped streams if not running CI
techalchemy Apr 3, 2020
e911c9a
Use monkeypatch instead of mock for setting dotenv test attributes
techalchemy Apr 4, 2020
f90e183
Fix failing test
techalchemy Apr 4, 2020
5c525ed
Redo test structure for azure
techalchemy Apr 5, 2020
6652157
Fix vendor test
techalchemy Apr 5, 2020
e513404
Fix package build test
techalchemy Apr 5, 2020
1d63308
AP: Update windows tests tempdir path
techalchemy Apr 5, 2020
8a7d3b5
Update ACL scripts
techalchemy Apr 7, 2020
511a144
Update test artifacts
techalchemy Apr 7, 2020
6a12408
Add new pendulum versions
techalchemy Apr 7, 2020
1d151cd
Fix broken exception on windows
techalchemy Apr 7, 2020
8b0f5ad
Don't use pytest-timeout on windows
techalchemy Apr 7, 2020
4c68e20
Don't rely on old requests versions in tests'
techalchemy Apr 8, 2020
9942755
Update test dependencies
techalchemy Apr 8, 2020
e976737
Include data-requires-python in test pypi server
techalchemy Apr 9, 2020
85f10b9
Add comment on resolver functionality
techalchemy Apr 9, 2020
4bbcefb
Update marker resolution
techalchemy Apr 9, 2020
5e68bca
Allow github tests to finish even if one fails, tweak windows tests
techalchemy Apr 9, 2020
4a656b3
Rewrite egg-links on failure to use expanded paths
techalchemy Apr 9, 2020
520e9be
adjust virtualenv installation order
techalchemy Apr 9, 2020
8cf5ee5
GA: Don't run on non-master branches
pradyunsg Apr 10, 2020
ab3e80a
AP: Remove Linux job
pradyunsg Apr 10, 2020
8807630
AP: Re-add Linux job
pradyunsg Apr 10, 2020
d668af0
GA: Nicer naming!
pradyunsg Apr 10, 2020
d75cc6e
AP: Nicer names!
pradyunsg Apr 10, 2020
2eb3d5b
Fix missing normalization import
techalchemy Apr 10, 2020
88fe850
Fix monkeypatch warnings on python 2.7
techalchemy Apr 10, 2020
b493c77
Only include first two requires_python markers
techalchemy Apr 10, 2020
8eddee6
Fix incorrect marker in test
techalchemy Apr 10, 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
12 changes: 6 additions & 6 deletions tests/unit/test_core.py
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ def test_load_dot_env_from_environment_variable_location(monkeypatch, capsys):
with open(dotenv_path, 'w') as f:
f.write('{}={}'.format(key, val))

m.setenv("PIPENV_DOTENV_LOCATION", dotenv_path)
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", dotenv_path)
m.setenv("PIPENV_DOTENV_LOCATION", str(dotenv_path))
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", str(dotenv_path))
load_dot_env()
assert os.environ[key] == val

@@ -49,8 +49,8 @@ def test_doesnt_load_dot_env_if_disabled(monkeypatch, capsys):
with open(dotenv_path, 'w') as f:
f.write('{}={}'.format(key, val))

m.setenv("PIPENV_DOTENV_LOCATION", dotenv_path)
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", dotenv_path)
m.setenv("PIPENV_DOTENV_LOCATION", str(dotenv_path))
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", str(dotenv_path))
m.setattr("pipenv.environments.PIPENV_DONT_LOAD_ENV", True)
load_dot_env()
assert key not in os.environ
@@ -67,8 +67,8 @@ def test_load_dot_env_warns_if_file_doesnt_exist(monkeypatch, capsys):
is_console = False
m.setattr(click._winconsole, "_is_console", lambda x: is_console)
dotenv_path = os.path.join(tempdir.name, 'does-not-exist.env')
m.setenv("PIPENV_DOTENV_LOCATION", dotenv_path)
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", dotenv_path)
m.setenv("PIPENV_DOTENV_LOCATION", str(dotenv_path))
m.setattr("pipenv.environments.PIPENV_DOTENV_LOCATION", str(dotenv_path))
load_dot_env()
output, err = capsys.readouterr()
assert 'Warning' in err