Skip to content

Commit

Permalink
C-002 solution implementation (#896)
Browse files Browse the repository at this point in the history
* Added RestrictedPython and restricted globals to compile avatar code in restricted manner.

* No longer updates code at every turn

* Moved restricted code to separate file.

* Revert "Moved restricted code to separate file."

This reverts commit e1b6475.

* Cleaned up comments and logs.

* Removed additional unused imports.

* Added actions to globals and cleaned up other globals

* Added regex to clean logs of unwanted warnings.

* Added Avatar in module dict straight away to fix delayed turn issue.

* Enables use of += and other similar operations

* Removed broken regex

* Fixed tests

* Removed imports from avatar examples

* Added tests

* Try fixing tests on travis

* Try fixing tests on travis part 2

* Re-update pipfile package name

* Check to see if RestrictedPython in setup.py causes an issue

* Update class definition

* Added builtins import for future Python 3

* CodeClimate

* Revert "Enables use of += and other similar operations"

* Made tests format consistent

* Re-added RestrictedPython to dependencies

* Bumped up version

* Removed tests from CodeClimate exclude and renamed avatar file
  • Loading branch information
faucomte97 committed Nov 20, 2018
1 parent db89ac5 commit 8abaabc
Show file tree
Hide file tree
Showing 13 changed files with 248 additions and 178 deletions.
1 change: 1 addition & 0 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ exclude_patterns:
- "game/_version.py"
- "versioneer.py"
- "game_frontend/djangoBundler.js"
- "aimmo/avatar_examples/**"
3 changes: 2 additions & 1 deletion aimmo-game-worker/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ name = "pypi"

[packages]
kubernetes = "*"
aimmo-game-creator = {editable = true, path = "."}
aimmo-game-worker = {editable = true, path = "."}
restrictedpython = "==4.0.b7"

[requires]
python_version = "2.7"
163 changes: 99 additions & 64 deletions aimmo-game-worker/Pipfile.lock

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

Loading

0 comments on commit 8abaabc

Please sign in to comment.