Skip to content

Commit

Permalink
Merge pull request atmtools#226 from lkluft/housekeeping
Browse files Browse the repository at this point in the history
Housekeeping
  • Loading branch information
lkluft authored Jul 4, 2024
2 parents 21e6c81 + a0f449e commit 43900e4
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 22 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build-book.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,24 @@ jobs:
python-version: ["3.11"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies with pip
run: |
python -m pip install --upgrade pip
python -m pip install wheel
python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt
TARGET=HASWELL python -m pip install .[docs]
python -m pip list
- name: build book
run: |
conda info
jupyter-book build -W -n --keep-going howto
- name: Archive build artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: always()
with:
name: build
Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
name: [ubuntu, macos]
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11"]

include:
- name: ubuntu
Expand All @@ -21,24 +21,33 @@ jobs:
os: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Install GCC (MacOS)
- name: Install CliMT (MacOS)
if: matrix.name == 'macos'
env:
CC: gcc-12
FC: gfortran-12
TARGET: HASWELL
run: |
brew install gcc@12
echo "CC=gcc-12" >> $GITHUB_ENV
echo "FC=gfortran-12" >> $GITHUB_ENV
python -m pip install --upgrade pip wheel
python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt
- name: Install
- name: Install CliMT (Linux)
if: matrix.name == 'ubuntu'
run: |
python -m pip install --upgrade pip wheel
TARGET=HASWELL python -m pip install -v .[docs,tests]
python -m pip install git+https://github.com/atmtools/climt@rrtmg-only --no-binary climt
- name: Install
run: |
python -m pip install -v .[docs,tests]
python -m pip list
- name: Lint with flake8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
deploy:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: Install dependencies
Expand Down
7 changes: 1 addition & 6 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@ version: 2
sphinx:
configuration: docs/source/conf.py

# Workaround to enable Python 3.9
# https://github.com/readthedocs/readthedocs.org/issues/7554#issuecomment-785114155
build:
image: testing

# Pyhton settings
python:
version: 3.9
version: 3.10
install:
- method: pip
path: .
Expand Down
5 changes: 2 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@ long_description_content_type = text/markdown
classifiers =
Intended Audience :: Science/Research
License :: OSI Approved :: MIT License
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
[options]
python_requires = >=3.9
python_requires = >=3.10
packages = find_namespace:
include_package_data = True
install_requires =
ipython!=8.7.0
matplotlib>=2.0.0
matplotlib>=2.0.0,<3.9
netcdf4>=1.2.7
numpy>1.22.0
scipy>=0.19.0
Expand Down

0 comments on commit 43900e4

Please sign in to comment.