Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update conan to 1.53 #40

Merged
merged 4 commits into from
Oct 25, 2022
Merged

Update conan to 1.53 #40

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2dde9b8
use conan 1.53
atimin Oct 24, 2022
62884a0
update docs
atimin Oct 24, 2022
d480267
build missing pacakges
atimin Oct 25, 2022
9efe589
don't fail if codecov has error
atimin Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ on:
- docs/**
- README.md
- CHANGELOG.md

env:
CONAN_VERSION: 1.53.0
jobs:
cpplint:
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -51,13 +52,9 @@ jobs:
with:
fetch-depth: 0

- name: Select Xcode 13.4
if: matrix.os == 'macos-12'
run: sudo xcode-select --switch /Applications/Xcode_13.4.app

- name: Install dependencies
run: |
pip3 install conan==1.52.0
pip3 install conan==${{ env.CONAN_VERSION }}

- name: Build tests, benchmarks and examples
run: |
Expand Down Expand Up @@ -109,13 +106,8 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Select Xcode 13.4
if: matrix.os == 'macos-12'
run: sudo xcode-select --switch /Applications/Xcode_13.4.app


- name: Install conan
run: pip3 install conan==1.52.0
run: pip3 install conan==${{ env.CONAN_VERSION }}

- name: Prefix version for development version
if: ${{ (github.ref == 'refs/heads/develop') }}
Expand Down Expand Up @@ -170,10 +162,6 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Select Xcode 13.4
if: matrix.os == 'macos-12'
run: sudo xcode-select --switch /Applications/Xcode_13.4.app

- name: Build and install
run: |
pip install -r python/requirements/test.txt
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
### Changed

* Use MacOs-12 as build system in CI, [PR-33](https://github.com/panda-official/WaveletBuffer/pull/33)
* Update conan to 1.53, [PR-40](https://github.com/panda-official/WaveletBuffer/pull/40)

## 0.4.0 - 2022-09-06

Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ A universal C++ compression library based on wavelet transformation

* CMake >= 3.16
* C++20 compiler
* conan >= 1.50
* conan >= 1.53

## Bindings

Expand Down Expand Up @@ -117,6 +117,5 @@ target_link_libraries(program ${LAPACK_LIBRARIES})
## References

* [Documentation](https://waveletbuffer.readthedocs.io)
* [Drift Protocol](https://github.com/panda-official/DriftProtocol) - Protobuf Libraries to encode message in Drift infrastructure
* [Drift Protocol](https://github.com/panda-official/DriftProtocol) - Protobuf Libraries to encode message in Drift infrastructure
* [Drift Python Client](https://github.com/panda-official/DriftPythonClient) - Python Client to access data of _PANDA|Drift_

20 changes: 10 additions & 10 deletions docs/dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
### Dependence and license compatibility
# Dependence and license compatibility

| Name | License | Compatibility |
|------|---------|---------------|
| OpenBlas | BSD-3 | Yes |
| Blaze | BSD-3 | Yes |
| libjpeg-turbo (jpeg API)| [IJG](https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/README.ijg) <br />| Yes |
| libjpeg-turbo (Turbo jpeg API) | BSD-3 | Yes |
| libjpeg-turbo (SIMD) | zlib | Yes |
| CImg | CeCILL-C | Yes |
| pybind11 | [BSD-like](https://github.com/pybind/pybind11/blob/master/LICENSE) | Yes |
| Name | License | Compatibility |
|--------------------------------|-----------------------------------------------------------------------------------|---------------|
| OpenBlas | BSD-3 | Yes |
| Blaze | BSD-3 | Yes |
| libjpeg-turbo (jpeg API) | [IJG](https://github.com/libjpeg-turbo/libjpeg-turbo/blob/main/README.ijg) <br /> | Yes |
| libjpeg-turbo (Turbo jpeg API) | BSD-3 | Yes |
| libjpeg-turbo (SIMD) | zlib | Yes |
| CImg | CeCILL-C | Yes |
| pybind11 | [BSD-like](https://github.com/pybind/pybind11/blob/master/LICENSE) | Yes |
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ requires = [
"scikit-build",
"pybind11 >= 2.9.2",
"cmake",
"conan == 1.52.0",
"conan == 1.53.0",
"ninja"
]

Expand Down