Changeset 1748e73 in trunk

Timestamp:

2016-12-15T00:10:29Z (8 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

7eceb21, e32b664

Parents:

a7479f1 (diff), 2cd30f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch '2849-wheels'

This sets up Appveyor to create "build artifacts" which include zipfiles of
generated platform-specific wheels (now for both 32-bit and 64-bit).

It also updates the travis config to use the default OS-X platform (10.11 at
the moment), rather than an old one. (when we first enabled travis for OS-X,
the default was too old, and we had to force a newer one, but time has
marched on, and the "newer" one we picked has since become older than the
default). I haven't yet found an easy way to get OS-X wheels as Travis build
artifacts, so I'll create those manually for now.

refs ticket:2849

Files:

• .appveyor.yml (modified) (3 diffs)
• .travis.yml (modified) (1 diff)

.appveyor.yml ¶

@@ -7 +7 @@
     # For Python versions available on Appveyor, see
     # http://www.appveyor.com/docs/installed-software#python
-    #- PYTHON: "C:\\Python27"
+    - PYTHON: "C:\\Python27"
     - PYTHON: "C:\\Python27-x64"
     #  DISTUTILS_USE_SDK: "1"
@@ -35 +35 @@
 
 after_test:
-  # This step builds your wheels.
+  # This builds the main tahoe wheel, and wheels for all dependencies.
   # Again, you only need build.cmd if you're building C extensions for
   # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct
@@ -41 +41 @@
   - |
     %PYTHON%\python.exe setup.py bdist_wheel
+    %PYTHON%\python.exe -m pip wheel -w dist .
 
 artifacts:
   # bdist_wheel puts your built wheel in the dist directory
-  - path: dist\*
+  # "pip wheel -w dist ." puts all the dependency wheels there too
+  # this gives us a zipfile with everything
+  - path: dist
 
 #on_success:

.travis.yml ¶

@@ -3 +3 @@
  - "linux"
  - "osx"
-# xcode7 gives us OS-X 10.10, which gives us newer OpenSSL (the default gives
-# us 10.9, which appears to have OpenSSL-0.9.8, which is rejected by
-# cryptography-1.4)
-osx_image: xcode7
 cache: pip
 before_cache: