From a7fefbc7e1773b74dda66e9b51d83438accd6122 Mon Sep 17 00:00:00 2001 From: Claire Donnelly Date: Mon, 18 Mar 2024 13:07:09 +0100 Subject: [PATCH 1/4] Add M1 github actions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c877b9e..166d854 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'macos-14'] python-version: ['3.9', '3.10', '3.11'] env: MPLBACKEND: Agg # https://github.com/orgs/community/discussions/26434 From 39547137d03227ebde7ed12555f7c6b41bfe0928 Mon Sep 17 00:00:00 2001 From: Claire Donnelly Date: Mon, 18 Mar 2024 13:15:32 +0100 Subject: [PATCH 2/4] Exclude 3.9 for macos-14 --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 166d854..d2a204a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,6 +18,9 @@ jobs: matrix: os: ['ubuntu-latest', 'macos-latest', 'windows-latest', 'macos-14'] python-version: ['3.9', '3.10', '3.11'] + exclude: + - os: 'macos-14' + python-version: '3.9' env: MPLBACKEND: Agg # https://github.com/orgs/community/discussions/26434 steps: From dc5babfd7cb344ad2ce75dfb1ceb3f3b7777e2fe Mon Sep 17 00:00:00 2001 From: Claire Donnelly Date: Mon, 18 Mar 2024 13:25:19 +0100 Subject: [PATCH 3/4] python version and update links --- docs/project_setup.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/project_setup.md b/docs/project_setup.md index 9261f90..fafb39f 100644 --- a/docs/project_setup.md +++ b/docs/project_setup.md @@ -11,9 +11,9 @@ checklist](https://guide.esciencecenter.nl/#/best_practices/checklist). This repository is set up with Python versions: -- 3.8 - 3.9 - 3.10 +- 3.11 Add or remove Python versions based on project requirements. See [the guide](https://guide.esciencecenter.nl/#/best_practices/language_guides/python) for more information about Python @@ -52,7 +52,7 @@ help you decide which tool to use for packaging. - Documentation should be put in the `lilio/docs/` directory. The contents have been generated using `sphinx-quickstart` (Sphinx version 1.6.5). - We recommend writing the documentation using Restructured Text (reST) and Google style docstrings. - - [Restructured Text (reST) and Sphinx CheatSheet](https://thomas-cokelaer.info/tutorials/sphinx/rest_syntax.html) + - [Restructured Text (reST) and Sphinx CheatSheet](https://sphinx-tutorial.readthedocs.io/cheatsheet/) - [Google style docstring examples](http://sphinxcontrib-napoleon.readthedocs.io/en/latest/example_google.html). - The documentation is set up with the ReadTheDocs Sphinx theme. - Check out its [configuration options](https://sphinx-rtd-theme.readthedocs.io/en/latest/). From 2a291f87b890a533f3f548bfac176204b8de0621 Mon Sep 17 00:00:00 2001 From: Claire Donnelly Date: Wed, 27 Mar 2024 16:41:59 +0100 Subject: [PATCH 4/4] Updated change log --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df16d4e..40a23a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/). ### Fixed - Fixed issue with calendar generation when the (rightmost) target period crossed into the new year ([#70](https://github.com/AI4S2S/lilio/pull/70)). - Fixed issue with Pandas 2.2 where 'M' changed to 'ME' ([#72](https://github.com/AI4S2S/lilio/pull/72)) - - Fixed issue where pd.Interval now shows time where it is not wanted ([#72](https://github.com/AI4S2S/lilio/pull/72)). The issue was raised with Pandas ([#57748] https://github.com/pandas-dev/pandas/issues/57748). + - Fixed issue where pd.Interval now shows time where it is not wanted ([#72](https://github.com/AI4S2S/lilio/pull/72)). The issue was raised with Pandas ([#57748] https://github.com/pandas-dev/pandas/issues/57748). + - Added tests for latest version of macos (with M1 chips) ([#73](https://github.com/AI4S2S/lilio/pull/73)) ## 0.4.2 (2024-01-19) ### Changed