Merge pull request #146 from utilForever/codacy

Restore Codacy

Author: utilForever

.codacy.yml

@@ -0,0 +1,5 @@
+exclude_paths:
+  - "3RD-PARTY.md"
+  - "Documents/doxygen/**"
+  - "Libraries/**"
+  - "Sources/Core/Flatbuffers/generated/**"

.dockerignore

@@ -0,0 +1,2 @@
+.git
+build

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,38 +1,45 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
+title: ""
+labels: ""
+assignees: ""
 ---
 
 **Describe the bug**
+
 A clear and concise description of what the bug is.
 
 **To Reproduce**
+
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 **Expected behavior**
+
 A clear and concise description of what you expected to happen.
 
 **Screenshots**
+
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
+
+- Device: [e.g. iPhone6]
+- OS: [e.g. iOS8.1]
+- Browser [e.g. stock browser, safari]
+- Version [e.g. 22]
 
 **Additional context**
-Add any other context about the problem here.
+
+Add any other context about the problem here.

.github/workflows/docs.yml

@@ -23,7 +23,7 @@ jobs:
         popd
         mv ../../Doxygen/html ./build
     - name: Deploy
-      uses: JamesIves/github-pages-deploy-action@v4
+      uses: JamesIves/github-pages-deploy-action@d92aa235d04922e8f08b40ce78cc5442fcfbfa2f # v4
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: gh-pages

.github/workflows/ubuntu-codecov.yml

@@ -54,7 +54,7 @@ jobs:
         lcov --gcov-tool "${GCOV_TOOL}" --ignore-errors mismatch --directory build --capture --output-file build/coverage.info
         lcov --ignore-errors unused --gcov-tool "${GCOV_TOOL}" --ignore-errors mismatch --remove build/coverage.info '/usr/*' '*/Tests/*' --output-file build/coverage.info.cleaned
     - name: Upload Coverage Reports to Codecov
-      uses: codecov/codecov-action@v5
+      uses: codecov/codecov-action@04b047e8bb82a0c002c8312c1c880fbc6a999d45 # v5
       with:
         fail_ci_if_error: true
         files: ./build/coverage.info.cleaned

.github/workflows/windows-cuda.yml

@@ -69,7 +69,7 @@ jobs:
         "$cudaPath\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         & $nvccExe -V
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3
     - name: Configure Build
       shell: powershell
       run: |

.github/workflows/windows.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Configure Build
       run: mkdir build && cd build && cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_BUILD_TYPE=Release ..
     - name: Add MSBuild to PATH
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3
     - name: Build
       run: cd build && MSBuild.exe ${{ matrix.solution }} /p:Configuration=Release
     - name: Run Unit Test

Dockerfile

@@ -4,13 +4,11 @@ LABEL maintainer "Chris Ohk <utilforever@gmail.com>"
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    python3-dev \
-    python3-pip \
-    python3-venv \
-    python3-setuptools \
-    cmake \
+    build-essential=12.8ubuntu1.1 \
+    python3-dev=3.8.2-0ubuntu2 \
+    python3-pip=20.0.2-5ubuntu1.11 \
     --no-install-recommends \
+    && pip3 install --no-cache-dir cmake==3.31.6 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY . /app
@@ -21,9 +19,8 @@ RUN cmake .. && \
     make install && \
     bin/UnitTests
 
-WORKDIR /app/ENV3
-RUN pip3 install -r ../requirements.txt && \
-    pip3 install .. && \
-    python3 -m pytest ../Tests/PythonTests
+WORKDIR /app
+RUN pip3 install --no-cache-dir -r requirements.txt . && \
+    python3 -m pytest Tests/PythonTests
 
 WORKDIR /

Examples/PythonExamples/apic_example_01.py

@@ -1,4 +1,11 @@
-from pyCubbyFlow import * # lgtm [py/polluting-import]
+from pyCubbyFlow import (
+    APICSolver3,
+    Frame,
+    Logging,
+    RigidBodyCollider3,
+    Sphere3,
+    VolumeParticleEmitter3,
+)
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
@@ -14,8 +21,7 @@ def main():
 
     # Setup emitter
     sphere = Sphere3(center=(0.5, 1.0, 0.5), radius=0.15)
-    emitter = VolumeParticleEmitter3(
-        implicitSurface=sphere, spacing=1.0 / (2 * resX))
+    emitter = VolumeParticleEmitter3(implicitSurface=sphere, spacing=1.0 / (2 * resX))
     solver.particleEmitter = emitter
 
     # Setup collider
@@ -26,8 +32,10 @@ def main():
     # Visualization
     fig = plt.figure(figsize=(3, 6))
     ax = fig.add_axes([0, 0, 1, 1], frameon=False)
-    ax.set_xlim(0, 1), ax.set_xticks([])
-    ax.set_ylim(0, 2), ax.set_yticks([])
+    ax.set_xlim(0, 1)
+    ax.set_xticks([])
+    ax.set_ylim(0, 2)
+    ax.set_yticks([])
 
     # Make first frame
     frame = Frame(0, 1.0 / ANIM_FPS)
@@ -44,13 +52,14 @@ def updateFig(*args):
         frame.Advance()
         pos = np.array(solver.particleSystemData.positions, copy=False)
         scat.set_offsets(np.vstack((pos[:, 0], pos[:, 1])).transpose())
-        return scat,
+        return (scat,)
 
-    animation.FuncAnimation(fig, updateFig, frames=ANIM_NUM_FRAMES,
-                            interval=1, blit=True)
+    animation.FuncAnimation(
+        fig, updateFig, frames=ANIM_NUM_FRAMES, interval=1, blit=True
+    )
     plt.show()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     Logging.Mute()
     main()

Examples/PythonExamples/apic_example_02.py

@@ -1,4 +1,13 @@
-from pyCubbyFlow import * # lgtm [py/polluting-import]
+from pyCubbyFlow import (
+    APICSolver3,
+    FDMMGPCGSolver3,
+    Frame,
+    GridFractionalSinglePhasePressureSolver3,
+    Logging,
+    RigidBodyCollider3,
+    Sphere3,
+    VolumeParticleEmitter3,
+)
 import numpy as np
 import matplotlib.pyplot as plt
 import matplotlib.animation as animation
@@ -18,8 +27,7 @@ def main():
 
     # Setup emitter
     sphere = Sphere3(center=(0.5, 1.0, 0.5), radius=0.15)
-    emitter = VolumeParticleEmitter3(
-        implicitSurface=sphere, spacing=1.0 / (2 * resX))
+    emitter = VolumeParticleEmitter3(implicitSurface=sphere, spacing=1.0 / (2 * resX))
     solver.particleEmitter = emitter
 
     # Setup collider
@@ -30,8 +38,10 @@ def main():
     # Visualization
     fig = plt.figure(figsize=(3, 6))
     ax = fig.add_axes([0, 0, 1, 1], frameon=False)
-    ax.set_xlim(0, 1), ax.set_xticks([])
-    ax.set_ylim(0, 2), ax.set_yticks([])
+    ax.set_xlim(0, 1)
+    ax.set_xticks([])
+    ax.set_ylim(0, 2)
+    ax.set_yticks([])
 
     # Make first frame
     frame = Frame(0, 1.0 / ANIM_FPS)
@@ -48,13 +58,14 @@ def updateFig(*args):
         frame.Advance()
         pos = np.array(solver.particleSystemData.positions, copy=False)
         scat.set_offsets(np.vstack((pos[:, 0], pos[:, 1])).transpose())
-        return scat,
+        return (scat,)
 
-    animation.FuncAnimation(fig, updateFig, frames=ANIM_NUM_FRAMES,
-                            interval=1, blit=True)
+    animation.FuncAnimation(
+        fig, updateFig, frames=ANIM_NUM_FRAMES, interval=1, blit=True
+    )
     plt.show()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     Logging.Mute()
     main()