Skip to content

Commit 4d1f09c

Browse files
committed
update version information for v3.11.2 release
1 parent ab98962 commit 4d1f09c

File tree

4 files changed

+38
-39
lines changed

4 files changed

+38
-39
lines changed

.github/workflows/release.yml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ jobs:
2727
- name: Get version
2828
id: get_version
2929
env:
30-
vernum: ${{ github.ref }}
31-
repo: ${{ github.repository }}
30+
vernum: ${{ github.ref }}
31+
repo: ${{ github.repository }}
3232
run: |
33-
echo ::set-output name=version::${vernum/refs\/tags\//}
34-
echo ::set-output name=repo::`basename ${repo}`
35-
echo ::set-output name=tarfile::`basename ${repo}`-${vernum/refs\/tags\//}.tar.gz
33+
echo "version=${vernum/refs\/tags\//}" >> $GITHUB_ENV
34+
echo "repo=$(basename ${repo})" >> $GITHUB_ENV
35+
echo "tarfile=$(basename ${repo})-${vernum/refs\/tags\//}.tar.gz" >> $GITHUB_ENV
3636
3737
# - name: build tarball mac
3838
# if: matrix.os == 'macos-latest'
@@ -45,22 +45,21 @@ jobs:
4545
- name: build tarball
4646
if: matrix.os == 'ubuntu-latest'
4747
env:
48-
tarfile: ${{ steps.get_version.outputs.tarfile }}
49-
repo: ${{ steps.get_version.outputs.repo }}
48+
tarfile: ${{ env.tarfile }}
49+
repo: ${{ env.repo }}
5050
run: |
51-
env
52-
echo "tarfile is $tarfile, repo is $repo"
53-
tar cfz /tmp/$tarfile --exclude ".git*" \
54-
--transform "s,.,${repo}," .
51+
echo "tarfile=${{ env.tarfile }}, repo=${{ env.repo }}"
52+
tar cfz /tmp/${{ env.tarfile }} --exclude ".git*" \
53+
--transform "s,.,${{ env.repo }}," .
5554
5655
- name: check tarball and get SHA
5756
env:
58-
tarfile: ${{ steps.get_version.outputs.tarfile }}
57+
tarfile: ${{ env.tarfile }}
5958
id: shasum
6059
run: |
61-
mv /tmp/$tarfile .
62-
tar tfz $tarfile
63-
echo ::set-output name=sha::"$(shasum -a 256 $tarfile | awk '{printf $1}')"
60+
mv /tmp/${{ env.tarfile }} .
61+
tar tfz ${{ env.tarfile }}
62+
echo "sha=$(shasum -a 256 ${{ env.tarfile }} | awk '{printf $1}')" >> $GITHUB_ENV
6463
6564
- name: Extract Release Notes
6665
run: |
@@ -72,8 +71,8 @@ jobs:
7271
env:
7372
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7473
with:
75-
tag_name: ${{ steps.get_version.outputs.version }}
76-
release_name: ${{ steps.get_version.outputs.version }}
74+
tag_name: ${{ env.version }}
75+
release_name: ${{ env.version }}
7776
body_path: release-notes.md
7877
draft: false
7978
prerelease: false
@@ -85,8 +84,8 @@ jobs:
8584
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8685
with:
8786
upload_url: ${{ steps.create_release.outputs.upload_url }}
88-
asset_path: ${{ steps.get_version.outputs.tarfile }}
89-
asset_name: ${{ steps.get_version.outputs.tarfile }}
87+
asset_path: ${{ env.tarfile }}
88+
asset_name: ${{ env.tarfile }}
9089
asset_content_type: application/gzip
9190

9291
- name: Set up Homebrew
@@ -96,15 +95,15 @@ jobs:
9695
- name: Bump Brew
9796
env:
9897
HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.BREW_TOKEN_SPLASH }}
99-
version: ${{ steps.get_version.outputs.version }}
98+
version: ${{ env.version }}
10099
brewtap: danieljprice/all
101-
formula: ${{ steps.get_version.outputs.repo }} # formula name same as repo name
100+
formula: ${{ env.repo }}
102101
run: |
103102
git config --global user.email "daniel.price@monash.edu"
104103
git config --global user.name "Daniel Price"
105104
brew install pipgrip
106105
brew tap $brewtap
107106
brew bump-formula-pr -f --version=${version/v/} --no-browse --no-audit \
108-
--sha256=${{ steps.shasum.outputs.sha }} \
109-
--url="https://github.com/${{ github.repository }}/releases/download/${{ steps.get_version.outputs.version }}/${{ steps.get_version.outputs.tarfile }}" \
107+
--sha256=${{ env.sha }} \
108+
--url="https://github.com/${{ github.repository }}/releases/download/${{ env.version }}/${{ env.tarfile }}" \
110109
$brewtap/$formula

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# -- Project information -----------------------------------------------------
1919

2020
project = 'splash'
21-
copyright = '2004-2024 Daniel Price and contributors'
21+
copyright = '2004-2025 Daniel Price and contributors'
2222
author = 'Daniel Price'
2323

2424
# The full version, including alpha/beta/rc tags

src/globaldata.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module filenames
8383
character(len=120) :: defaultsfile,limitsfile,unitsfile,coloursfile
8484
integer, dimension(maxfile) :: nstepsinfile
8585
character(len=*), parameter :: tagline = &
86-
'SPLASH: A visualisation tool for SPH data (c)2004-2024 Daniel Price and contributors'
86+
'SPLASH: A visualisation tool for SPH data (c)2004-2025 Daniel Price and contributors'
8787

8888
public
8989

src/splash.f90

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
! a) You must cause the modified files to carry prominent notices
1616
! stating that you changed the files and the date of any change.
1717
!
18-
! Copyright (C) 2005-2024 Daniel Price. All rights reserved.
18+
! Copyright (C) 2005-2025 Daniel Price. All rights reserved.
1919
! Contact: daniel.price@monash.edu
2020
!
2121
! The plotting API for SPLASH 2.0 was written by James Wetter
@@ -30,7 +30,7 @@ program splash
3030
!---------------------------------------------------------------------------------
3131
!
3232
! SPLASH - a plotting utility for SPH data in 1, 2 and 3 dimensions
33-
! Copyright (C) 2005-2024 Daniel Price
33+
! Copyright (C) 2005-2025 Daniel Price
3434
! daniel.price@monash.edu
3535
!
3636
! --------------------------------------------------------------------------
@@ -51,15 +51,17 @@ program splash
5151
!
5252
! -------------------------------------------------------------------------
5353
! Version history/ Changelog:
54-
! 3.11.3 : (XX/XX/25)
55-
! bug fix with multiplot and multiple steps per page not printing axes correctly;
56-
! 3.11.2 : (09/12/24)
57-
! bug fix reading density from phantom small dumps if not rendering;
54+
! 3.11.2 : (04/04/25)
5855
! automated plotting of star profiles from phantom relax.profile file if present;
5956
! better automated unit guessing when comparing to exact solution from file;
60-
! fix hardwiring of decimal labels on y axis;
57+
! can plot two shock tube exact solutions with different gammas on top of each other;
58+
! improved behaviour with nstepsperpage = 0;
6159
! bug fix with labels + limits in double rendering when using auto choice of density weighted rendering;
62-
! plotting library api updated to giza v1.5
60+
! plotting library api updated to giza v1.5; fix hardwiring of decimal labels on y axis;
61+
! bug fix with multiplot and multiple steps per page not printing axes correctly;
62+
! bug fix reading sink particle data in GADGET HDF5 format;
63+
! bug fix with vector labelling in GADGET HDF5 read
64+
! bug fix reading density from phantom small dumps if not rendering;
6365
! 3.11.1 : (06/12/24)
6466
! bug fix with type recognition in sphNG data read, better wrong endian error
6567
! message (thanks to Matthew Bate); recognise sphNG format correctly even
@@ -635,7 +637,7 @@ program splash
635637
character(len=120) :: string,exactfile
636638
character(len=12) :: convertformat
637639
character(len=lenlabel) :: stringx,stringy,stringr,stringc,stringv
638-
character(len=*), parameter :: version = 'v3.11.3 [5th Feb 2025]'
640+
character(len=*), parameter :: version = 'v3.11.2 [4th April 2025]'
639641

640642
!
641643
! initialise some basic code variables
@@ -1179,15 +1181,13 @@ subroutine print_header
11791181
20 format(/, &
11801182
' ( B | y ) ( D | a | n | i | e | l ) ( P | r | i | c | e )',/)
11811183

1182-
print "(a)",' ( '//trim(version)//' Copyright (C) 2005-2024 )'
1184+
print "(a)",' ( '//trim(version)//' Copyright (C) 2005-2025 )'
11831185
print 30
11841186
30 format(/, &
11851187
' * SPLASH comes with ABSOLUTELY NO WARRANTY. This is ',/, &
11861188
' free software; can redistribute w/conditions (see LICENCE) *',/,/, &
1187-
' http://users.monash.edu.au/~dprice/splash ',/, &
1188-
' daniel.price@monash.edu or splash-users@googlegroups.com',/, &
1189-
' Please cite Price (2007), PASA, 24, 159-173 (arXiv:0709.0832) if you ',/, &
1190-
' use SPLASH in print and don''t forget to send pics for the gallery',/)
1189+
' https://splash-viz.readthedocs.io',/,/, &
1190+
' Please cite Price (2007), PASA 24, 159 if you use SPLASH in print',/)
11911191

11921192
end subroutine print_header
11931193

0 commit comments

Comments
 (0)