From 2acb397e91b6dd44d9f2b1cacfe5e2f1b75f4b31 Mon Sep 17 00:00:00 2001 From: Antony Peacock Date: Sat, 1 May 2021 07:10:40 +0100 Subject: [PATCH] Migrate from Bintray to Artifactory Cloud (#63) * Migrate from Bintray to Artifactory Cloud * Remove email and use pseudonym * Correct remote upload path * Correct call to find mdspan --- .conan/build.py | 6 +++--- README.md | 4 ++-- cmake/wg21_linear_algebra-config.cmake.in | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.conan/build.py b/.conan/build.py index b58a32f..a8e5043 100644 --- a/.conan/build.py +++ b/.conan/build.py @@ -7,13 +7,13 @@ from cpt.packager import ConanMultiPackager def username(): - return os.getenv("CONAN_USERNAME", "public-conan") + return os.getenv("CONAN_USERNAME", "conan-oss") def login_username(): - return os.getenv("CONAN_LOGIN_USERNAME", "Twonington") + return os.getenv("CONAN_LOGIN_USERNAME", "twonington") def upload(): - return os.getenv("CONAN_UPLOAD", "https://api.bintray.com/conan/twonington/public-conan") + return os.getenv("CONAN_UPLOAD", "https://twonington.jfrog.io/artifactory/api/conan/conan-oss") def upload_only_when_stable(): return os.getenv("CONAN_UPLOAD_ONLY_WHEN_STABLE", "True").lower() in ["true", "1", "yes"] diff --git a/README.md b/README.md index cac7aa8..a65fdd6 100644 --- a/README.md +++ b/README.md @@ -139,13 +139,13 @@ To add the *linear_algebra* library to your project as a dependency, you need to ```bash pip install conan -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 ``` Once this is set, you can add the linear_algebra dependency to you project via the following signature: ```bash -linear_algebra/0.7.0@public-conan/testing +linear_algebra/0.7.0@conan-oss/testing ``` Available versions of the Linear Algebra package can be search via Conan: diff --git a/cmake/wg21_linear_algebra-config.cmake.in b/cmake/wg21_linear_algebra-config.cmake.in index e729aa2..a4bb893 100644 --- a/cmake/wg21_linear_algebra-config.cmake.in +++ b/cmake/wg21_linear_algebra-config.cmake.in @@ -4,7 +4,7 @@ check_required_components(wg21_linear_algebra) include(CMakeFindDependencyMacro) -find_dependency(MDSpan REQUIRED) +find_dependency(mdspan REQUIRED) if(NOT TARGET wg21_linear_algebra::wg21_linear_algebra) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")