build 64469 support

.travis.yml

@@ -2,13 +2,18 @@ language: python
 python:
  - 2.6
  - 2.7
- - 3.2
- - 3.3
+ - 3.4
+ - 3.6
  - pypy
 install:
  - python setup.py develop
- - pip install coveralls
+ - pip install coveralls hacking
  - mkdir local_cache
+before_script:
+    # stop the build if there are Python syntax errors or undefined names
+    - time flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    # exit-zero treats all errors as warnings.  The GitHub editor is 127 chars wide
+    - time flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 script:
  - SC2READER_CACHE_DIR=local_cache coverage run --source=sc2reader test_replays/test_all.py
  - SC2READER_CACHE_DIR=local_cache coverage run --source=sc2reader --append test_s2gs/test_all.py

CHANGELOG.rst

@@ -1,8 +1,11 @@
 CHANGELOG
 ============
 
+0.8.0 -
+---------------------------
+* Merged into ggtracker/sc2reader, which mostly means that we have a bunch of parsing fixes.  Thanks @StoicLoofah!
 
-0.6.5 - December ?? 2013
+0.7.0 -
 ---------------------------
 
 * Deprecated unit.killed_by in favor of unit.killing_player
@@ -17,6 +20,27 @@ CHANGELOG
 * Removed the defunct replay.player_names attribute.
 * Removed the defunct replay.events_by_type attribute.
 * Removed the defunct replay.other_people attribute.
+* Replays can now be pickled and stored for later consumption.
+* All references to the gateway attribute have been replaced in favor of region; e.g. replay.region
+* Use generic UnitType and Ability classes for data. This means no more unit._type_class.__class__.__name__. But hopefully people were not doing that anyway.
+* Now a CorruptTrackerFileError is raised when the tracker file is corrupted (generally only older resume_from_replay replays)
+* Added replay.resume_from_replay flag. See replay.resume_user_info for additional info.
+* PacketEvent is now ProgressEvent.
+* SetToHotkeyEvent is now SetControlGroupEvent.
+* AddToHotkeyEvent is now AddToControlGroupEvent.
+* GetFromHotkeyEvent is now GetControlGroupEvent.
+* PlayerAbilityEvent is no longer part of the event hierarchy.
+* AbilityEvent doubled as both an abstract and concrete class (very bad, see #160). Now split into:
+   * AbilityEvent is now CommandEvent
+   * AbilityEvent is now BasicCommandEvent
+* TargetAbilityEvent is now TargetUnitCommandEvent
+* LocationAbilityEvent is now TargetPointCommandEvent
+* SelfAbilityEvent is now DataCommandEvent
+* Removed the defunct replay.player_names attribute.
+* Removed the defunct replay.events_by_type attribute.
+* Removed the defunct replay.other_people attribute.
+
+* event.name is no longer a class property; it can only be accessed from an event instance.
 * PingEvents now have new attributes:
    * event.to_all - true if ping seen by all
    * event.to_allies - true if ping seen by allies
@@ -28,7 +52,7 @@ CHANGELOG
 ---------------------------
 
 * Fix bug in code for logging errors.
-* Fix siege tank supply count
+* Fix siege tank supply count.
 * Small improvements to message.events parsing.
 
 0.6.3 - September 15th 2013

CONTRIBUTORS.txt

@@ -1,8 +1,10 @@
-Author and Maintainer:
+Maintainer:
+    David Joerg - @dsjoerg on github
+
+Author:
     Graylin Kim - graylinkim @ github
 
 Contributors:
-    David Joerg - @dsjoerg on github
     Alexander Hanhikoski - @alexhanh on github
     Bas Peschier (fizzgig) - @bpeschier on github
     Jason Dana - @sheutka on github

README.rst

@@ -268,9 +268,7 @@ To run the tests just use::
 
 When repeatedly running tests it can be very helpful to make sure you've set a local cache directory to prevent long fetch times from battle.net::
 
-    export SC2READER_CACHE_DIR=local_cache
-    # or
-    SC2READER_CACHE_DIR=local_cache python test_replays/test_all.py
+    SC2READER_CACHE_DIR=local_cache PYTHONPATH=. python -m unittest test_replays.test_all
 
 To run just one test:
 

circle.yml

@@ -0,0 +1,27 @@
+machine:
+  post:
+    - pyenv global 2.7.12 3.6.2
+dependencies:
+  pre:
+    - pip install --upgrade pip
+    - pip3 install --upgrade pip
+    - pip install hacking
+    - pip3 install hacking
+general:
+  branches:
+    ignore:
+      - ggmaster
+      - hots
+      - jonomon
+      - master
+      - old_master
+test:
+  override:
+    - python2.7 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    - python2.7 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - python2.7 -m python -m unittest discover test_replays
+    - python2.7 -m python -m unittest discover test_s2gs
+    - python3.6 -m flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+    - python3.6 -m flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - python3.6 -m python -m unittest discover test_replays
+    - python3.6 -m python -m unittest discover test_s2gs

docs/source/articles/whatsinareplay.rst

@@ -41,7 +41,7 @@ This file was introduced in 2.0.4 and is unncessary for the Starcraft II to repr
 What isn't in a replay?
 --------------------------
 
-Replays are specifically designed to only include data essential to recreate the game. Game state is not recorded because the game engine can recreate it based off the other information. That means no player resource counts, colleciton rates, supply values, vision, unit positions, unit deaths, etc. Information that you are super interested in probably is not directly recorded. Fortunately since 2.0.4 tracker events now record some of this information; prior to that patch we had to run our own simulations to guess at most of the data.
+Replays are specifically designed to only include data essential to recreate the game. Game state is not recorded because the game engine can recreate it based off the other information. That means no player resource counts, collection rates, supply values, vision, unit positions, unit deaths, etc. Information that you are super interested in probably is not directly recorded. Fortunately since 2.0.4 tracker events now record some of this information; prior to that patch we had to run our own simulations to guess at most of the data.
 
 
 The other important aspect of this is that instead of completely describing all of the game data (unit data, ability data, map info, etc), replays maintain a list of dependencies. These dependencies might look like this:

examples/sc2autosave.py

@@ -168,6 +168,11 @@
 
 import sc2reader
 
+try:
+    raw_input          # Python 2
+except NameError:
+    raw_input = input  # Python 3
+
 
 def run(args):
     #Reset wipes the destination clean so we can start over.
@@ -367,12 +372,12 @@ def reset(args):
     elif not os.path.isdir(args.dest):
         exit("Cannot reset, destination must be directory: {0}", args.dest)
 
-    print 'About to reset directory: {0}\nAll files and subdirectories will be removed.'.format(args.dest)
+    print('About to reset directory: {0}\nAll files and subdirectories will be removed.'.format(args.dest))
     choice = raw_input('Proceed anyway? (y/n) ')
     if choice.lower() == 'y':
         args.log.write('Removing old directory: {0}\n'.format(args.dest))
         if not args.dryrun:
-            print args.dest
+            print(args.dest)
             shutil.rmtree(args.dest)
     else:
         sys.exit("Script Aborted")
@@ -511,7 +516,7 @@ def main():
     try:
         run(parser.parse_args())
     except KeyboardInterrupt:
-        print "\n\nScript Interupted. Process Aborting"
+        print("\n\nScript Interupted. Process Aborting")
 
 if __name__ == '__main__':
     main()

examples/sc2store.py

@@ -172,15 +172,15 @@ def main():
 
     for path in args.paths:
         for file_name in sc2reader.utils.get_files(path, depth=0):
-            print "CREATING: {0}".format(file_name)
+            print("CREATING: {0}".format(file_name))
             db.add(Game(sc2reader.read_file(file_name), db))
 
     db.commit()
 
-    print list(db.query(distinct(Person.name)).all())
+    print(list(db.query(distinct(Person.name)).all()))
 
     #for row in db.query(distinct(Person.name)).all():
-    #    print row
+    #    print(row)
 
 
 def load_session(args):