Merge branch 'master' into 1.2.x-deconflict

cylc · Jul 18, 2023 · a8dc501 · a8dc501
2 parents ca95d8e + 9e7ae0d
commit a8dc501
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/2_auto_publish_release.yml b/.github/workflows/2_auto_publish_release.yml
@@ -38,7 +38,7 @@ jobs:
       uses: cylc/release-actions/build-python-package@v1
 
     - name: Publish distribution to PyPI
-      uses: pypa/[email protected].5
+      uses: pypa/[email protected].8
       with:
         user: __token__ # uses the API token feature of PyPI - least permissions possible
         password: ${{ secrets.PYPI_TOKEN }}

diff --git a/CHANGES.md b/CHANGES.md
@@ -6,7 +6,7 @@ creating a new release entry be sure to copy & paste the span tag with the
 updated. Only the first match gets replaced, so it's fine to leave the old
 ones in. -->
 
-## __cylc-rose-1.2.1 (<span actions:bind='release-date'>Upcoming</span>)__
+## __cylc-rose-1.3.0 (<span actions:bind='release-date'>Upcoming</span>)__
 
 ### Fixes
 

diff --git a/cylc/rose/__init__.py b/cylc/rose/__init__.py
@@ -205,4 +205,4 @@
 
 """
 
-__version__ = '1.2.1.dev'
+__version__ = '1.3.0.dev'
diff --git a/setup.cfg b/setup.cfg
@@ -55,8 +55,8 @@ packages = find_namespace:
 python_requires = >=3.7
 include_package_data = True
 install_requires =
-    metomi-rose==2.0.*
-    cylc-flow==8.1.*
+    metomi-rose==2.1.*
+    cylc-flow==8.2.*
     metomi-isodatetime
     jinja2
 

diff --git a/tests/functional/test_reinstall.py b/tests/functional/test_reinstall.py
@@ -38,7 +38,7 @@
 from cylc.flow.pathutil import get_workflow_run_dir
 from cylc.rose.utilities import (
     ROSE_ORIG_HOST_INSTALLED_OVERRIDE_STRING as ROHIOS)
-from cylc.flow.workflow_files import reinstall_workflow
+from cylc.flow.install import reinstall_workflow
 
 
 HOST = get_host()