Skip to content

Commit 0eb3dc4

Browse files
authored
Merge pull request #3166 from stfc/3120_sep25_release
(Closes #3120) sep25 release
2 parents 4d3ed3d + 59f040c commit 0eb3dc4

File tree

5 files changed

+55
-14
lines changed

5 files changed

+55
-14
lines changed
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Upload release to PyPI
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
pypi-publish:
9+
name: upload release to PyPI
10+
runs-on: ubuntu-latest
11+
# Specifying a GitHub environment is optional, but strongly encouraged
12+
environment: pypi_publishing
13+
permissions:
14+
# IMPORTANT: this permission is mandatory for Trusted Publishing
15+
id-token: write
16+
steps:
17+
# retrieve your distributions here
18+
- uses: actions/checkout@v3
19+
- name: Set up Python
20+
uses: actions/setup-python@v3
21+
with:
22+
python-version: '3.x'
23+
- name: Install dependencies
24+
run: |
25+
python -m pip install --upgrade pip
26+
pip install build
27+
- name: Build package
28+
run: python -m build --sdist --wheel
29+
- name: Publish package distributions to PyPI
30+
uses: pypa/gh-action-pypi-publish@release/v1

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
100) PR #3166 for #3120. Add GitHub release workflow and prepare for
2+
release 3.2.
3+
14
99) PR #3161 for #3155. Optimise InlineTrans to only to a copy of the
25
target routine instead of the whole Container.
36

external/fparser

Submodule fparser updated 117 files

setup.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,25 +51,33 @@
5151
"psyclone.tests.*"])
5252

5353
NAME = 'PSyclone'
54-
AUTHOR = ('Rupert Ford <rupert.ford@stfc.ac.uk>, '
54+
AUTHOR = ('Rupert Ford, '
5555
'Andrew Porter <andrew.porter@stfc.ac.uk>, '
56-
'Sergi Siso <sergi.siso@stfc.ac.uk>')
56+
'Sergi Siso <sergi.siso@stfc.ac.uk>, '
57+
'Joerg Henrichs <joerg.henrichs@bom.gov.au>')
5758
AUTHOR_EMAIL = 'andrew.porter@stfc.ac.uk'
5859
URL = 'https://github.com/stfc/psyclone'
5960
DOWNLOAD_URL = 'https://github.com/stfc/psyclone'
60-
DESCRIPTION = ('PSyclone - a compiler for Finite Element/Volume/Difference'
61-
' DSLs in Fortran')
61+
DESCRIPTION = ('PSyclone - a source-to-source and DSL Fortran compiler for '
62+
'HPC applications')
6263
LONG_DESCRIPTION = '''\
63-
PSyclone is a compiler for Fortran-embedded Domain Specific Languages
64-
targetting Finite Element/Volume/Difference methods in earth-system
65-
modelling.
64+
PSyclone is a source-to-source Fortran compiler designed to programmatically
65+
optimise, parallelise and instrument HPC applications via user-provided
66+
transformation scripts. It also supports domain-specific language extensions
67+
to the Fortran language, which simplify the implementation of Finite Element/
68+
Volume/Difference codes.
69+
70+
PSyclone is used by the UK Met Office in their new weather model, LFRic
71+
(https://www.metoffice.gov.uk/research/approach/modelling-systems/lfric), and
72+
by the NEMO ocean-modelling framework
73+
(https://sites.nemo-ocean.io/user-guide/psyclone.html).
6674
6775
See https://github.com/stfc/psyclone for more information.
6876
'''
6977
LICENSE = 'OSI Approved :: BSD 3-Clause License'
7078

7179
CLASSIFIERS = [
72-
'Development Status :: 3 - Alpha',
80+
'Development Status :: 5 - Production/Stable',
7381
'Environment :: Console',
7482
'Intended Audience :: Developers',
7583
'Intended Audience :: Science/Research',
@@ -161,7 +169,7 @@ def get_files(directory, install_path, valid_suffixes):
161169
classifiers=CLASSIFIERS,
162170
packages=PACKAGES,
163171
package_dir={"": "src"},
164-
install_requires=['pyparsing', 'fparser>=0.2.0', 'configparser',
172+
install_requires=['pyparsing', 'fparser>=0.2.1', 'configparser',
165173
'sympy', "Jinja2", 'termcolor', 'graphviz'],
166174
extras_require={
167175
'doc': ["sphinx", "sphinxcontrib.bibtex", "sphinx_design",

src/psyclone/version.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
doc/{user_guide,developer_guide,reference_guide/source}/conf.py '''
4141

4242
__MAJOR__ = 3
43-
__MINOR__ = 1
44-
__MICRO__ = 1
43+
__MINOR__ = 2
44+
__MICRO__ = 0
4545

46-
__SHORT_VERSION__ = f"{__MAJOR__:d}.{__MINOR__:d}-dev"
47-
__VERSION__ = f"{__MAJOR__:d}.{__MINOR__:d}.{__MICRO__:d}-dev"
46+
__SHORT_VERSION__ = f"{__MAJOR__:d}.{__MINOR__:d}"
47+
__VERSION__ = f"{__MAJOR__:d}.{__MINOR__:d}.{__MICRO__:d}"

0 commit comments

Comments
 (0)