Merge remote-tracking branch 'upstream/main' into issue-73

conjure-cp · Dec 4, 2023 · a9846b1 · a9846b1
2 parents e62869d + caf52f0
commit a9846b1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -27,6 +27,6 @@ updates:
  assignees:
  - ozgurakgun
  groups:
- npm-essence-feature-usage-stats:
+ pip-essence-feature-usage-stats:
  patterns:
  - "*"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/conjure_oxide/Cargo.toml b/conjure_oxide/Cargo.toml
@@ -15,7 +15,7 @@ serde_with = "3.4.0"
 thiserror = "1.0.50"
 minion_rs = {path = "../solvers/minion" }
 anyhow = "1.0.75"
-clap = { version = "4.4.8", features = ["derive"] }
+clap = { version = "4.4.10", features = ["derive"] }
 strum_macros = "0.25.3"
 strum = "0.25.0"
 versions = "5.0.1"

diff --git a/solvers/minion/vendor b/solvers/minion/vendor
diff --git a/tools/essence-feature-usage-stats/requirements.txt b/tools/essence-feature-usage-stats/requirements.txt
@@ -4,7 +4,7 @@ charset-normalizer==3.3.2
 click==8.1.7
 gitdb==4.0.11
 GitPython==3.1.40
-idna==3.4
+idna==3.6
 Jinja2==3.1.2
 MarkupSafe==2.1.3
 mypy-extensions==1.0.0