Skip to content

Commit

Permalink
SonarCloud warnings and more dependabot
Browse files Browse the repository at this point in the history
Pipfile.lock
setup.py

From dependabot:

- tqdm 4.66.2 to 4.66.3
- idna 3.6 to 3.7

packages/base3/Dockerfile
packages/conan/recipes/clang/conanfile.py
packages/conan/recipes/python/conanfile.py

Fix SonarCloud flagged warnings

Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
  • Loading branch information
jfpanisset committed Sep 16, 2024
1 parent 74fce78 commit 7747981
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 21 deletions.
24 changes: 12 additions & 12 deletions Pipfile.lock

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

8 changes: 4 additions & 4 deletions packages/base3/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ ARG ASWF_QT_VERSION
ARG ASWF_VFXPLATFORM_VERSION

# Required base packages built in previous stages
FROM ${ASWF_ORG}/ci-package-qt:${ASWF_VFXPLATFORM_VERSION}-${ASWF_QT_VERSION} as ci-package-qt-external
FROM ${ASWF_ORG}/ci-package-qt:${ASWF_VFXPLATFORM_VERSION}-${ASWF_QT_VERSION} AS ci-package-qt-external


#################### ci-baseos-gl-packages ####################
FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} as ci-baseos-gl-packages
FROM ${ASWF_ORG}/ci-common:${CI_COMMON_VERSION}-clang${ASWF_CLANG_MAJOR_VERSION} AS ci-baseos-gl-packages

ARG ASWF_CMAKE_VERSION
ARG ASWF_PKG_ORG
Expand Down Expand Up @@ -53,7 +53,7 @@ ENV DOWNLOADS_DIR=/tmp/downloads \


#################### ci-pyside-builder ####################
FROM ci-baseos-gl-packages as ci-pyside-builder
FROM ci-baseos-gl-packages AS ci-pyside-builder

ARG ASWF_PYTHON_VERSION
ARG ASWF_PYSIDE_VERSION
Expand Down Expand Up @@ -100,7 +100,7 @@ RUN --mount=type=cache,target=/tmp/ccache \


#################### ci-package-pyside ####################
FROM scratch as ci-package-pyside
FROM scratch AS ci-package-pyside

ARG ASWF_ORG
ARG CI_COMMON_VERSION
Expand Down
2 changes: 0 additions & 2 deletions packages/conan/recipes/clang/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,12 @@ def generate(self):
tc.variables["LLVM_TOOL_LLVM_MC_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_NM_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_OBJDUMP_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_BCANALYZER_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_PROFDATA_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_RTDYLD_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_SIZE_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_SPLIT_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_STRESS_BUILD"] = False
tc.variables["LLVM_TOOL_LLVM_SYMBOLIZER_BUILD"] = True
tc.variables["LLVM_TOOL_LLVM_LTO_BUILD"] = False
tc.variables["LLVM_INCLUDE_EXAMPLES"] = False
tc.variables["CMAKE_SKIP_RPATH"] = True
tc.variables["LLVM_ENABLE_PROJECTS"] = self.options.components
Expand Down
2 changes: 1 addition & 1 deletion packages/conan/recipes/python/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def package(self):
)

py_exe = os.path.join(self.package_folder, "bin", f"python{self.major_minor}")
py_exe_nover = os.path.join(self.package_folder, "bin", f"python")
py_exe_nover = os.path.join(self.package_folder, "bin", "python")
self.run(f"ln -s {py_exe} {py_exe_nover}")

with tools.environment_append(
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"deprecated==1.2.14; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'",
"distro==1.8.0; sys_platform == 'linux' or sys_platform == 'linux2'",
"fasteners==0.19; python_version >= '3.7'",
"idna==3.6; python_version >= '3'",
"idna==3.7; python_version >= '3'",
"importlib-resources==5.12.0", # above this drops 3.7
"jinja2==3.1.3",
"markupsafe==2.1.5; python_version >= '3.7'",
Expand All @@ -49,7 +49,7 @@
"requests==2.31.0",
"six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'",
"typing_extensions==4.7.1; python_version >= '3.7'",
"tqdm==4.66.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'",
"tqdm==4.66.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'",
"urllib3==1.26.19; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'", # capped by conan
"wrapt==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'",
"zipp==3.19.1; python_version < '3.10'",
Expand Down

0 comments on commit 7747981

Please sign in to comment.