Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .bazelversion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6.2.1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ pyvenv.cfg
*.pyc
*~
dist/
bazel-*
12 changes: 12 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package(default_visibility = ["//visibility:public"])


filegroup(
name = "libmagic_linux",
srcs = [
"libmagic.so",
"libmagic.so.1",
"libmagic.so.1.0.0",
],
visibility = ["//visibility:public"],
)
16 changes: 13 additions & 3 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "rules_foreign_cc",
sha256 = "476303bd0f1b04cc311fc258f1708a5f6ef82d3091e53fd1977fa20383425a6a",
strip_prefix = "rules_foreign_cc-0.10.1",
url = "https://github.com/bazelbuild/rules_foreign_cc/releases/download/0.10.1/rules_foreign_cc-0.10.1.tar.gz",
)

load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")

rules_foreign_cc_dependencies()

http_archive(
name = "libmagic",
name = "libmagic_macos",
sha256 = "09c588dac9cff4baa054f51a36141793bcf64926edc909594111ceae60fce4ee",
strip_prefix = "file-5.31",
urls = [
Expand All @@ -11,7 +21,7 @@ http_archive(
"./configure",
"make",
"make install",
"cp src/.libs/libmagic.dylib /usr/local/lib/libmagic.dylib",
"cp src/.libs/libmagic.dylib /usr/local/lib/libmagic.dylib || true",
],
build_file_content = """
cc_library(
Expand All @@ -21,4 +31,4 @@ cc_library(
linkstatic = 1,
visibility = ['//visibility:public'],
)""",
)
)
1 change: 1 addition & 0 deletions libmagic.so
1 change: 1 addition & 0 deletions libmagic.so.1
Binary file added libmagic.so.1.0.0
Binary file not shown.
9 changes: 5 additions & 4 deletions magic/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ py_library(
name = "loader",
srcs = ["loader.py", "__init__.py"],
imports = [".."],
data = [
"@libmagic//:libmagic",
],
data = select({
"@platforms//os:linux": ["//:libmagic_linux"],
"@platforms//os:osx": [], # does not support macos for hermetic(?) build
}),
visibility = ["//visibility:public"],
)

Expand All @@ -16,4 +17,4 @@ py_library(
":loader",
],
visibility = ["//visibility:public"],
)
)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def read(file_name):
long_description_content_type='text/markdown',
packages=['magic'],
package_data={
'magic': ['py.typed', '*.pyi', '**/*.pyi'],
'magic': ['py.typed', '*.pyi', '**/*.pyi', '**/BUILD.bazel', 'WORKSPACE', 'libmagic.so*'],
},
keywords="mime magic file",
license="MIT",
Expand Down
8 changes: 4 additions & 4 deletions test/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ py_test(
"//magic:compat",
],
data = [
"testdata"
]
"testdata",
],
)

py_test(
Expand All @@ -16,6 +16,6 @@ py_test(
"//magic:compat",
],
data = [
"testdata"
"testdata",
]
)
)