Merge pull request #38 from fredrikaverpil/2.0.5

Update to 2.0.5
fredrikaverpil · Feb 3, 2019 · 67ed4e3 · 67ed4e3
2 parents 9b897e7 + 55b3226
commit 67ed4e3
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -2,23 +2,23 @@
 
 OpenImageIO Python 3.x package.
 
-| Build pipeline | R&D Status | CI Status |
-| ------------- | ------------- | ------------- |
-| Windows Server 2016 | Wheels are building | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) |
-| Ubuntu 16.04 | Wheels are building | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) |
-| macOS 10.13 | Wheels are building | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) |
+| Build pipeline | CI Status |
+| ------------- | ------------- |
+| Windows Server 2016 | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-win2016?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=5?branchName=master) |
+| Ubuntu 16.04<sup>1</sup> | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-ubuntu16.04?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=6?branchName=master) |
+| macOS 10.13 | [![Build Status](https://fredrikaverpil.visualstudio.com/oiio-python/_apis/build/status/oiio-python-macOS-10.13?branchName=master)](https://fredrikaverpil.visualstudio.com/oiio-python/_build/latest?definitionId=7&branchName=master) |
+
+<sup>1</sup> Should also work on CentOS 7 for example.
 
 ## About the project
 
-OpenImageIO is built using [vcpkg](https://github.com/Microsoft/vcpkg) and packaged into Python wheels on Windows, Linux and macOS platforms (provided by [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/)).
+OpenImageIO is built using [vcpkg](https://github.com/Microsoft/vcpkg) and packaged into Python wheels on Windows, Linux and macOS platforms (thanks to [Azure Pipelines](https://azure.microsoft.com/en-us/services/devops/pipelines/)).
 
 To make this work, some customization of the vcpkg port files were necessary and thus these modifications are stored in this repository.
 
 ## Download wheels
 
-Since the project is still in a research phase, no releases have been made just yet. Instead, look at the Azure Pipeline CI builds corresponding to your platform and Python version, where wheels are stored as build artifacts.
-
-When browsing an Azure Pipelines build, click the "Summary" link, and you will see the build artifacts (zipped Python wheels).
+Download the wheels under "Releases". CI jobs produce wheels and they can be downloaded from the respective CI job.
 
 ## Usage
 
@@ -34,8 +34,7 @@ See the `tests` folder for code examples used to test the built wheels' function
 - The vcpkg files for oiio at [vcpkg/ports/openimageio](https://github.com/Microsoft/vcpkg/tree/master/ports/openimageio)
 - Get SHA512 of file:
   - macOS: `openssl dgst -sha512 [FILE]`
-- Create release:
-    1. Commit changes: `git commit -am "My changes"`
-    2. Create tag: `git tag [oiio-version]+[yyyymmdd]` (e.g. `2.0.4+20190202`)
-    3. Push tag: `git push origin [oiio-version]+[yyyymmdd]`
-    4. Push changes: `git push`
+- A new release is automatically performed when a commit is performed on the `master` branch.
+- Updating to a newer OpenImageIO version:
+  1. Update the `oiio.version` variable in the .yml files
+  2. Update the version and SHA512 in the OpenImageIO port files.
diff --git a/macOS-10.13-azure-pipelines.yml b/macOS-10.13-azure-pipelines.yml
@@ -25,7 +25,7 @@ jobs:
     src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg'
     tests: '$(Agent.BuildDirectory)/s/tests'
     install.vcpkg: $(Agent.BuildDirectory)/s/vcpkg
-    oiio.version: '2.0.4'
+    oiio.version: '2.0.5'
     pypackage.os_name: 'Microsoft :: MacOS'
 
   pool:

diff --git a/src/vcpkg/ports/openimageio-py3.6/portfile.cmake b/src/vcpkg/ports/openimageio-py3.6/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF bb2c617e83b3b264c9f4b7503d3c01c16570fdb7
-    SHA512 5c198bd53ebc84847df3f8c40c0eedcb16d9e45ad9627d2e69faa44ba0966f74cac29cb3e93af5df7162ef4af82101770118e10695e25b287d05d499932fab0f
+    REF Release-2.0.5
+    SHA512 2bf6b3d998e9b7bda90b9dfd3e30702c3c857f6f90ab8be10fd3dc9617ecccc62464a8198a7804d130bdb39b2475c1ce14af129b8ccc371a21e92c2e637a5413
     HEAD_REF master
     PATCHES
         # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'

diff --git a/src/vcpkg/ports/openimageio-py3.7/portfile.cmake b/src/vcpkg/ports/openimageio-py3.7/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF bb2c617e83b3b264c9f4b7503d3c01c16570fdb7
-    SHA512 5c198bd53ebc84847df3f8c40c0eedcb16d9e45ad9627d2e69faa44ba0966f74cac29cb3e93af5df7162ef4af82101770118e10695e25b287d05d499932fab0f
+    REF Release-2.0.5
+    SHA512 2bf6b3d998e9b7bda90b9dfd3e30702c3c857f6f90ab8be10fd3dc9617ecccc62464a8198a7804d130bdb39b2475c1ce14af129b8ccc371a21e92c2e637a5413
     HEAD_REF master
     PATCHES
         # fix_libraw: replace 'LibRaw_r_LIBRARIES' occurences by 'LibRaw_LIBRARIES'

diff --git a/ubuntu16.04-azure-pipelines.yml b/ubuntu16.04-azure-pipelines.yml
@@ -24,7 +24,7 @@ jobs:
     src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg'
     tests: '$(Agent.BuildDirectory)/s/tests'
     install.vcpkg: $(Agent.BuildDirectory)/s/vcpkg
-    oiio.version: '2.0.4'
+    oiio.version: '2.0.5'
     pypackage.os_name: 'Microsoft :: POSIX :: Linux'
 
   pool:

diff --git a/win2016-azure-pipelines.yml b/win2016-azure-pipelines.yml
@@ -23,7 +23,7 @@ jobs:
     src.python: '$(Agent.BuildDirectory)/s/src/python'
     src.vcpkg: '$(Agent.BuildDirectory)/s/src/vcpkg'
     tests: '$(Agent.BuildDirectory)/s/tests'
-    oiio.version: '2.0.4'
+    oiio.version: '2.0.5'
     pypackage.os_name: 'Microsoft :: Windows'
 
   pool: