Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Pencilcaseman committed Oct 22, 2023
2 parents 7d13615 + def9ad2 commit e2a80b5
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 98 deletions.
92 changes: 7 additions & 85 deletions .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,98 +18,20 @@ jobs:
with:
submodules: recursive

- name: Check Compilation, Tests, Examples, Docs and Benchmarks
uses: ./.github/workflows/continuous-integration.yaml

- name: Generate Python Wheels
uses: ./.github/workflows/wheels.yaml

- name: Zip Source Code
run: |
zip -r librapid.zip ../librapid
- name: Get latest CMake and ninja
uses: lukka/get-cmake@latest

- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: "3.9"

- name: Install Clang
uses: KyleMayes/install-llvm-action@v1
with:
version: "15.0"
directory: "./llvm"
env: on

- name: Build Doxygen
id: build_doxygen
continue-on-error: true
run: |
git clone --recursive https://github.com/doxygen/doxygen.git
cd doxygen
git checkout Release_1_9_7
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Release -G "Unix Makefiles"
cmake --build . --config Release
sudo make install
env:
CC: gcc
CXX: g++

- name: Install Doxygen on Error
if: steps.build_doxygen.outcome != 'success'
run: |
sudo apt install doxygen
- name: Upgrade Source Distribution
continue-on-error: true
run: |
sudo apt update
sudo apt upgrade -y
sudo apt autoremove -y
- name: Install LaTeX
continue-on-error: true
run: |
sudo apt-get install -y texlive-full
- name: Install Requirements
continue-on-error: true
run: |
cd docs
pip install -r requirements.txt
- name: Force install Sphinx Build
run: |
sudo apt-get install python3-sphinx
- name: Configure Files
run: |
touch .is_local
- name: Build HTML Documentation
run: |
cd docs
make html
- name: Build PDf Documentation
# continue-on-error: true
run: |
cd docs
make latexpdf
- name: Zip Documentation (HTML)
run: |
zip -r htmlDocs.zip ./docs/build/html
- uses: "marvinpinto/action-automatic-releases@latest"
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
files: |
librapid.zip
htmlDocs.zip
docs/build/latex/librapid.pdf
README.md
LICENSE
version.txt
SECURITY.md
CONTRIBUTING.md
CODE_OF_CONDUCT.md
CITATION.cff
1 change: 1 addition & 0 deletions .github/workflows/run-carbonate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
issues:
types: [opened]
workflow_call:
workflow_dispatch:

jobs:
carbonate:
Expand Down
10 changes: 3 additions & 7 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ formats: all

# Set the build image to use the most recent version
build:
os: "ubuntu-22.04"

# Set the python version and requirements
python:
version: "3"
# install:
# - requirements: docs/requirements.txt
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors:
- family-names: "Davis"
given-names: "Toby"
title: "LibRapid: Optimised Mathematics for C++"
version: 0.7.4
version: 0.7.5
date-released: "2023-10-22"
type: software
url: "https://github.com/LibRapid/librapid"
Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "LibRapid"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = v0.7.4
PROJECT_NUMBER = v0.7.5

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
<p align="center">
<!-- <p align="center">
<img src="https://raw.githubusercontent.com/LibRapid/librapid_extras/master/branding/LibRapid_light.png#gh-light-mode-only" width="800">
</p>
<p align="center">
<img src="https://raw.githubusercontent.com/LibRapid/librapid_extras/master/branding/LibRapid_dark.png#gh-dark-mode-only" width="800">
</p>
</p> -->

<picture>
<source
srcset="https://raw.githubusercontent.com/LibRapid/librapid_extras/master/branding/LibRapid_dark.png"
media="(prefers-color-scheme: dark)">
<img src="https://raw.githubusercontent.com/LibRapid/librapid_extras/master/branding/LibRapid_light.png">
</picture>

![C++ Version](https://img.shields.io/badge/C++-20/23-purple.svg?style=flat&logo=c%2B%2B) ![License](https://img.shields.io/badge/License-MIT-orange.svg?style=flat) [![Discord](https://img.shields.io/discord/848914274105557043?color=blue&label=Discord&logo=Discord)](https://discord.gg/cGxTFTgCAC)

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ sdist.exclude = [

[project]
name = "librapid"
version = "0.7.4"
version = "0.7.5"
description = "A high-performance library for arrays and numeric calculations"
readme = "README.md"
long_description = ["file: README.md"]
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
MAJOR 0
MINOR 7
PATCH 4
PATCH 5

0 comments on commit e2a80b5

Please sign in to comment.