Skip to content

Commit

Permalink
Merge pull request #198 from pyocd/bugfix
Browse files Browse the repository at this point in the history
Multiple bug fixes
  • Loading branch information
flit authored Dec 22, 2022
2 parents d745221 + 5d6bcbf commit 8767e76
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }}
key: ${{ runner.os }}-py${{ matrix.python-version }}-${{ hashFiles('**/setup.cfg') }}
restore-keys: |
${{ runner.os }}-py${{ matrix.python-version }}-
- name: Install Rust
Expand Down
192 changes: 27 additions & 165 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "cmsis-pack-manager"
version = "0.5.0"
version = "0.5.1"
authors = ["Jimmy Brisson <[email protected]>",
"Chris Reed <[email protected]>",
"Mathias Brossard <[email protected]>"]
Expand All @@ -17,7 +17,7 @@ crate-type = ["cdylib"]
[dependencies]
ctor = "0.1.15"
log = "0.4.8"
simplelog = "0.10.0"
simplelog = { version = "0.12.0", default-features = false, features = [ "termcolor" ] }
cmsis-pack = { version = "0.6.0", path = "rust/cmsis-pack" }
anyhow = { version = "1.0.56", features = ["backtrace"] }

Expand Down
2 changes: 1 addition & 1 deletion rust/cmsis-cffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ crate-type = ["cdylib"]
[dependencies]
ctor = "0.1.15"
log = "0.4.8"
simplelog = "0.10.0"
simplelog = { version = "0.12.0", default-features = false, features = [ "termcolor" ] }
cmsis-pack = { version = "0.6.0", path = "../cmsis-pack" }
anyhow = { version = "1.0.56", features = ["backtrace"] }

Expand Down
2 changes: 1 addition & 1 deletion rust/cmsis-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ path = "src/main.rs"
directories = "4"
clap = "2.33.1"
log = "0.4.8"
simplelog = "0.10.0"
simplelog = { version = "0.12.0", default-features = false, features = [ "termcolor" ] }
pbr = "^1.0.0"
cmsis-pack = { version = "0.6.0", path = "../cmsis-pack" }
anyhow = "1.0.56"
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ classifiers =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Topic :: Software Development
Topic :: Software Development :: Debuggers
Topic :: Software Development :: Embedded Systems
Expand All @@ -36,7 +37,6 @@ project_urls =
packages = find:
install_requires =
appdirs>=1.4,<2.0
milksnake>=0.1.5,<1.0
pyyaml>=6.0,<7.0
python_requires = >=3.6
include_package_data = True
Expand Down

0 comments on commit 8767e76

Please sign in to comment.