Merge pull request #362 from google/master

Pick-up pyhton build script update

MANIFEST.in

@@ -0,0 +1,18 @@
+include CONTRIBUTING.md
+include dec/*.c
+include dec/*.h
+include dec/Makefile
+include enc/*.cc
+include enc/*.h
+include enc/Makefile
+include LICENSE
+include MANIFEST.in
+include python/bro.py
+include python/brotlimodule.cc
+include python/README.md
+include README.md
+include setup.py
+include shared.mk
+include tools/bro.cc
+include tools/Makefile
+include tools/version.h

appveyor.yml

@@ -48,8 +48,8 @@ install:
   # upgrade pip to avoid out-of-date warnings
   - "pip install --disable-pip-version-check --user --upgrade pip"
 
-  # install wheel to build compiled packages
-  - "pip install --upgrade wheel"
+  # install/upgrade setuptools and wheel to build packages
+  - "pip install --upgrade setuptools wheel"
 
 build: false
 
@@ -57,12 +57,15 @@ test_script:
   - "%WITH_COMPILER% python setup.py build_ext test"
 
 after_test:
-  # if tests are successful, create binary packages for the project
+  # if tests are successful, create binary and source packages for the project
   - "%WITH_COMPILER% pip wheel -w dist ."
+  - "%WITH_COMPILER% python setup.py sdist --formats=gztar,zip"
 
 artifacts:
   # archive the generated packages in the ci.appveyor.com build report
-  - path: dist\*
+  - path: dist\*.whl
+  - path: dist\*.zip
+  - path: dist\*.tar.gz
 
 # For info, see: http://www.appveyor.com/docs/deployment/github
 

python/tests/compatibility_test.py

@@ -24,4 +24,7 @@ for filename in glob.glob("testdata/*.compressed*"):
                    env=TEST_ENV)
     if diff_q(uncompressed, expected) != 0:
         sys.exit(1)
-    os.unlink(uncompressed)
+    try:
+        os.unlink(uncompressed)
+    except OSError:
+        pass

python/tests/custom_dictionary_test.py

@@ -34,3 +34,8 @@ for filename in INPUTS.splitlines():
                         uncompressed, "--custom-dictionary", filename], env=TEST_ENV)
             if diff_q(filename, uncompressed) != 0:
                 sys.exit(1)
+            try:
+                os.unlink(compressed)
+                os.unlink(uncompressed)
+            except OSError:
+                pass

python/tests/roundtrip_test.py

@@ -41,3 +41,8 @@ for filename in INPUTS.splitlines():
                        env=TEST_ENV)
         if diff_q(filename, uncompressed) != 0:
             sys.exit(1)
+        try:
+            os.unlink(compressed)
+            os.unlink(uncompressed)
+        except OSError:
+            pass