Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/create-conda-envs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
python: ['3.9']
python: ['3.x']
steps:
- name: checkout cylc-doc
uses: actions/checkout@v5
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: configure python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.x'

- name: configure git
uses: cylc/release-actions/configure-git@v1
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
uses: ./docs/.github/actions/create-conda-envs
if: ${{ ! inputs.skip_conda_environment_check }}
with:
python_version: '3.9'
python_version: '3.x'
working_directory: ./docs

- name: checkout gh-pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: configure python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.x'

- name: checkout cylc-doc
uses: actions/checkout@v5
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
- name: configure python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.x'

- name: configure node
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: 'lts/*'

- name: checkout cylc-doc
uses: actions/checkout@v5
Expand Down Expand Up @@ -80,8 +80,9 @@ jobs:
print(enchant.list_dicts())

- name: build & test
# TODO: re-enable spelling when https://github.com/sphinx-contrib/spelling/issues/234 fixed
run: |
make html spelling linkcheck \
make html linkcheck \
SPHINXOPTS='-Wn --keep-going' FORCE_COLOR=true

- name: debug sphinx failure
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/undeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: configure python
uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.x'

- name: configure git
uses: cylc/release-actions/configure-git@v1
Expand Down
18 changes: 6 additions & 12 deletions bin/version
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import json
import pathlib
import sys

from pkg_resources import parse_version
from packaging.version import Version


DUMMY_FORMATS = [
Expand Down Expand Up @@ -66,10 +66,7 @@ def ls(args):

def tidy(args):
# get list of documented versions
versions = [
parse_version(version)
for version in get_formats(args.builddir)
]
versions = [Version(version) for version in get_formats(args.builddir)]

# build dictionary of minor versions
# versions = [<Version('1.0.1')>, <Version('1.0.2')>]
Expand All @@ -78,17 +75,14 @@ def tidy(args):
# }
minor_versions = {}
for version in versions:
release = version._version.release
if len(release) > 2:
major_minor = release[:2]
if major_minor not in minor_versions:
minor_versions[major_minor] = []
minor_versions[major_minor].append(version)
if len(version.release) > 2:
major_minor = version.release[:2]
minor_versions.setdefault(major_minor, []).append(version)

# pull out the versions we don't want any more
# e.g from ['1.0.1', '1.0.2', '1.0.3'] pull out ['1.0.1', '1.0.2']
tidy = []
for major_minor, versions in minor_versions.items():
for _major_minor, versions in minor_versions.items():
if len(versions) > 1:
versions.sort()
tidy.extend(versions[:-1])
Expand Down
4 changes: 1 addition & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ classifiers =
License :: OSI Approved :: GNU General Public License v3 (GPLv3)
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3 :: Only
Programming Language :: Python :: Implementation :: CPython
Topic :: Scientific/Engineering :: Atmospheric Science
Expand All @@ -50,7 +48,7 @@ install_requires =
cylc-sphinx-extensions>=1.4.1
eralchemy==1.2.*
hieroglyph>=2.1.0
setuptools>=50
packaging
sphinx>=7.1, !=7.4.4
sphinx-copybutton
sphinx-design>=0.5.0
Expand Down
14 changes: 4 additions & 10 deletions src/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,12 @@ Quick Installation

Cylc runs on Unix-like systems including Linux and Mac OS.

Via Conda (recommended)
^^^^^^^^^^^^^^^^^^^^^^^

.. admonition:: Supported Python versions

* cylc-flow supports Python 3.8+.
* cylc-uiserver supports Python 3.9+.
Cylc supports Python 3.12+.

Via Conda (recommended)
^^^^^^^^^^^^^^^^^^^^^^^

.. tip::

Expand Down Expand Up @@ -46,11 +45,6 @@ Via Conda (recommended)
Via Pip (+npm)
^^^^^^^^^^^^^^

.. admonition:: Supported Python versions

* cylc-flow supports Python 3.7+.
* cylc-uiserver supports Python 3.9+.

.. important::

We recommend installing Cylc versions into virtual environments.
Expand Down
4 changes: 2 additions & 2 deletions src/lib/cylc_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from cylc.flow import __version__

from pkg_resources import parse_version
from packaging.version import Version


def pinned_version(version):
Expand Down Expand Up @@ -31,7 +31,7 @@ def pinned_version(version):
'8.0rc1'

"""
ver = parse_version(version)
ver = Version(version)
if ver.pre and ver.minor == 0 and ver.micro == 0:
# special handling of major version pre-releases
ret = (ver.major, str(ver.minor) + ''.join(map(str, ver.pre)))
Expand Down
14 changes: 14 additions & 0 deletions src/reference/changes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ For more detail see the component changelogs:

----------

Cylc 8.6
--------

.. TODO: Modify these URL's and uncomment this block before release

.. admonition:: Cylc Components
Expand All @@ -33,6 +36,13 @@ For more detail see the component changelogs:
:cylc-rose: `1.5 <https://github.com/cylc/cylc-rose/blob/master/CHANGES.md>`__
:rose: `2.4 <https://github.com/metomi/rose/blob/master/CHANGES.md>`__

Supported Python versions
^^^^^^^^^^^^^^^^^^^^^^^^^

The minimum supported Python version is now 3.12.


----------

Cylc 8.5
--------
Expand Down Expand Up @@ -282,6 +292,8 @@ configurations in
`tornado <https://www.tornadoweb.org/en/stable/web.html#tornado.web.Application.settings>`_.


----------

Cylc 8.4
--------

Expand Down Expand Up @@ -391,6 +403,8 @@ An info view has been added, displaying
:width: 80%


----------

Cylc 8.3
--------

Expand Down
Loading