Skip to content

Commit

Permalink
tooling: Limit Conan installation to <2.0
Browse files Browse the repository at this point in the history
Short term solution until all tools and conanfiles are Conan 2.0
compatible.
  • Loading branch information
Franco Guidi authored and cassava committed Feb 28, 2023
1 parent a942a45 commit d27bbcb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile.setup
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ install-python-deps::
command -v ${PIP} >/dev/null 2>&1
${PIP} install ${PIP_INSTALL_ARGS} \
click \
conan \
"conan<2.0.0" \
libtmux \
toml \
pipx \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ point. In a pinch, the following steps should suffice:

1. Install Conan with Python.
```
pip3 install --user --upgrade conan
pip3 install --user --upgrade "conan<2.0.0"
```
2. Define a Conan profile, which defines the machine configuration.
```
Expand Down
2 changes: 1 addition & 1 deletion docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ point. In a pinch, the following steps should suffice:
1. `Install Conan <https://docs.conan.io/en/latest/installation.html>`__,
if you haven't done so already; for example with `pip`_ or `pipx`_::

pipx install conan
pipx install "conan<2.0.0"

.. note::
We expect you to keep your Conan installation up-to-date. Since Conan is
Expand Down
2 changes: 1 addition & 1 deletion optional/vtd/vendor/vtd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ RUN --mount=type=cache,id=bionic-cache,target=/var/cache/apt \
rm -rf /var/lib/apt/lists/*

RUN pip3 install --upgrade pip && \
pip3 install conan
pip3 install "conan<2.0.0"

RUN conan profile new --detect default && \
conan profile update settings.compiler.libcxx=libstdc++11 default
Expand Down

0 comments on commit d27bbcb

Please sign in to comment.