Skip to content

Commit

Permalink
ReadTheDocs config and dependency cleanup (conda#10752)
Browse files Browse the repository at this point in the history
* Remove deprecated files. Refs conda#6518.
* Streamline documentation requirements.
* Fix flake8 issue.
  • Loading branch information
jezdez authored Jun 25, 2021
1 parent 42a0d5d commit 729e8b2
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 670 deletions.
5 changes: 3 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
conda:
file: utils/environment.yml
version: 2
python:
version: 3
install:
- requirements: docs/requirements.txt
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,6 @@ pytest-version:
$(PYTEST) --version


conda-version:
$(PYTHON_EXE) utils/setup-testing.py --version


smoketest:
$(PYTEST) tests/test_create.py -k test_create_install_update_remove

Expand Down
2 changes: 1 addition & 1 deletion ci/build_docs.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pip3 install -r utils/requirements-docs.txt
pip install -r docs/requirements.txt
cd docs
make html
11 changes: 6 additions & 5 deletions conda/cli/python_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ def run_command(command, *arguments, **kwargs):
Returns: a tuple of stdout, stderr, and return_code.
stdout, stderr are either strings, None or the corresponding file-like function argument.
Examples:
>> run_command(Commands.CREATE, "-n", "newenv", "python=3", "flask",
use_exception_handler=True)
>> run_command(Commands.CREATE, "-n", "newenv", "python=3", "flask")
>> run_command(Commands.CREATE, ["-n", "newenv", "python=3", "flask"], search_path=())
Examples::
>> run_command(Commands.CREATE, "-n", "newenv", "python=3", "flask",
use_exception_handler=True)
>> run_command(Commands.CREATE, "-n", "newenv", "python=3", "flask")
>> run_command(Commands.CREATE, ["-n", "newenv", "python=3", "flask"], search_path=())
"""
Expand Down
17 changes: 17 additions & 0 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
menuinst; sys_platform == 'win32'
pycosat; sys_platform != 'win32'
requests>=2.14.2
ruamel.yaml
sphinx
sphinx-autobuild
sphinx-argparse==0.2.5
sphinx_rtd_theme
sphinxcontrib-programoutput
sphinxcontrib-applehelp
sphinxcontrib-devhelp
sphinxcontrib-htmlhelp
sphinxcontrib-jsmath
sphinxcontrib-qthelp
sphinxcontrib-serializinghtml
myst-parser
linkify-it-py
83 changes: 0 additions & 83 deletions utils/environment.yml

This file was deleted.

Loading

0 comments on commit 729e8b2

Please sign in to comment.