Skip to content

Commit

Permalink
Merge pull request #246 from tschoonj/release-4.1.5
Browse files Browse the repository at this point in the history
Release 4.1.5
  • Loading branch information
tschoonj authored Aug 20, 2024
2 parents 42e5f07 + 9df69f3 commit 28b13ef
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.1.4
current_version = 4.1.5
commit = True
tag = False

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
with:
args: install innosetup
# required for the lib command
- uses: ilammy/msvc-dev-cmd@v1.12.0
- uses: ilammy/msvc-dev-cmd@v1
with:
arch: x64
- uses: msys2/setup-msys2@v2
Expand Down
7 changes: 7 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 4.1.5 Tom Schoonjans

- Python: add support for Numpy 2 (contributed by Thomas Vincent)
- Python: publish packages to PyPI from GHA workflow
- meson: remove `python` option, and add various improvements
- deprecate GNU Autotools based build system

Version 4.1.4 Tom Schoonjans

- Bug fix: return 0.0 early in `PM3_auger_cascade_kissel` and `PM4_auger_cascade_kissel` (reported and fixed by Chris Ninham)
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@



AC_INIT([xraylib],[4.1.4],[[email protected]])
AC_INIT([xraylib],[4.1.5],[[email protected]])
AC_PREREQ([2.60])
AC_CONFIG_SRCDIR([include/xraylib.h])
AC_CONFIG_AUX_DIR([build-aux])
Expand Down
2 changes: 1 addition & 1 deletion idl/libxrlidl.dlm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ MODULE XRAYLIB

DESCRIPTION IDL XRAYLIB BINDINGS

VERSION 4.1.4
VERSION 4.1.5

SOURCE A.Brunetti, M. S. del Rio, T. Schoonjans, T. Ikonen, B. Golosio, A. Simionovici, A. Somogyi

Expand Down
2 changes: 1 addition & 1 deletion include/xraylib.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ extern "C" {

#define XRAYLIB_MAJOR 4
#define XRAYLIB_MINOR 1
#define XRAYLIB_MICRO 4
#define XRAYLIB_MICRO 5


#ifndef PI
Expand Down
2 changes: 1 addition & 1 deletion java/build.gradle.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
id "biz.aQute.bnd.builder" version "5.3.0"
}

version = '4.1.4'
version = '4.1.5'
group = 'com.github.tschoonj'
sourceCompatibility = '1.8'
targetCompatibility = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project('xraylib',
'c',
meson_version: '>= 0.60.0',
version: '4.1.4',
version: '4.1.5',
license: 'BSD',
default_options: ['cpp_std=c++11',]
)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
dependencies = [
"numpy"
]
version = "4.1.4"
version = "4.1.5"

[project.urls]
repository = "https://github.com/tschoonj/xraylib"
Expand Down
2 changes: 1 addition & 1 deletion xraylib.spec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
%define perl_vendor_autolib %{perl_vendor_archlib}/auto

Name: xraylib
Version: 4.1.4
Version: 4.1.5
Release: 1%{?dist}
Summary: A library for X-ray matter interactions cross sections for X-ray fluorescence applications: core C library
Group: Applications/Engineering and Scientific
Expand Down

0 comments on commit 28b13ef

Please sign in to comment.