Skip to content

Commit 7d13615

Browse files
committed
Merge branch 'test' into develop
2 parents fa42d73 + 25576a7 commit 7d13615

10 files changed

+14
-15
lines changed

.github/workflows/continuous-integration.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
branches:
99
- "**"
1010
workflow_dispatch:
11+
workflow_call:
1112

1213
jobs:
1314
compile:

.github/workflows/create-release.yaml

+3-8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
tags:
66
- "v*"
77
workflow_dispatch:
8+
workflow_call:
89

910
jobs:
1011
tagged-release:
@@ -18,16 +19,10 @@ jobs:
1819
submodules: recursive
1920

2021
- name: Check Compilation, Tests, Examples, Docs and Benchmarks
21-
uses: actions/workflow-run-action@v2
22-
with:
23-
workflow: "continuous-integration.yaml"
24-
ref: ${{ github.ref }}
22+
uses: ./.github/workflows/continuous-integration.yaml
2523

2624
- name: Generate Python Wheels
27-
uses: actions/workflow-run-action@v2
28-
with:
29-
workflow: "wheels.yaml"
30-
ref: ${{ github.ref }}
25+
uses: ./.github/workflows/wheels.yaml
3126

3227
- name: Zip Source Code
3328
run: |

.github/workflows/run-carbonate.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
types: [created]
44
issues:
55
types: [opened]
6+
workflow_call:
67

78
jobs:
89
carbonate:

.github/workflows/wheels.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ on:
99
branches:
1010
- "**"
1111
workflow_dispatch:
12+
workflow_call:
1213

1314
jobs:
1415
# Build the wheels for Linux, Windows and macOS for CPython 3.7 and newer

CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ authors:
55
- family-names: "Davis"
66
given-names: "Toby"
77
title: "LibRapid: Optimised Mathematics for C++"
8-
version: 0.7.3
9-
date-released: "2023-08-03"
8+
version: 0.7.4
9+
date-released: "2023-10-22"
1010
type: software
1111
url: "https://github.com/LibRapid/librapid"
1212
license: MIT

Doxyfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "LibRapid"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = v0.7.3
41+
PROJECT_NUMBER = v0.7.4
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a
@@ -965,6 +965,7 @@ RECURSIVE = YES
965965

966966
EXCLUDE =
967967

968+
968969
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
969970
# directories that are symbolic links (a Unix file system feature) are excluded
970971
# from the input.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ sdist.exclude = [
4242

4343
[project]
4444
name = "librapid"
45-
version = "0.7.3"
45+
version = "0.7.4"
4646
description = "A high-performance library for arrays and numeric calculations"
4747
readme = "README.md"
4848
long_description = ["file: README.md"]

scripts/setVersion.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
if args.version:
4444
# Validate version number
45-
if not re.match("[0-9]+\.[0-9]+\.[0-9]+", args.version):
45+
if not re.match("[0-9]+\\.[0-9]+\\.[0-9]+", args.version):
4646
print("[ ERROR ] Invalid version number")
4747
sys.exit(1)
4848
newMajorVersion = args.version.split(".")[0]
@@ -93,7 +93,7 @@
9393
print("Loaded pyproject.toml template")
9494

9595
with open("../pyproject.toml", "w") as pyprojectFile:
96-
versionString = f"\"{newMajorVersion}.{newMinorVersion}.{newPatchVersion}\""
96+
versionString = f"{newMajorVersion}.{newMinorVersion}.{newPatchVersion}"
9797
template = template.replace("$${{ INSERT_VERSION_NUMBER_HERE }}$$", versionString)
9898
pyprojectFile.write(template)
9999
print("Written to pyproject.toml")
File renamed without changes.

version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
MAJOR 0
22
MINOR 7
3-
PATCH 3
3+
PATCH 4

0 commit comments

Comments
 (0)