Skip to content
Snippets Groups Projects
Commit 59f9c3b7 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-upgrade-conan' into 'dev'

WIP FIX: Fix pipeline: Upgrade conan to 1.48.

See merge request !36
parents 2cc20fae 8966f340
Branches
Tags
2 merge requests!37REL: Release v0.1.2,!36WIP FIX: Fix pipeline: Upgrade conan to 1.48.
Pipeline #23452 passed
Pipeline: caosdb-cppinttest

#23453

    ...@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
    ### Fixed ### Fixed
    - #41 Updated Conan version in CI pipeline.
    ### Security ### Security
    ## [0.1.1 - 2022-04-12] ## [0.1.1 - 2022-04-12]
    ......
    ...@@ -16,13 +16,13 @@ pytz==2021.1 ...@@ -16,13 +16,13 @@ pytz==2021.1
    requests==2.25.1 requests==2.25.1
    six==1.16.0 six==1.16.0
    snowballstemmer==2.1.0 snowballstemmer==2.1.0
    Sphinx==4.0.1 Sphinx==4.5.0
    sphinx-rtd-theme==0.5.2 sphinx-rtd-theme==1.0.0
    sphinx-sitemap==2.2.0 sphinx-sitemap==2.2.0
    sphinxcontrib-applehelp==1.0.2 sphinxcontrib-applehelp==1.0.2
    sphinxcontrib-devhelp==1.0.2 sphinxcontrib-devhelp==1.0.2
    sphinxcontrib-htmlhelp==1.0.3 sphinxcontrib-htmlhelp==2.0.0
    sphinxcontrib-jsmath==1.0.1 sphinxcontrib-jsmath==1.0.1
    sphinxcontrib-qthelp==1.0.3 sphinxcontrib-qthelp==1.0.3
    sphinxcontrib-serializinghtml==1.1.4 sphinxcontrib-serializinghtml==1.1.5
    urllib3==1.26.7 urllib3==1.26.7
    ...@@ -4,13 +4,13 @@ certifi==2021.10.8 ...@@ -4,13 +4,13 @@ certifi==2021.10.8
    chardet==4.0.0 chardet==4.0.0
    charset-normalizer==2.0.7 charset-normalizer==2.0.7
    colorama==0.4.4 colorama==0.4.4
    conan==1.43.0 conan==1.48.0
    deprecation==2.1.0 deprecation==2.1.0
    distro==1.6.0 distro==1.6.0
    fasteners==0.16.3 fasteners==0.16.3
    future==0.18.2 future==0.18.2
    idna==3.2 idna==3.2
    Jinja2==2.11.3 Jinja2==3.1.1
    jsonschema==4.1.0 jsonschema==4.1.0
    MarkupSafe==2.0.1 MarkupSafe==2.0.1
    node-semver==0.6.1 node-semver==0.6.1
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment