Skip to content

Commit 883dfad

Browse files
authored
Update version number to check release protocol (#176)
* update version number * update qt installer framework * update qt installer name * typo * roling back to 4.6.1 * remove remote repository * dependencies * update actions * added andreas as maintainer * code comment * typo * update github action
1 parent dc1e7fb commit 883dfad

File tree

7 files changed

+36
-29
lines changed

7 files changed

+36
-29
lines changed

.github/workflows/linux-build.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
build_snap:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- uses: snapcore/action-build@v1
1616
id: snapcraft
17-
- uses: actions/upload-artifact@v3
17+
- uses: actions/upload-artifact@v4
1818
with:
1919
name: snap
2020
path: ${{ steps.snapcraft.outputs.snap }}
@@ -23,7 +23,7 @@ jobs:
2323
runs-on: ubuntu-latest
2424
needs: build_snap
2525
steps:
26-
- uses: actions/download-artifact@v3
26+
- uses: actions/download-artifact@v4
2727
with:
2828
name: snap
2929
path: .
@@ -48,14 +48,14 @@ jobs:
4848
runs-on: ubuntu-latest
4949
needs: install_test
5050
steps:
51-
- uses: actions/download-artifact@v3
51+
- uses: actions/download-artifact@v4
5252
with:
5353
name: snap
5454
path: .
5555

5656
- name: Get branch names
5757
id: branch-name
58-
uses: tj-actions/branch-names@v6
58+
uses: tj-actions/branch-names@v8
5959

6060
- name: Get snap filename
6161
run: |

.github/workflows/macos-windows-build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525

2626
steps:
2727
- name: Check-out EasyReflectometry repository
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929

3030
- name: Setup Python
31-
uses: actions/setup-python@v4.5.0
31+
uses: actions/setup-python@v5
3232
with:
3333
python-version: 3.9
3434

@@ -89,14 +89,14 @@ jobs:
8989
run: python ${{ env.SCRIPTS_PATH }}/ZipArtifacts.py ${{ env.BRANCH_NAME }}
9090

9191
- name: Upload installer to artifacts (macOS)
92-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
9393
if: runner.os == 'macOS'
9494
with:
9595
name: macOS
9696
path: "${{ env.DISTRIBUTION_PATH }}/${{ env.APP_NAME }}_macOS_*.zip"
9797

9898
- name: Upload installer to artifacts (Windows)
99-
uses: actions/upload-artifact@v3
99+
uses: actions/upload-artifact@v4
100100
if: runner.os == 'Windows'
101101
with:
102102
name: windows

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
### Changes 0.0.8
4+
5+
- Just a retry of the release protocol
6+
37
### Changes 0.0.7
48

59
- No end-user related changes

INSTALLATION.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
To make the installation of EasyReflectometry as easy as possible, we prepare packaged releases for three major operating systems:
44

5-
- [Windows](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.7-beta/EasyReflectometry_Windows_x86-32_v0.0.7-beta.zip)
6-
- [macOS](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.7-beta/EasyReflectometry_macOS_x86-64_v0.0.7-beta.zip) (built on 10.15)
7-
- [Linux](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.7-beta/EasyReflectometry_Linux_x86-64_v0.0.7-beta.zip) (built on Ubuntu-20.04)
5+
- [Windows](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.8-beta/EasyReflectometry_Windows_x86-32_v0.0.8-beta.exe)
6+
- [macOS](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.8-beta/EasyReflectometry_macOS_x86-64_v0.0.8-beta.zip) (built on 10.15)
7+
- [Linux](https://github.com/easyScience/EasyReflectometryApp/releases/download/v0.0.8-beta/EasyReflectometry_Linux_x86-64_v0.0.8-beta.zip) (built on Ubuntu-20.04)
88

99
If the relevant EasyReflectometry installation does not work on your system, then please try installation from source.
1010

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Full details of the future plans for EasyReflectometry is available in the [road
4343

4444
### Downloading
4545

46-
[Download](https://github.com/easyScience/EasyReflectometryApp/releases) the official **EasyReflectometry installer v0.0.7** for your operating system.
46+
[Download](https://github.com/easyScience/EasyReflectometryApp/releases) the official **EasyReflectometry installer** for your operating system.
4747

4848
### Installing
4949

pyproject.toml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ build-backend = "hatchling.build"
88
# Note that while the project is called EasyReflectometryApp
99
# the application itself is EasyReflectometry.
1010
name = "EasyReflectometry"
11-
version = "0.0.7-beta"
11+
version = "0.0.8-beta"
1212
description = "Making reflectometry data analysis and modelling easy."
1313
authors = [
1414
{name = "Andrew R. McCluskey", email = "[email protected]"},
1515
{name = "Andrew Sazonov"},
16-
{name = "Simon Ward"}
16+
{name = "Simon Ward"},
17+
{name = "Andreas Pedersen", email = "[email protected]"}
1718
]
1819
maintainers = [
19-
{name = "Andrew R. McCluskey", email = "[email protected]"}
20+
{name = "Andrew R. McCluskey", email = "[email protected]"},
21+
{name = "Andreas Pedersen", email = "[email protected]"}
2022
]
2123
license = "BSD-3-Clause"
2224
classifiers = [
@@ -41,8 +43,8 @@ dependencies = [
4143
# These optional dependencies are for building the
4244
# application as a part of a Github Action.
4345
ci = [
44-
'pyinstaller==6.3.*',
45-
'scipy==1.11.*',
46+
'pyinstaller==6.4.*',
47+
'scipy==1.12.*',
4648
'dephell_licenses>=0.1.7',
4749
'pywin32-ctypes>=0.2.0; platform_system == "win32"',
4850
'pypiwin32>=223; platform_system == "win32"',
@@ -137,11 +139,11 @@ config_control = 'InstallerControlScript.js'
137139
config_style = 'style.qss'
138140

139141
[ci.qtifw]
140-
version = '4.1.0'
142+
version = '4.6.1'
141143
https_mirrors = ['download.qt.io', 'ftp.fau.de/qtproject', 'mirrors.dotsrc.org/qtproject']
142144
base_path = 'official_releases/qt-installer-framework'
143145
file_name_base = 'QtInstallerFramework'
144-
file_platform = { macos = 'macOS-x86_64', ubuntu = 'linux-x64', windows = 'windows-x86' }
146+
file_platform = { macos = 'macOS-x64', ubuntu = 'linux-x64', windows = 'windows-x64' }
145147
file_ext = { macos = 'dmg', ubuntu = 'run', windows = 'exe' }
146148
installation_path = { macOS = '/Users/runner/Qt', Linux = '/home/runner/Qt', Windows = 'C:\Qt' }
147149

tools/Scripts/MakeInstaller.py

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,16 @@ def installerConfigXml():
129129
#'CreateLocalRepository': 'true',
130130
#'SaveDefaultRepositories': 'false',
131131
#'RepositorySettingsPageVisible': 'false',
132-
'RemoteRepositories': {
133-
'Repository': [
134-
{
135-
'Url': onlineRepositoryUrl(),
136-
'DisplayName': f'{CONFIG.app_name} {CONFIG.setup_os}_{CONFIG.setup_arch} repository',
137-
'Enabled': 1,
138-
}
139-
]
140-
},
132+
# Commented out for now. Remember we want to have a common set of tools/.. for all EasyApplications
133+
# 'RemoteRepositories': {
134+
# 'Repository': [
135+
# {
136+
# 'Url': onlineRepositoryUrl(),
137+
# 'DisplayName': f'{CONFIG.app_name} {CONFIG.setup_os}_{CONFIG.setup_arch} repository',
138+
# 'Enabled': 1,
139+
# }
140+
# ]
141+
# },
141142
'MaintenanceToolName': maintenance_tool_name,
142143
'AllowNonAsciiCharacters': 'true',
143144
'AllowSpaceInPath': 'true',

0 commit comments

Comments
 (0)