Merge pull request #136 from stm32-rs/python39

bump python to 3.9

Author: burrbull

.github/workflows/ci.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.9
       - name: Install svdtools
         run: |
           python -m pip install --upgrade pip
@@ -54,7 +54,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.9
       - name: Install svdtools
         run: |
           python -m pip install --upgrade pip

CHANGELOG-python.md

@@ -5,6 +5,8 @@ This changelog tracks the Python `svdtools` project. See
 
 ## [Unreleased]
 
+* Bump python to 3.9 to fix CI
+
 ## [v0.1.25] 2022-09-04
 
 * Fix bug in deriving registers (#124)

pyproject.toml

@@ -10,7 +10,7 @@ author-email = "[email protected]"
 maintainer = "Nicolas Stalder"
 maintainer-email = "[email protected]"
 home-page = "https://github.com/stm32-rs/svdtools"
-requires-python = ">=3.6"
+requires-python = ">=3.9"
 description-file = "README.md"
 requires = [
   "click ~= 8.0",
@@ -24,8 +24,7 @@ classifiers=[
     "Intended Audience :: Developers",
     "Intended Audience :: End Users/Desktop",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.9",
 ]
 
 [tool.flit.scripts]

src/interrupts/interrupts_cli.rs

@@ -42,5 +42,5 @@ fn print_interrupts(interrupt_list: &[InterruptWithPeriph]) {
 fn print_gaps(gaps: &[u32]) {
     let gaps: Vec<String> = gaps.iter().map(|g| g.to_string()).collect();
     let gaps_str = gaps.join(", ");
-    println!("Gaps: {}", gaps_str);
+    println!("Gaps: {gaps_str}");
 }

src/makedeps/makedeps_cli.rs

@@ -15,7 +15,7 @@ fn write_to_file(file: &mut File, string_to_write: &str) -> Result<()> {
 
 fn write_file(file_name: &Path, deps: Vec<PathBuf>) -> Result<()> {
     // Open a file in write-only mode
-    let mut file = File::create(&file_name)?;
+    let mut file = File::create(file_name)?;
 
     let file_name = format!("{}:", file_name.file_name().unwrap().to_str().unwrap());
     write_to_file(&mut file, &file_name)?;

src/mmap/mmap_cli.rs

@@ -14,7 +14,7 @@ pub fn parse_device(svd_file: &Path) -> Result<()> {
             Err(e).with_context(|| format!("Parsing {path_str}"))
         }
         Ok(text) => {
-            println!("{}", text);
+            println!("{text}");
             Ok(())
         }
     }

src/patch/mod.rs

@@ -128,7 +128,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                 if let Entry::Occupied(mut e) = parent.entry(key.clone()) {
                     match e.get_mut() {
                         el if el == val => {
-                            println!("In {:?}: dublicate rule {:?}, ignored", key, val);
+                            println!("In {key:?}: dublicate rule {val:?}, ignored");
                         }
                         Yaml::Array(a) => match val {
                             Yaml::Array(val) => {
@@ -138,7 +138,7 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                                 if !a.contains(val) {
                                     a.push(val.clone());
                                 } else {
-                                    println!("In {:?}: dublicate rule {:?}, ignored", key, val);
+                                    println!("In {key:?}: dublicate rule {val:?}, ignored");
                                 }
                             }
                             _ => {}
@@ -153,14 +153,11 @@ fn update_dict(parent: &mut Hash, child: &Hash) -> Result<()> {
                                     a.insert(0, s.clone());
                                     e.insert(Yaml::Array(a));
                                 } else {
-                                    println!("In {:?}: dublicate rule {:?}, ignored", key, s);
+                                    println!("In {key:?}: dublicate rule {s:?}, ignored");
                                 }
                             }
                             s2 if matches!(s2, Yaml::String(_)) => {
-                                println!(
-                                    "In {:?}: conflicting rules {:?} and {:?}, ignored",
-                                    key, s, s2
-                                );
+                                println!("In {key:?}: conflicting rules {s:?} and {s2:?}, ignored");
                             }
                             _ => {}
                         },