Skip to content

Commit

Permalink
Updated dependencies.
Browse files Browse the repository at this point in the history
Reverted the change to start_menu.py which caused the buttons to not appear.

Stopped running the Python tests on ubuntu-latest for now due to the EGL bug. This will be fixed at a later date.

Fixed the bug where CodeQL does not scan binding.cpp by manually compiling instead of using autobuild.
  • Loading branch information
JackAshwell11 committed Jan 7, 2024
1 parent bc9921c commit bc4566f
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 31 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ jobs:
with:
languages: ${{ matrix.language }}
setup-python-dependencies: false
- name: Autobuild C++
- name: Set up CMake
if: matrix.language == 'cpp'
uses: github/codeql-action/[email protected]
with:
working-directory: ${{ github.workspace }}/src/hades_extensions
uses: lukka/[email protected]
- name: Build CMake
if: matrix.language == 'cpp'
working-directory: ${{ github.workspace }}/src/hades_extensions
run: cmake . --preset Debug && cmake --build build-debug
- name: Perform CodeQL analysis
uses: github/codeql-action/[email protected]
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [windows-latest]
# TODO: Figure out why EGL isn't working on ubuntu
# os: [ubuntu-latest, windows-latest]
python-version: ["3.11", "3.12"]
steps:
- name: Checkout repository
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
hooks:
- id: ssort
- repo: "https://github.com/charliermarsh/ruff-pre-commit"
rev: v0.1.9
rev: v0.1.11
hooks:
- id: ruff
args: ["--fix", "--exit-non-zero-on-fix"]
Expand Down
38 changes: 19 additions & 19 deletions poetry.lock

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

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pytest-icdiff = "0.9"
pytest-instafail = "0.5.0"
pytest-randomly = "3.15.0"
pytest-sugar = "0.9.7"
ruff = "0.1.9"
ruff = "0.1.11"
ssort = "v0.12.0"
tox = "4.11.4"

Expand Down
1 change: 0 additions & 1 deletion src/hades/views/game.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@

# TODO: Add player attacking enemy (so switching and attacking). Will require components
# and indicator bars too
# TODO: Moving the physics engine to C++ would massively help, but needs a lot of work


class Game(View):
Expand Down
6 changes: 2 additions & 4 deletions src/hades/views/start_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,8 @@ def __init__(self: StartMenu) -> None:

# Create the buttons
vertical_box = UIBoxLayout(space_between=20)
start_button, quit_button = (
UIFlatButton(text="Start Game", width=200),
UIFlatButton(text="Quit Game", width=200),
)
start_button = vertical_box.add(UIFlatButton(text="Start Game", width=200))
quit_button = vertical_box.add(UIFlatButton(text="Quit Game", width=200))
start_button.on_click = start_on_click_handler
quit_button.on_click = lambda _: arcade.exit()

Expand Down
2 changes: 2 additions & 0 deletions src/hades/window.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,5 @@ def main() -> None:
# TODO: Start thinking about how to refactor the game (maybe move to pygam or some other
# library or other methods). Could move events to c++ and/or move physics system to
# box2d or chipmunk among other stuff
# TODO: Moving the physics engine to C++ (chipmunk) would massively help, but needs a
# lot of work, e.g. the bullets, hitboxes, collisions, etc

0 comments on commit bc4566f

Please sign in to comment.