Unverified Commit 265b7cf1 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

use new dependency resolver in pip for the documentation build virtual environment

parent 00251409

cmake/Modules/Documentation.cmake

+1 −1
Original line number Original line Diff line number Diff line
@@ -29,8 +29,8 @@ if(BUILD_DOC) 
    OUTPUT requirements.txt

    OUTPUT requirements.txt

    DEPENDS docenv

    DEPENDS docenv

    COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_DOC_DIR}/utils/requirements.txt requirements.txt

    COMMAND ${CMAKE_COMMAND} -E copy ${LAMMPS_DOC_DIR}/utils/requirements.txt requirements.txt

    COMMAND ${DOCENV_BINARY_DIR}/pip install -r requirements.txt --upgrade

    COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade ${LAMMPS_DOC_DIR}/utils/converters

    COMMAND ${DOCENV_BINARY_DIR}/pip install --upgrade ${LAMMPS_DOC_DIR}/utils/converters

    COMMAND ${DOCENV_BINARY_DIR}/pip install --use-feature=2020-resolver -r requirements.txt --upgrade

  )

  )





  # download mathjax distribution and unpack to folder "mathjax"

  # download mathjax distribution and unpack to folder "mathjax"

doc/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ $(VENV): 
		$(VIRTUALENV) -p $(PYTHON) $(VENV); \

		$(VIRTUALENV) -p $(PYTHON) $(VENV); \

		. $(VENV)/bin/activate; \

		. $(VENV)/bin/activate; \

		pip install --upgrade pip; \

		pip install --upgrade pip; \

		pip install -r requirements.txt; \

		pip install --use-feature=2020-resolver -r requirements.txt; \

		deactivate;\

		deactivate;\

	)

	)

CRA Git | Maintained and supported by SUSTech CRA and CCSE