diff --git a/.travis.yml b/.travis.yml index 109eea7..a1d0936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,16 @@ env: global: - - CONAN_REFERENCE: "pybind11/2.3.0" + - CONAN_REFERENCE: "pybind11/2.4.2" - CONAN_USERNAME: "conan" - CONAN_STABLE_BRANCH_PATTERN: "release/*" - CONAN_CHANNEL: "stable" linux: &linux os: linux + dist: xenial sudo: required language: python - python: "2.7" + python: "3.7.4" services: - docker @@ -24,4 +25,4 @@ install: script: - chmod +x .travis/run.sh - - ./.travis/run.sh \ No newline at end of file + - ./.travis/run.sh diff --git a/.travis/install.sh b/.travis/install.sh index fce99b9..2ab692c 100644 --- a/.travis/install.sh +++ b/.travis/install.sh @@ -13,8 +13,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then eval "$(pyenv init -)" fi - pyenv install 2.7.10 - pyenv virtualenv 2.7.10 conan + pyenv install 3.7.4 + pyenv virtualenv 3.7.4 conan pyenv rehash pyenv activate conan fi @@ -22,4 +22,4 @@ fi pip install conan --upgrade pip install conan_package_tools -conan user \ No newline at end of file +conan user diff --git a/README.md b/README.md index cf376c6..021c791 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ ![pybind11 image](/images/conan-pybind11.png) [![Download](https://api.bintray.com/packages/conan-community/conan/pybind11%3Aconan/images/download.svg)](https://bintray.com/conan-community/conan/pybind11%3Aconan/_latestVersion) -[![Build Status](https://travis-ci.org/conan-community/conan-pybind11.svg?branch=release%2F2.3.0)](https://travis-ci.org/conan-community/conan-pybind11) -[![Build status](https://ci.appveyor.com/api/projects/status/jyeh443gn0l0f3bi/branch/release/2.3.0?svg=true)](https://ci.appveyor.com/project/memsharded/conan-pybind11/branch/release/2.3.0) +[![Build Status](https://travis-ci.org/conan-community/conan-pybind11.svg?branch=release%2F2.4.2)](https://travis-ci.org/conan-community/conan-pybind11) +[![Build status](https://ci.appveyor.com/api/projects/status/jyeh443gn0l0f3bi/branch/release/2.4.2?svg=true)](https://ci.appveyor.com/project/memsharded/conan-pybind11/branch/release/2.4.2) [Conan.io](https://conan.io) package recipe for [pybind11](https://github.com/pybind/pybind11) project. @@ -14,14 +14,14 @@ The packages generated with this **conanfile** can be found in [Bintray](https:/ ### Basic setup - $ conan install pybind11/2.3.0@conan/stable + $ conan install pybind11/2.4.2@conan/stable ### Project setup If you handle multiple dependencies in your project is better to add a *conanfile.txt* [requires] - pybind11/2.3.0@conan/stable + pybind11/2.4.2@conan/stable [generators] cmake diff --git a/appveyor.yml b/appveyor.yml index a55fc41..91d3dd5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,11 @@ build: false environment: - PYTHON: "C:\\Python27" - PYTHON_VERSION: "2.7.8" + PYTHON: "C:\\Python37" + PYTHON_VERSION: "3.7.4" PYTHON_ARCH: "32" - CONAN_REFERENCE: "pybind11/2.3.0" + CONAN_REFERENCE: "pybind11/2.4.2" CONAN_USERNAME: "conan" CONAN_LOGIN_USERNAME: "conanbot" CONAN_CHANNEL: "stable" @@ -18,11 +18,12 @@ environment: install: - - set PATH=%PATH%;%PYTHON%/Scripts/ + - set PATH=%PATH%;%PYTHON% - python -m pip install --upgrade pip - pip.exe install conan --upgrade - pip.exe install conan_package_tools --upgrade - conan user # It creates the conan data directory test_script: + - set PATH=%PATH%;%PYTHON% - python build.py diff --git a/conanfile.py b/conanfile.py index 47d486c..0feb92c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,7 +3,7 @@ class PyBind11Conan(ConanFile): name = "pybind11" - version = "2.3.0" + version = "2.4.2" settings = "os", "compiler", "arch", "build_type" description = "Seamless operability between C++11 and Python" homepage = "https://github.com/pybind/pybind11" diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index ce2ade0..35104e0 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -14,12 +14,12 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) # Using the pybind cmake helpers: -set(PYBIND11_PYTHON_VERSION 2.7) +set(PYBIND11_PYTHON_VERSION 3.7) find_package(pybind11 REQUIRED) pybind11_add_module(example MODULE example.cpp) # USING plain cmake: -# find_package(PythonLibs 2.7 REQUIRED) +# find_package(PythonLibs 3.7 REQUIRED) # add_library(example SHARED "example.cpp") # target_include_directories(example PRIVATE ${PYTHON_INCLUDE_DIRS}) # target_link_libraries(example PUBLIC ${PYTHON_LIBRARY})