Skip to content

Commit

Permalink
Merge pull request #424 from ErlendHaa/readme-updates
Browse files Browse the repository at this point in the history
Pin numpy version < 2.0
  • Loading branch information
ErlendHaa authored Aug 18, 2023
2 parents 4120f10 + b4c548c commit 8053f7d
Show file tree
Hide file tree
Showing 16 changed files with 7,666 additions and 3,010 deletions.
10 changes: 6 additions & 4 deletions .github/images/bigendian.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM s390x/debian
RUN apt-get update
RUN apt-get install -y cmake g++ python3 python3-pip git
RUN apt-get install -y cmake g++ python3 python3-pip git python3-venv

#mpark variant
WORKDIR /home/ci
Expand All @@ -23,8 +23,10 @@ RUN make install
WORKDIR /home/ci
COPY . /home/ci/dlisio_requirements
WORKDIR /home/ci/dlisio_requirements
RUN python3 -m pip install --upgrade pip
RUN python3 -m pip install --user -r python/requirements-dev.txt
RUN python3 -m venv venv
RUN . venv/bin/activate
RUN /home/ci/dlisio_requirements/venv/bin/python -m pip install --upgrade pip
RUN /home/ci/dlisio_requirements/venv/bin/python -m pip install -r python/requirements-dev.txt

#lfp
WORKDIR /home/ci
Expand All @@ -38,6 +40,6 @@ RUN make install
WORKDIR /home/ci
COPY . /home/ci/dlisio
WORKDIR /home/ci/dlisio/build
RUN cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR=/usr/local/lib -DPYTHON_EXECUTABLE=`which python3` ..
RUN cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_NAME_DIR=/usr/local/lib -DPYTHON_EXECUTABLE="/home/ci/dlisio_requirements/venv/bin/python" ..
RUN make -j4
RUN ctest --verbose
8 changes: 4 additions & 4 deletions .github/workflows/analyzers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
cppcheck:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: './.github/actions/build_core_dependencies'
with:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:
scan_build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: './.github/actions/build_core_dependencies'
with:
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
valgrind:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: './.github/actions/build_core_dependencies'
with:
Expand All @@ -95,7 +95,7 @@ jobs:
debug:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: './.github/actions/build_core_dependencies'
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/bigendian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
builder: ${{ steps.buildx.outputs.name }}
context: .
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
os: [macOS-10.15]
os: [macos-11]
include:
- os: ubuntu-20.04

Expand All @@ -26,7 +26,7 @@ jobs:
cmake_generator: "-G \"Visual Studio 16 2019\" -A Win32"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Elevate privileges
if: ${{ !contains( matrix.os, 'windows') }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10'

- uses: './.github/actions/build_core_dependencies'
with:
Expand Down
18 changes: 10 additions & 8 deletions .github/workflows/wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,22 @@ jobs:
arch: aarch64
- os: ubuntu-20.04
arch: i686
- os: macOS-10.15
- os: macos-11
arch: x86_64

steps:
- name: Disable autocrlf
run: |
git config --global core.autocrlf false
- uses: actions/checkout@v2
- uses: actions/checkout@v3

# Used to host cibuildwheel
- uses: actions/setup-python@v2
- uses: actions/setup-python@v4
with:
python-version: '3.10'

- uses: docker/setup-qemu-action@v1
- uses: docker/setup-qemu-action@v2
if: ${{ matrix.arch == 'aarch64' }}
name: Set up QEMU

Expand All @@ -60,12 +62,12 @@ jobs:
CMAKE_PREFIX_PATH="$CMAKE_PREFIX_PATH;C:/Program Files (x86)/layered-file-protocols/"
CIBW_ARCHS: ${{ matrix.arch }}
CIBW_SKIP: pp* *-musllinux_* cp31*-win32
CIBW_SKIP: pp* *-musllinux_* cp31*-win32 cp312-*

run: |
python -m cibuildwheel --output-dir wheelhouse python/
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

Expand All @@ -75,9 +77,9 @@ jobs:
runs-on: ubuntu-latest
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3

- name: Publish wheels to PyPI

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p align="center">
<img src="https://raw.githubusercontent.com/equinor/dlisio/master/dlisio-logo.svg" alt="dlisio logo" width="400"/>
<img src="https://raw.githubusercontent.com/equinor/dlisio/master/dlisio-icon.svg" alt="dlisio icon" width="400"/>
</p>

<p align="center">
Expand Down Expand Up @@ -95,10 +95,10 @@ curve mnemonics as field names (column names).

To develop dlisio, or to build a particular revision from source, you need:

* A C++11 compatible compiler (tested daily on gcc, clang, and msvc 2015)
* A C++11 compatible compiler (tested on gcc, clang, and msvc 2019)
* [CMake](https://cmake.org/) version 3.5 or greater
* [Python](https://python.org) version 3.6 or greater
* [fmtlib](http://fmtlib.net/) tested mainly with 7.3.1
* [fmtlib](http://fmtlib.net/) tested mainly with 7.1.3
* [mpark_variant](https://github.com/mpark/variant)
* [pybind11](https://github.com/pybind/pybind11) version 2.6 or greater
* [setuptools](https://pypi.python.org/pypi/setuptools) version 28 or greater
Expand Down
2 changes: 1 addition & 1 deletion dlisio-logo.svg → dlisio-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8053f7d

Please sign in to comment.