Skip to content

Commit

Permalink
Fix dependency version conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
josephbirkner committed Jul 8, 2024
1 parent 0bca753 commit 1cfee19
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 14 deletions.
22 changes: 22 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from conan import ConanFile
from conan.tools.cmake import CMakeDeps

class ZswagRecipe(ConanFile):
name = "zswag"

# Specify the generators
generators = "CMakeDeps"

# Specify options
default_options = {
"openssl*:shared": False
}

def requirements(self):
self.requires("openssl/3.2.0")
self.requires("keychain/1.3.0")
self.requires("spdlog/1.11.0")
self.requires("pybind11/2.10.4")
self.requires("zlib/1.2.13")
# keychain and libsecret have a conflict here.
self.requires("glib/2.78.3", override=True)
12 changes: 0 additions & 12 deletions conanfile.txt

This file was deleted.

1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@ connexion~=2.14.2
requests
zserio<3.0.0
pyyaml
pyzswagcl==1.7.0
openapi-spec-validator
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
long_description = fh.read()

required_url = []
required = []
required = [f"pyzswagcl=={VERSION}"]
with open("requirements.txt", "r") as freq:
for line in freq.read().split():
if "://" in line:
Expand Down

0 comments on commit 1cfee19

Please sign in to comment.