From dbd47d18a1ccad75684a460c405e49104f1d77c6 Mon Sep 17 00:00:00 2001 From: Harrison Nicholls Date: Wed, 30 Oct 2024 18:55:16 +0000 Subject: [PATCH 1/3] Store version in janus module --- pyproject.toml | 4 ++-- src/janus/__init__.py | 3 +++ src/janus/utils/atmosphere_column.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 5b23cd7..9a41c52 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "fwl-janus" -version = "24.09.12" +version = "24.10.30" description = "Temperature structure generator for planetory atmospheres." readme = "README.md" authors = [ @@ -81,7 +81,7 @@ testpaths = ["tests"] [tool.bumpversion] # https://callowayproject.github.io/bump-my-version/howtos/calver/ -current_version = "24.09.12" +current_version = "24.10.30" parse = """(?x) # Verbose mode (?P # The release part (?:[1-9][0-9])\\. # YY. diff --git a/src/janus/__init__.py b/src/janus/__init__.py index e69de29..8abe076 100644 --- a/src/janus/__init__.py +++ b/src/janus/__init__.py @@ -0,0 +1,3 @@ +from __future__ import annotations + +__version__ = '24.10.30' diff --git a/src/janus/utils/atmosphere_column.py b/src/janus/utils/atmosphere_column.py index 56c217c..4406da2 100644 --- a/src/janus/utils/atmosphere_column.py +++ b/src/janus/utils/atmosphere_column.py @@ -4,6 +4,7 @@ import toml import numpy as np import netCDF4 as nc +from janus import __version__ from janus.utils import phys from janus.utils.height import integrate_heights import os, copy, platform, shutil @@ -406,7 +407,7 @@ def write_ncdf(self, fpath:str): # If os.getlogin() fails, try an alternative method username = pwd.getpwuid(os.getuid()).pw_name ds.username = str(username) - ds.JANUS_version = "24.09.12" + ds.JANUS_version = __version__ ds.SOCRATES_version = str(SOCRATES_version) ds.platform = str(platform.system()) ds.date = str(datetime.now().strftime('%Y-%m-%d %H:%M:%S')) From a33bbc68d58b6cfcfded580078f17c2400a7b4f7 Mon Sep 17 00:00:00 2001 From: Harrison Nicholls Date: Wed, 30 Oct 2024 19:01:50 +0000 Subject: [PATCH 2/3] chmod --- requirements_full.txt | 2 +- tools/clean_spectral_file.py | 0 tools/compute_wtg.py | 0 tools/generate_requirements_txt.py | 0 tools/generate_spectral_file.py | 0 5 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 tools/clean_spectral_file.py mode change 100644 => 100755 tools/compute_wtg.py mode change 100644 => 100755 tools/generate_requirements_txt.py mode change 100644 => 100755 tools/generate_spectral_file.py diff --git a/requirements_full.txt b/requirements_full.txt index 8fe6dec..740ce92 100644 --- a/requirements_full.txt +++ b/requirements_full.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements_full.txt pyproject.toml # -certifi==2024.6.2 +certifi>=2024.07.04 # via # netcdf4 # requests diff --git a/tools/clean_spectral_file.py b/tools/clean_spectral_file.py old mode 100644 new mode 100755 diff --git a/tools/compute_wtg.py b/tools/compute_wtg.py old mode 100644 new mode 100755 diff --git a/tools/generate_requirements_txt.py b/tools/generate_requirements_txt.py old mode 100644 new mode 100755 diff --git a/tools/generate_spectral_file.py b/tools/generate_spectral_file.py old mode 100644 new mode 100755 From 119a2e2cbb239dc930ee8e397118d60180fb4308 Mon Sep 17 00:00:00 2001 From: Harrison Nicholls Date: Wed, 30 Oct 2024 19:04:41 +0000 Subject: [PATCH 3/3] Workflow version --- .github/workflows/publish.yaml | 2 +- .github/workflows/tests.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 9ab1d3c..61efe9f 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -15,7 +15,7 @@ jobs: id-token: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.12' diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index eba41c3..83ed909 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v4 @@ -31,7 +31,7 @@ jobs: repository: 'nichollsh/SOCRATES' path: 'SOCRATES' - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-socrates with: path: | @@ -54,7 +54,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-virtualenv with: path: ${{ env.pythonLocation }} @@ -65,7 +65,7 @@ jobs: run: | python -m pip install -e .[develop] - - uses: actions/cache@v3 + - uses: actions/cache@v4 id: cache-fwl-data with: path: /home/runner/work/fwl_data