Skip to content

Pinning pip under 19.1 #13

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

Merged
merged 1 commit into from
Apr 30, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pyctdev/_conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@

# TODO: not sure what conda-using developers do/prefer...
# pip develop and don't install missing deps
# python_develop = "pip install --no-deps -e ."
python_develop = "pip install --no-deps -e ."
# pip develop and pip install missing deps
# python_develop = "pip install -e ."
# setuptools develop and don't install missing deps
python_develop = "python setup.py develop --no-deps"
# python_develop = "python setup.py develop --no-deps"
# setuptools develop and easy_install missing deps:
# python_develop = "python setup.py develop"

Expand Down
26 changes: 12 additions & 14 deletions pyctdev/_pip.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}

def _pip_install_with_options(options,channel):
cmd = "pip install --upgrade "
cmd = "pip install --upgrade "

if 'testpypi' in channel:
# note: should pre always be used maybe? Or more likely,
Expand All @@ -57,7 +57,7 @@ def _pip_install_with_options(options,channel):
cmd += " ".join(['--extra-index-url=%s '%server for server in servers[1::]])

cmd += "-e ."

if len(options)>0:
cmd+="[%s]"%(",".join(options))
return cmd
Expand All @@ -77,11 +77,9 @@ def task_env_capture():
def task_ecosystem_setup():
"""Common pip setup

Updates to latest pip, tox, twine, and wheel.
Updates to latest tox, twine, and wheel.
"""
# TODO: will need to become something like the following w/ pip10
# d:\python36\python.exe -m pip install --upgrade pip tox twine wheel
return {'actions': ["pip install --upgrade pip tox twine wheel"]}
return {'actions': ["pip install --upgrade tox twine wheel"]}


########## PACKAGING ##########
Expand All @@ -92,7 +90,7 @@ def task_package_build():
"""Build pip package, then install and test all_quick (or other
specified env) in venv

E.g.
E.g.

``doit package_build --formats=bdist_wheel``
``doit package_build -e all_quick-Ewith_numpy``
Expand Down Expand Up @@ -121,7 +119,7 @@ def task_package_build():
'default':'sdist --formats=gztar bdist_wheel --universal'
}
# TODO: missing support for pypi channels

def thing(test_group,test_python,test_requires,pkg_tests,sdist=False):
if pkg_tests:
enviros = []
Expand Down Expand Up @@ -149,7 +147,7 @@ def sdist(test_group,test_python,test_requires,pkg_tests,formats,sdist_run_tests
return echo("not running sdist tests")
else:
return echo("no sdist")

def sdist_build_deps(formats,sdist_install_build_deps):
if 'sdist' in formats:
if not sdist_install_build_deps:
Expand All @@ -167,7 +165,7 @@ def sdist_build_deps(formats,sdist_install_build_deps):


# TODO: would be able to use the packages created by tox if
# https://github.com/tox-dev/tox/issues/232 were done
# https://github.com/tox-dev/tox/issues/232 were done
return {'actions': [CmdAction(wheel),
CmdAction(sdist_build_deps),
CmdAction(sdist),
Expand Down Expand Up @@ -200,7 +198,7 @@ def task_package_upload():
'type':str,
'default':''
}

pypi = {
'name':'pypi',
'long':'pypi',
Expand Down Expand Up @@ -237,15 +235,15 @@ def task_env_create():

def task_develop_install():
"""python develop install with specified optional groups of dependencies.
Typically ``pip install -e .[tests]``.

Typically ``pip install -e .[tests]``.

Pass --options multiple times to specify other optional groups
(see project's setup.py for available options).

Pass --channel multiple times to specify other pypi servers.

E.g.
E.g.

``doit develop_install -o examples -o tests``
``doit develop_install -o all``
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@

# Pretty much part of every python distribution now anyway.
# Use it e.g. to be able to read pyproject.toml
'pip >=10'
# pinning to avoid https://github.com/pyviz/pyctdev/issues/12
'pip ==19.0.3'
],
extras_require={
'tests': ['flake8'],
Expand Down