Skip to content

Maintenance updates#41

Merged
QSparks merged 33 commits into
masterfrom
py-sprint-25q1
Nov 4, 2025
Merged

Maintenance updates#41
QSparks merged 33 commits into
masterfrom
py-sprint-25q1

Conversation

@QSparks
Copy link
Copy Markdown
Contributor

@QSparks QSparks commented Jun 20, 2025 •
edited
Loading

  • PEP 621-conformant pyproject.toml
  • Poetry >2.0
  • ce>=3.6.6
  • Drop old setup files
  • Separate Black CI workflow
  • Enhanced logging
  • Use new PCIC_BLEND_v1 1981-2010 baseline
  • Use new 2030 climatologies
  • Use BC-regions-FNLF-84 polygons from GeoServer
  • Add First Nations territories and language families to the REGIONS dictionary
  • Bump CI workflows
  • Use marble-dev01 and Beehive URLs
  • Replace pkg_resources with importlib.resources

eyvorchuk and others added 30 commits February 14, 2022 10:56
@eyvorchuk
Temporarily allow slow tests for python-ci and use fileServer for THR…
2f3489d 
…EDDS root
@eyvorchuk
Use dodsC instead of fileServer for THREDDS root and mock urls
ce72869
@eyvorchuk
Use different databases for local and THREDDS files
30d6b07
@eyvorchuk
Add temporary test to ensure mock_url is registered
9f67ee5
@eyvorchuk
Mock out both http and OpenDAP requests
ad6fbfd
@eyvorchuk
Mock out geoserver url for local test
29dd4b7
@eyvorchuk
Temporarily omit python 3.6 and 3.7 for CI
02248a8
@eyvorchuk
Use mock.patch to mock openDAP requests using netCDF4.Dataset
2537e72
@eyvorchuk
Reuse python 3.6 and 3.7 for CI
b855d1c
@eyvorchuk
Use mock THREDDS root to test mock openDAP requests
791f2b5
@eyvorchuk
Clean up mock databases in conftest.py
95be083
@eyvorchuk
Create separate function to create modelmeta objects for both databases
2b964ce
@eyvorchuk
Omit slow tests for Python-CI in dev branches again
3a8d5cb
@eyvorchuk
Remove slow markers for local and basic resolve rules tests
ebc5b58
@eyvorchuk
Add docstrings for database fixtures and clean up conftest.py
70e59dc
@jameshiebert @QSparks
Upgrades to most recent climate explorer backend
db52813 
Upgrades ceb version and adds its new dependencies
@jameshiebert @QSparks
Fix one changed argument
f9d8c7b
@QSparks
Update rule engine for MBCn data
46f518f
@QSparks
WIP: dep updates, fix tests, use new PCIC_Blend baseline
dc382f5
@QSparks
Fix Python CI, remove old setup files
3338fe8
@QSparks
Add Black workflow and format files
09cec6c
@QSparks
Match setuptools version with modelmeta
dd4e2da
@QSparks
Use i7 branch for cf-cell-methods
a73e0d8
@QSparks
Downgrade sly to 0.4
f4d5df9
@QSparks
Use cmip6_mbcn default ensemble name and hist date range
8bc114c
@QSparks
Test with p2a_rules_cmip6_mbcn ensemble, add logging to filter_by_period
ab082c3
@QSparks
Run Black
7436761
@QSparks
Use tagged CE
6394f5d
@QSparks
Use CE 3.6.6 from PyPI
41bd6f5
@QSparks
Add collected vars logs with debug severity
ea9afdc
@QSparks QSparks requested review from Nospamas and corviday June 20, 2025 16:03
@QSparks QSparks self-assigned this Jun 20, 2025
rod-glover
rod-glover reviewed Jun 20, 2025
View reviewed changes
Comment thread .github/workflows/black.yml
- uses: actions/setup-python@v5
- uses: psf/black@stable
with:
options: "--check"
Copy link
Copy Markdown
Collaborator

@rod-glover rod-glover Jun 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version of black will eventually get out of step with the Poetry-installed version, and silently cause problems. That's why the check was in the python-ci action -- so the same version is used by both CI and local developers.

Copy link
Copy Markdown
Contributor Author

@QSparks QSparks Jul 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for flagging this. I've updated the workflow to read in the version defined in our pyproject.toml.

Nospamas
Nospamas approved these changes Nov 4, 2025
View reviewed changes
Copy link
Copy Markdown

@Nospamas Nospamas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments for a couple of potential cleaner options, but overall approved.

Comment thread .github/workflows/black.yml Outdated
run: pip install poetry

- name: Install Black based on pyproject.toml
run: |
Copy link
Copy Markdown

@Nospamas Nospamas Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if this meets the limit yet, but having a bunch of sh/python in a yaml file feels bad to me. might be worth extracting some or all of it to a nearby file (probably within workflows) and executing it from here.

Comment thread pyproject.toml
name = "p2a_impacts"
version = "0.4.0"
description = "Climate impacts engine for Plan2Adapt.ca"
authors = [{ name = "Nikola Rados", email = "nrados@uvic.ca" }]
Copy link
Copy Markdown

@Nospamas Nospamas Jul 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suspect this might need updating :)

@QSparks QSparks merged commit fe89aa6 into master Nov 4, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rod-glover rod-glover rod-glover left review comments

@Nospamas Nospamas Nospamas approved these changes

@corviday corviday Awaiting requested review from corviday

Assignees

@QSparks QSparks

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@QSparks @Nospamas @rod-glover @eyvorchuk @jameshiebert