Remove pygame code (fixes #186) #219

Ditti4 · 2017-10-20T21:33:52Z

The commits in this pull request will (hopefully) remove all the pygame-related code, including all the rendering code and hopefully leaving no unused code behind, like it was requested in #186.

If you happen to find anything that you don't agree with or that you'd like me to change, just let me know. :)

nirs · 2017-10-20T21:38:02Z

@Ditti4, thanks for your contribution!

nirs

@Ditti4 Thanks!

nirs · 2017-10-20T21:43:14Z

rose/client/finish.py

@@ -11,16 +10,5 @@ def __init__(self):

    # Component interface

-    def init(self):
-        self.texture = pygame.image.load(config.finish_line_png)
-
    def update(self, info):
        self.timeleft = info["timeleft"]


This is used only for rendering, I think we can remove the entire module.

nirs · 2017-10-20T21:44:48Z

rose/client/dashboard.py

@@ -18,31 +17,6 @@ def __init__(self):
        self.players = {}
        self.timeleft = config.game_duration

-    def init(self):
-        self.texture = pygame.image.load(config.dashboard_png)
-
    def update(self, players, timeleft):
        self.timeleft = timeleft
        self.players = players


The dashboard is used only for rendering, we can remove the entire module.

nirs · 2017-10-20T21:47:41Z

rose/client/game.py

-            car.init()
-        self.finish_line.init()
-        self.draw(self.surface)
-
    def update(self, info):
        self.track.update(info)
        self.players = {p["name"]: p for p in info['players']}
        self.dashboard.update(self.players, info["timeleft"])


Can be removed

nirs · 2017-10-20T21:47:53Z

rose/client/game.py

-            car.init()
-        self.finish_line.init()
-        self.draw(self.surface)
-
    def update(self, info):
        self.track.update(info)
        self.players = {p["name"]: p for p in info['players']}
        self.dashboard.update(self.players, info["timeleft"])
        for player in self.players.itervalues():
            self.cars[player['car']].update(player)
        self.finish_line.update(info)


Can be removed

Ditti4 · 2017-10-20T22:01:20Z

Removing those two modules seems to have worked pretty well. I must've overlooked that those weren't used anymore. Sorry about that and thanks for pointing it out!

nirs · 2017-10-20T22:05:52Z

rose/common/config.py

 number_of_cars = 4
-car_jitter = 10
-play_sound = True


The "Dashboard", "Finish line", and "Window" are also not needed now.

The the "Files" section, we can remove the paths to the various resources (e.g. obstables_dir). I think the server is using only the install_dir to serve the resources.

The the "Files" section, we can remove the paths to the various resources (e.g. obstables_dir). I think the server is using only the install_dir to serve the resources.

Yup, just tried that. Only keeping the install_dir (well, and web_root and res_root) seems to work. I wasn't sure about removing that first so I kept it in. Thanks!

nirs

Nice!

nirs

Looks good

nirs · 2017-10-20T22:09:25Z

requirements.txt

@@ -1,5 +1,4 @@
 autobahn
-pygame


We introduced duplication when adding the pipenv configuration. Note to self: open an issue for generating the requirements file from pipenv.

nirs

Looks good

nirs · 2017-10-20T22:13:53Z

@Ditti4, Removing the rest of the unused configuration, it looks ready.

nirs · 2017-10-20T22:24:02Z

@Ditti4 but testing show that moving error to server package is incorrect - it is used by common/message. We need to move it back to common.

$ ./rose-server 
Traceback (most recent call last):
  File "./rose-server", line 3, in <module>
    from rose.server import main
  File "/home/nsoffer/src/rose/rose/server/main.py", line 9, in <module>
    from . import game, net
  File "/home/nsoffer/src/rose/rose/server/game.py", line 5, in <module>
    from rose.common import config, message, obstacles
  File "/home/nsoffer/src/rose/rose/common/message.py", line 2, in <module>
    from rose.common import error
ImportError: cannot import name error

$ ./rose-client examples/none.py 
Traceback (most recent call last):
  File "./rose-client", line 3, in <module>
    from rose.client import main
  File "/home/nsoffer/src/rose/rose/client/main.py", line 6, in <module>
    from rose.common import config, message
  File "/home/nsoffer/src/rose/rose/common/message.py", line 2, in <module>
    from rose.common import error
ImportError: cannot import name error

Unfortunately testing coverage is very low, so you must run both server and clients to check that everything still work.

start the server
in another shell, start a client with exampes/none.py
in another shell, start a client with examples/random_driver.py
open a browser at http://localhost:8880/
Start a game

Thanks!

Ditti4 · 2017-10-20T22:30:20Z

Surprisingly enough, I followed those exact steps before every push. Looking at my local code base though, I can still see error.pyc in the common directory, so python must've used that one, ignoring the fact that the original .py file does not exist anymore.

Ditti4 · 2017-10-20T22:37:54Z

Hmm, the examples still use the actions module. Should we move that back as well, considering it's not only used by the server this way either?

nirs · 2017-10-20T22:43:29Z

@Ditti4 Right, the actions module is used by the driver code, we need to keep this module in the common package as well.

For another PR: It would be nice to write a test for client code loading a driver module, detecting such issues.

nirs · 2017-10-20T22:45:30Z

@Ditti4 useful way to avoid stale pyc files issue is to clean your tree before testing:

git clean -dxf

Note that it will delete anything which which git does not know about, including temporary files you may have created ;-)

Ditti4 · 2017-10-20T22:47:23Z

Do you mind if I go ahead and just remove the previous commit (which moved the two modules) using a rebase so the history gets cleaned up a little or would you prefer a revert?

nirs · 2017-10-20T23:21:16Z

@Ditti4 I like clean history. Best remove the commit using "git rebase -i" and push again using --force. I would like to rebase and merge the commits, without squashing them.

Ditti4 · 2017-10-21T07:17:14Z

@nirs Should I also mark the two commits removing more modules and more config options as fixups of their original commits or do you want me to keep those separate?

Locally I currently have them marked as fixup so we end up with total amount of three commits.

nirs · 2017-10-21T11:35:27Z

@Ditti4 yes, fixing the original commit instead of adding patches is preferred.

Ditti4 · 2017-10-21T12:41:29Z

Then there you go, all fixed up and hopefully final. Thanks for your guidance! :)

nirs · 2017-10-21T13:36:04Z

@Ditti4 thanks for this fine work!

Would you like to try a more interesting and much harder task? see #177

Some imports and instance variables are not needed now in the client package, after pygame was removed in RedHat-Israel#219.

Some imports and instance variables are not needed now in the client package, after pygame was removed in #219.

nirs requested review from nirs and rollandf October 20, 2017 21:36

nirs requested changes Oct 20, 2017

View reviewed changes

nirs reviewed Oct 20, 2017

View reviewed changes

Ditti4 added 3 commits October 21, 2017 01:00

Remove rendering-related code in client

e6159e7

Remove config options used only by the client

a78af3b

Remove pygame dependency

adbaf01

nirs added the hacktoberfest label Oct 21, 2017

nirs approved these changes Oct 21, 2017

View reviewed changes

nirs merged commit fdd8726 into RedHat-Israel:master Oct 21, 2017

nirs mentioned this pull request Oct 21, 2017

Remove pygame code #186

Closed

nirs mentioned this pull request Oct 21, 2017

fixed pep8/flake8 errors and enabled flake8 in travis-ci #223

Closed

nirs added a commit to nirs/ROSE that referenced this pull request Oct 21, 2017

Remove last traces of pygame

54aaa6c

Some imports and instance variables are not needed now in the client package, after pygame was removed in RedHat-Israel#219.

nirs mentioned this pull request Oct 21, 2017

Remove last traces of pygame #227

Merged

nirs added a commit that referenced this pull request Oct 21, 2017

Remove last traces of pygame

309ce85

Some imports and instance variables are not needed now in the client package, after pygame was removed in #219.

nirs mentioned this pull request Oct 21, 2017

replaced the prints with logs (rose/client - rose/common) #225

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove pygame code (fixes #186) #219

Remove pygame code (fixes #186) #219

Ditti4 commented Oct 20, 2017

nirs commented Oct 20, 2017

nirs left a comment

nirs Oct 20, 2017

nirs Oct 20, 2017

nirs Oct 20, 2017

nirs Oct 20, 2017

Ditti4 commented Oct 20, 2017

nirs Oct 20, 2017

Ditti4 Oct 20, 2017

nirs left a comment

nirs left a comment

nirs Oct 20, 2017

nirs left a comment

nirs commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 20, 2017 •

edited

Loading

Ditti4 commented Oct 20, 2017 •

edited

Loading

nirs commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 21, 2017

nirs commented Oct 21, 2017

Ditti4 commented Oct 21, 2017

nirs commented Oct 21, 2017

Remove pygame code (fixes #186) #219

Remove pygame code (fixes #186) #219

Conversation

Ditti4 commented Oct 20, 2017

nirs commented Oct 20, 2017

nirs left a comment

Choose a reason for hiding this comment

nirs Oct 20, 2017

Choose a reason for hiding this comment

nirs Oct 20, 2017

Choose a reason for hiding this comment

nirs Oct 20, 2017

Choose a reason for hiding this comment

nirs Oct 20, 2017

Choose a reason for hiding this comment

Ditti4 commented Oct 20, 2017

nirs Oct 20, 2017

Choose a reason for hiding this comment

Ditti4 Oct 20, 2017

Choose a reason for hiding this comment

nirs left a comment

Choose a reason for hiding this comment

nirs left a comment

Choose a reason for hiding this comment

nirs Oct 20, 2017

Choose a reason for hiding this comment

nirs left a comment

Choose a reason for hiding this comment

nirs commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 20, 2017 • edited Loading

Ditti4 commented Oct 20, 2017 • edited Loading

nirs commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 20, 2017

nirs commented Oct 20, 2017

Ditti4 commented Oct 21, 2017

nirs commented Oct 21, 2017

Ditti4 commented Oct 21, 2017

nirs commented Oct 21, 2017

Ditti4 commented Oct 20, 2017 •

edited

Loading

Ditti4 commented Oct 20, 2017 •

edited

Loading