diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 478d0435..2991ab65 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -84,7 +84,7 @@ jobs: pip install -U conan conan config init conan remote add upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss - conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan + conan remote add linear-algebra https://twonington.jfrog.io/artifactory/api/conan/conan-oss mkdir _lgtm_build_dir && cd _lgtm_build_dir conan install .. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -o mp-units:build_docs=False -e mp-units:CONAN_RUN_TESTS=True -b outdated -u conan build .. diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index fdefe755..3e003f7b 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -76,7 +76,7 @@ jobs: run: | conan config init conan remote add -i 0 upload https://mpusz.jfrog.io/artifactory/api/conan/conan-oss - conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan + conan remote add linear-algebra https://twonington.jfrog.io/artifactory/api/conan/conan-oss - name: Install Conan dependencies run: | mkdir build && cd build diff --git a/build.py b/build.py index c6962f2f..5660af4e 100644 --- a/build.py +++ b/build.py @@ -36,7 +36,7 @@ if __name__ == "__main__": # dependencies remotes = [ - # ("https://api.bintray.com/conan/twonington/public-conan", True, "linear-algebra") + ("https://twonington.jfrog.io/artifactory/api/conan/conan-oss", True, "linear-algebra") ], build_policy = ["mp-units", "outdated"], upload_dependencies = "all", diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 2fc975f2..a5a05b65 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -32,6 +32,7 @@ - fix: downcasting facility for non-default-constructible types - fix: restore user-warnings within the library implementation - (!) build: Conan testing version is now hosted on [Artifactory](https://mpusz.jfrog.io/ui/packages/conan:%2F%2Fmp-units) + - (!) build: Linear Algebra is now hosted on its [Artifactory](https://api.bintray.com/conan/twonington/public-conan) - (!) build: `BUILD_DOCS` CMake option renamed to `UNITS_BUILD_DOCS` - build: doxygen updated to 1.8.20 - build: catch2 updated to 2.13.4 diff --git a/docs/usage.rst b/docs/usage.rst index 24fe91ca..14755348 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -348,7 +348,7 @@ in **mp-units** repository, you should: .. code-block:: shell - conan remote add linear-algebra https://api.bintray.com/conan/twonington/public-conan + conan remote add linear-algebra https://twonington.jfrog.io/artifactory/api/conan/conan-oss git clone https://github.com/mpusz/units.git && cd units pip3 install -r docs/requirements.txt mkdir build && cd build diff --git a/docs/use_cases/linear_algebra.rst b/docs/use_cases/linear_algebra.rst index 4d2d9ae3..f1f66f37 100644 --- a/docs/use_cases/linear_algebra.rst +++ b/docs/use_cases/linear_algebra.rst @@ -11,7 +11,7 @@ enough to be used with other Linear Algebra libraries existing on the market. All of the examples provided in this chapter refer to the official proposal of the Linear Algebra Library for the C++23 defined in `P1385 `_ and its latest implementation from `GitHub `_ - or `Conan `_. + or `Conan `_. Also, to simplify the examples all of them assume:: using namespace std::math;