Use gi.require_version before import and make pygobject the last import

.github/workflows/ci.yml

@@ -88,7 +88,7 @@ jobs:
     concurrency:
       group: ${{ github.ref }}
       cancel-in-progress: true
-    if: success()
+    if: success() && github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v4
 

flat-manager-client

@@ -29,19 +29,19 @@ import traceback
 from argparse import ArgumentParser
 from functools import reduce
 from urllib.parse import urljoin, urlparse, urlunparse
-
-import aiohttp
-import aiohttp.client_exceptions
-import gi
-from gi.repository import Gio, GLib, OSTree
 from tenacity import (
     retry,
     retry_if_exception_type,
     stop_after_delay,
     wait_random_exponential,
 )
 
+import aiohttp
+import aiohttp.client_exceptions
+import gi
+
 gi.require_version("OSTree", "1.0")
+from gi.repository import Gio, GLib, OSTree  # noqa: E402
 
 UPLOAD_CHUNK_LIMIT = 4 * 1024 * 1024
 DEFAULT_LIMIT = 2**16

src/app.rs

@@ -27,7 +27,7 @@ fn load_gpg_key(
         Some(gpg_key) => {
             let mut cmd = Command::new("gpg2");
             if let Some(gpg_homedir) = maybe_gpg_homedir {
-                cmd.arg(&format!("--homedir={gpg_homedir}"));
+                cmd.arg(format!("--homedir={gpg_homedir}"));
             }
             cmd.arg("--export").arg(gpg_key);
 

src/jobs/commit_job.rs

@@ -154,7 +154,7 @@ impl CommitJobInstance {
         for appstream_ref in appstream_refs {
             let arch = appstream_ref.split('/').nth(1).unwrap();
             let mut cmd = Command::new("ostree");
-            cmd.arg(&format!("--repo={}", &build_repo_path.to_str().unwrap()))
+            cmd.arg(format!("--repo={}", &build_repo_path.to_str().unwrap()))
                 .arg("checkout")
                 .arg("--user-mode")
                 .arg("--union")

src/jobs/publish_job.rs

@@ -127,7 +127,7 @@ impl PublishJobInstance {
                     &format!("extracting {}", build_ref.ref_name),
                 );
                 let mut cmd = Command::new("ostree");
-                cmd.arg(&format!("--repo={}", &build_repo_path.to_str().unwrap()))
+                cmd.arg(format!("--repo={}", &build_repo_path.to_str().unwrap()))
                     .arg("checkout")
                     .arg("--user-mode")
                     .arg("--bareuseronly-dirs")

src/jobs/republish_job.rs

@@ -113,14 +113,14 @@ impl JobInstance for RepublishJobInstance {
                 .arg("--no-update-summary")
                 .arg("--disable-fsync"); // No need for fsync in intermediate steps
 
-            cmd.arg(&format!(
+            cmd.arg(format!(
                 "--src-repo={}",
                 repoconfig
                     .get_abs_repo_path()
                     .to_str()
                     .expect("repo paths should be valid unicode")
             ))
-            .arg(&format!("--src-ref={ref_name}"))
+            .arg(format!("--src-ref={ref_name}"))
             .arg(tmp_repo_dir.path())
             .arg(&ref_name);
 

src/jobs/update_repo_job.rs

@@ -240,7 +240,7 @@ impl UpdateRepoJobInstance {
         for appstream_ref in appstream_refs {
             let arch = appstream_ref.split('/').nth(1).unwrap();
             let mut cmd = Command::new("ostree");
-            cmd.arg(&format!("--repo={}", &repoconfig.path.to_str().unwrap()))
+            cmd.arg(format!("--repo={}", &repoconfig.path.to_str().unwrap()))
                 .arg("checkout")
                 .arg("--user-mode")
                 .arg("--union")

src/logger.rs

@@ -109,11 +109,7 @@ where
         };
 
         let user_agent = if let Some(val) = req.headers().get("User-Agent") {
-            if let Ok(s) = val.to_str() {
-                s
-            } else {
-                "-"
-            }
+            val.to_str().unwrap_or("-")
         } else {
             "-"
         }

src/ostree.rs

@@ -956,9 +956,9 @@ pub fn pull_commit_async(
             });
         }
 
-        cmd.arg(&format!("--repo={}", &repo_path.to_str().unwrap()))
+        cmd.arg(format!("--repo={}", &repo_path.to_str().unwrap()))
             .arg("pull")
-            .arg(&format!("--url={url}"))
+            .arg(format!("--url={url}"))
             .arg("upstream")
             .arg(&commit);
 
@@ -1060,7 +1060,7 @@ pub fn prune_async(repo_path: &Path) -> Box<dyn Future<Item = (), Error = Ostree
     }
 
     cmd.arg("prune")
-        .arg(&format!("--repo={}", repo_path.to_string_lossy()))
+        .arg(format!("--repo={}", repo_path.to_string_lossy()))
         .arg("--keep-younger-than=3 days ago");
 
     Box::new(