diff --git a/.vscode/settings.json b/.vscode/settings.json index f1a49f4c..1b53523c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,84 @@ { "cmake.configureOnOpen": false, "files.associations": { - "qfile": "cpp" + "qfile": "cpp", + "cctype": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "any": "cpp", + "array": "cpp", + "atomic": "cpp", + "strstream": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cfenv": "cpp", + "charconv": "cpp", + "chrono": "cpp", + "cinttypes": "cpp", + "codecvt": "cpp", + "compare": "cpp", + "complex": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdint": "cpp", + "deque": "cpp", + "forward_list": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "regex": "cpp", + "source_location": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "future": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "ranges": "cpp", + "semaphore": "cpp", + "shared_mutex": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "typeindex": "cpp", + "typeinfo": "cpp", + "variant": "cpp" } } \ No newline at end of file diff --git a/external/aws-sdk-cpp b/external/aws-sdk-cpp index 2d9c1cf2..9629e731 160000 --- a/external/aws-sdk-cpp +++ b/external/aws-sdk-cpp @@ -1 +1 @@ -Subproject commit 2d9c1cf2960e6de4ea29c00d85d308ecd4ebea5a +Subproject commit 9629e731155d73abaa8cb4b916d3eb3b5f7e1271 diff --git a/tools/setup-common.sh b/tools/setup-common.sh index 47ddbf3e..d2c61d5a 100755 --- a/tools/setup-common.sh +++ b/tools/setup-common.sh @@ -1,5 +1,5 @@ #!/bin/bash -pip install --upgrade --user --break-system-packages "conan<2.0" -pip install --upgrade --user --break-system-packages geopandas -pip install --upgrade --user --break-system-packages GitPython +pip install --upgrade --user "conan<2.0" +pip install --upgrade --user geopandas +pip install --upgrade --user GitPython conan profile new default --detect diff --git a/wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp b/wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp index 9eb47371..c2d0128e 100644 --- a/wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp +++ b/wxdata/source/scwx/provider/aws_nexrad_data_provider.cpp @@ -64,7 +64,8 @@ class AwsNexradDataProvider::Impl util::SetEnvironment("AWS_EC2_METADATA_DISABLED", "true"); Aws::Client::ClientConfiguration config; - config.region = region_; + config.region = region_; + config.connectTimeoutMs = 10000; client_ = std::make_shared(config); }