Skip to content
This repository has been archived by the owner on May 4, 2020. It is now read-only.

Commit

Permalink
update to version 2.4.2 and python 3
Browse files Browse the repository at this point in the history
  • Loading branch information
ikoruk committed Oct 4, 2019
1 parent 73d02c8 commit 568f639
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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"
Expand All @@ -9,7 +9,7 @@ linux: &linux
os: linux
sudo: required
language: python
python: "2.7"
python: "3.7"
services:
- docker

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 568f639

Please sign in to comment.