diff --git a/pyctdev/_conda.py b/pyctdev/_conda.py index 42e9f0d..48ec7b0 100644 --- a/pyctdev/_conda.py +++ b/pyctdev/_conda.py @@ -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" diff --git a/pyctdev/_pip.py b/pyctdev/_pip.py index 3b571eb..a978fe2 100644 --- a/pyctdev/_pip.py +++ b/pyctdev/_pip.py @@ -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, @@ -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 @@ -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 ########## @@ -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`` @@ -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 = [] @@ -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: @@ -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), @@ -200,7 +198,7 @@ def task_package_upload(): 'type':str, 'default':'' } - + pypi = { 'name':'pypi', 'long':'pypi', @@ -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`` diff --git a/setup.py b/setup.py index aba3c1e..f4b6223 100755 --- a/setup.py +++ b/setup.py @@ -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'],