libsonata 0.2.1__tar.gz → 0.2.2__tar.gz

{libsonata-0.2.1 → libsonata-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libsonata
-Version: 0.2.1
+Version: 0.2.2
 Summary: SONATA files reader
 Author: Open Brain Institute
 License-Expression: LGPL-3.0-or-later

{libsonata-0.2.1 → libsonata-0.2.2}/src/config.cpp

@@ -1167,7 +1167,7 @@ CircuitConfig::CircuitConfig(const std::string& contents, const std::string& bas
 }
 
 CircuitConfig CircuitConfig::fromFile(const std::string& path) {
-    return {readFile(path), fs::path(path).parent_path()};
+    return {readFile(path), fs::absolute(fs::path(path)).parent_path()};
 }
 
 CircuitConfig::ConfigStatus CircuitConfig::getCircuitConfigStatus() const {
@@ -1684,7 +1684,7 @@ SimulationConfig::SimulationConfig(const std::string& content, const std::string
 }
 
 SimulationConfig SimulationConfig::fromFile(const std::string& path) {
-    return SimulationConfig(readFile(path), fs::path(path).parent_path());
+    return {readFile(path), fs::absolute(fs::path(path)).parent_path()};
 }
 
 const std::string& SimulationConfig::getBasePath() const noexcept {

{libsonata-0.2.1 → libsonata-0.2.2}/tests/test_config.cpp

@@ -8,8 +8,31 @@
 #include <bbp/sonata/config.h>
 
 #include <cstdio>
+#include <filesystem>
 #include <string>
-#include <vector>
+
+
+namespace {
+namespace fs = std::filesystem;
+class ScopedChdir {
+public:
+    explicit ScopedChdir(const fs::path& newDir)
+        : original_(fs::current_path()) {
+        fs::current_path(newDir);
+    }
+
+    ~ScopedChdir() {
+        std::error_code ec;
+        fs::current_path(original_, ec);
+    }
+
+    ScopedChdir(const ScopedChdir&) = delete;
+    ScopedChdir& operator=(const ScopedChdir&) = delete;
+
+private:
+    fs::path original_;
+};
+} // anonymous
 
 using namespace bbp::sonata;
 
@@ -23,7 +46,8 @@ bool contains(const std::string& haystack, const std::string& needle) {
 
 TEST_CASE("CircuitConfig") {
     SECTION("Simple") {
-        const auto config = CircuitConfig::fromFile("./data/config/circuit_config.json");
+        ScopedChdir chdir("data/config/");
+        const auto config = CircuitConfig::fromFile("circuit_config.json");
         CHECK(config.getNodeSetsPath()[0] == '/');  // is an absolute path
         CHECK(endswith(config.getNodeSetsPath(), "node_sets.json"));