diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-03 23:38:22 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2018-06-03 23:38:22 +0000 |
| commit | 824584f136206c13732db9958beed4c6918e0ce1 (patch) | |
| tree | 8a93a45848c063391ad95351e3538430cdbc0155 /user/py3-setuptools/pythonpath.patch | |
| parent | c201ddecae188890079cac20a53232c7f361e393 (diff) | |
| parent | f7e0c638da74c1b7fb54bb850b36991898cb3c89 (diff) | |
| download | packages-824584f136206c13732db9958beed4c6918e0ce1.tar.gz packages-824584f136206c13732db9958beed4c6918e0ce1.tar.bz2 packages-824584f136206c13732db9958beed4c6918e0ce1.tar.xz packages-824584f136206c13732db9958beed4c6918e0ce1.zip | |
Merge branch 'python-updates' into 'master'
Various python package updates
See merge request !36
Diffstat (limited to 'user/py3-setuptools/pythonpath.patch')
| -rw-r--r-- | user/py3-setuptools/pythonpath.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/user/py3-setuptools/pythonpath.patch b/user/py3-setuptools/pythonpath.patch index 371804f55..d9d78a861 100644 --- a/user/py3-setuptools/pythonpath.patch +++ b/user/py3-setuptools/pythonpath.patch @@ -1,10 +1,11 @@ ---- setuptools-38.4.0/tox.ini 2018-01-05 13:17:02.000000000 +0000 -+++ setuptools-38.4.0/tox.ini 2018-01-11 01:50:05.810000000 +0000 -@@ -6,6 +6,6 @@ - - [testenv] - deps=-rtests/requirements.txt --passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR -+passenv=APPDATA USERPROFILE HOMEDRIVE HOMEPATH windir APPVEYOR PYTHONPATH - commands=py.test {posargs} +--- setuptools-39.1.0/tox.ini 2018-04-28 07:07:00.000000000 -0400 ++++ setuptools-39.1.0/tox.ini 2018-05-22 00:25:02.969163171 -0400 +@@ -12,7 +12,7 @@ + setenv=COVERAGE_FILE={toxworkdir}/.coverage.{envname} + # TODO: The passed environment variables came from copying other tox.ini files + # These should probably be individually annotated to explain what needs them. +-passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* ++passenv=APPDATA HOMEDRIVE HOMEPATH windir APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* PYTHONPATH + commands=pytest --cov-config={toxinidir}/tox.ini --cov-report= {posargs} usedevelop=True + |