Skip to content

Commit

Permalink
Merge pull request #233 from robinje/room-editor
Browse files Browse the repository at this point in the history
Start of Room Editor
  • Loading branch information
robinje authored Oct 17, 2024
2 parents 440b60d + bf44eca commit 5e0bc33
Show file tree
Hide file tree
Showing 14 changed files with 370 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/go-auto-format.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Go Format and Check

on:
push:
branches: [develop]
pull_request:
branches: "**"
push:
branches: [develop, qa, prod]

permissions:
pull-requests: write
Expand Down
36 changes: 36 additions & 0 deletions .github/workflows/pip-conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Check Pip Conflicts

on:
pull_request:
branches: "**"
push:
branches: [develop, qa, prod]

jobs:
check-pip-conflicts:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.10"

- name: Install pip-tools
run: pip install pip-tools

- name: Check for conflicts
run: |
exit_code=0
for file in requirements/*requirements.txt; do
echo "Checking $file for conflicts..."
if pip-compile "$file" --dry-run --output-file - > /dev/null 2>&1; then
echo "No conflicts found in $file"
else
echo "Conflicts detected in $file"
pip-compile "$file" --dry-run --output-file - || true
exit_code=1
fi
done
exit $exit_code
3 changes: 3 additions & 0 deletions .github/workflows/python-auto-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Python Autoformatting

on:
pull_request:
branches: "**"
push:
branches: [develop, qa, prod]

permissions:
pull-requests: write
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@

**/dist/


## Jupyter

**/*.ipynb_checkpoints/

# Flutter / Dart

**/.dart_tool/

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions database/data_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -326,10 +326,10 @@ def main():
- Loads data back from DynamoDB and displays it.
"""
parser = argparse.ArgumentParser(description="Load and store game data in DynamoDB.")
parser.add_argument("-r", "--rooms", default="test_rooms.json", help="Path to the Rooms JSON file.")
parser.add_argument("-e", "--exits", default="test_exits.json", help="Path to the Exits JSON file.")
parser.add_argument("-a", "--archetypes", default="test_archetypes.json", help="Path to the Archetypes JSON file.")
parser.add_argument("-p", "--prototypes", default="test_prototypes.json", help="Path to the Prototypes JSON file.")
parser.add_argument("-r", "--rooms", default="../data/test_rooms.json", help="Path to the Rooms JSON file.")
parser.add_argument("-e", "--exits", default="../data/test_exits.json", help="Path to the Exits JSON file.")
parser.add_argument("-a", "--archetypes", default="../data/test_archetypes.json", help="Path to the Archetypes JSON file.")
parser.add_argument("-p", "--prototypes", default="../data/test_prototypes.json", help="Path to the Prototypes JSON file.")
parser.add_argument("-region", default="us-east-1", help="AWS region for DynamoDB.")
args = parser.parse_args()

Expand Down
211 changes: 211 additions & 0 deletions editor/RoomEditor.ipynb

Large diffs are not rendered by default.

107 changes: 107 additions & 0 deletions requirements/editor-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
#Required
jupyter==1.1.1
networkx==3.4.1
notebook==7.2.2
numpy==2.1.2
matplotlib==3.9.2
pyyaml==6.0.2
voila==0.5.7

#Dependancies
anyio==4.6.1
argon2-cffi==23.1.0
argon2-cffi-bindings==21.2.0
arrow==1.3.0
asttokens==2.4.1
async-lru==2.0.4
attrs==24.2.0
babel==2.16.0
beautifulsoup4==4.12.3
bleach==6.1.0
certifi==2024.8.30
cffi==1.17.1
charset-normalizer==3.4.0
colorama==0.4.6
comm==0.2.2
debugpy==1.8.7
decorator==5.1.1
defusedxml==0.7.1
exceptiongroup==1.2.2
executing==2.1.0
fastjsonschema==2.20.0
fqdn==1.5.1
h11==0.14.0
httpcore==1.0.6
httpx==0.27.2
idna==3.10
ipykernel==6.29.5
ipython==8.28.0
ipywidgets==8.1.5
isoduration==20.11.0
jedi==0.19.1
jinja2==3.1.4
json5==0.9.25
jsonpointer==3.0.0
jsonschema==4.23.0
jsonschema-specifications==2023.12.1
jupyter-client==8.6.3
jupyter-console==6.6.3
jupyter-core==5.7.2
jupyter-events==0.10.0
jupyter-lsp==2.2.5
jupyter-server==2.14.2
jupyter-server-terminals==0.5.3
jupyterlab==4.2.5
jupyterlab-pygments==0.3.0
jupyterlab-server==2.27.3
jupyterlab-widgets==3.0.13
markupsafe==3.0.1
matplotlib-inline==0.1.7
mistune==3.0.2
nbclient==0.10.0
nbconvert==7.16.4
nbformat==5.10.4
nest-asyncio==1.6.0
notebook-shim==0.2.4
overrides==7.7.0
packaging==24.1
pandocfilters==1.5.1
parso==0.8.4
platformdirs==4.3.6
prometheus-client==0.21.0
prompt-toolkit==3.0.48
psutil==6.0.0
pure-eval==0.2.3
pycparser==2.22
pygments==2.18.0
python-dateutil==2.9.0.post0
python-json-logger==2.0.7
pywin32==308
pywinpty==2.0.13
pyzmq==26.2.0
referencing==0.31.1
requests==2.32.3
rfc3339-validator==0.1.4
rfc3986-validator==0.1.1
rpds-py==0.20.0
send2trash==1.8.3
setuptools==75.1.0
six==1.16.0
sniffio==1.3.1
soupsieve==2.6
stack-data==0.6.3
terminado==0.18.1
tinycss2==1.3.0
tomli==2.0.2
tornado==6.4.1
traitlets==5.14.3
types-python-dateutil==2.9.0.20241003
typing-extensions==4.12.2
uri-template==1.3.0
urllib3==2.2.3
wcwidth==0.2.13
webcolors==24.8.0
webencodings==0.5.1
websocket-client==1.8.0
websockets==13.1
widgetsnbextension==4.0.13
2 changes: 2 additions & 0 deletions requirements/scripts-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Required
PyYAML==6.0.2
boto3==1.35.40

botocore==1.35.40
s3transfer==0.10.3

0 comments on commit 5e0bc33

Please sign in to comment.