Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Split python packages needed for RTD documentation builds out of the GCPy conda environment and into a separate environment; remove awscli #295

Merged
merged 6 commits into from
Feb 6, 2024

Conversation

yantosca
Copy link
Contributor

Name and Institution (Required)

Name: Bob Yantosca
Institution: Harvard + GCST

Confirm you have reviewed the following documentation

Describe the update

This PR does the following:

  1. Remove Python packages needed for ReadTheDocs documentation builds from docs/environment_files/environment.yml and adds them into a separate environment file docs/environment_files/read_the_docs_environment.yml.

    • This allows us to upgrade the packages needed for RTD to newer versions (and to Python 3.12) while keeping the GCPy environment pegged at Python 3.9.18.
    • This will also prevent dependabot from complaining that package versions such as jinja2 are out of date.
  2. Adds a GitHub action build-rtd-environment to test if a Mamba/Conda environment can be built from read_the_docs_environment.yml.

Expected changes

This is a zero-diff update w/r/t GCPy's plotting/computational functionality. It should also provide no difference w/r/t the ReadTheDocs documentation build. I have confirmed that the RTD documentation for GCPy can be built with the newer package versions.

Related Github Issue(s)

N/A

docs/environment_files/read_the_docs_environment.yml
- New Mamba/Conda environment file containing pegged package versions
  for ReadTheDocs documentation.  Uses Python 12 and more recent
  package versions, to avoid dependabot warnings.

docs/environment_files/environment.yml
docs/environment_files/testing.yml
- Removed RTD dependencies from these environment files

.github/workflows/build-rtd-environment.yml
- GitHub action to test if we can build a Mamba/Conda environment
  from read_the_docs_environment.yml

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca added category: Feature Request New feature or request TODO: Documentation Related to manual pages or other documentation labels Jan 31, 2024
@yantosca yantosca requested a review from msulprizio January 31, 2024 21:58
@yantosca yantosca self-assigned this Jan 31, 2024
.github/workflows/build-*-environment.yml
- Set "cache_environment: false".  This will prevent warnings that say
  that caches cannot be created.  This can happen if multiple instances
  of setup-micromamba are running (such as we have).

Signed-off-by: Bob Yantosca <[email protected]>
This was causing the CodeQL GitHub action not to run.

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca added the topic: User Environment Relating to python and/or conda environment label Feb 1, 2024
docs/environment_files/gcpy_environment.yml
- Renamed from docs/environment_files/environment.yml
- Removed awscli, since v2 is not available via PyPI anymore
- Updated comment header

docs/environment_files/gcpy_requirements.txt
- Added GCPy dependencies from gcpy_environment.yml here,
  but in PyPi "requirements.txt" form.

docs/enviroment_files/read_the_docs_environment.yml
- Updated comment header

docs/environment_files/read_the_docs_requirements.txt
- Added ReadTheDocs dependencies from gcpy_environment.yml here,
  but in PyPi "requirements.txt" form.

docs/environment_files/environment.yml
docs/environment_files/requirements.txt
- Removed

environment.yml
- Symbolic link to docs/environment_files/gcpy_environment.yml

requirements.txt
- Symbolic link to docs/environment_files/gcpy_requirements.txt

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca changed the title Split python packages needed for RTD documentation builds out of the GCPy conda environment and into a separate environment Split python packages needed for RTD documentation builds out of the GCPy conda environment and into a separate environment; remove awscli Feb 2, 2024
@yantosca yantosca requested review from lizziel and removed request for msulprizio February 2, 2024 20:56
@yantosca
Copy link
Contributor Author

yantosca commented Feb 2, 2024

Also see #299. The installation of geoschem-gcpy via pip fails due to the boneheaded decision by AWS not to publish awscli versions newer than 1.3.2 on PyPI. In this PR I have also updated the environment files to remove awscli from the list of GCPy dependencies.

.github/workflows/build-gcpy-environment.yml
- Changed filename "docs/environment_files/environment.yml" to
  "docs/environment_files.gcpy_environment.yml"

Signed-off-by: Bob Yantosca <[email protected]>
Copy link
Contributor

@lizziel lizziel left a comment

Choose a reason for hiding this comment

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

Looks great, just a typo to fix. Thanks for doing these updates!

CHANGELOG.md Outdated

### Fixed
- CS inquiry functions in `gcpy/cstools.py` now work properly for `xr.Dataset` and `xr.DataArray` objects
- Prevent an import error by using `seaborn-v0_8-darkgrid` in`gcpy/benchmark/modules/benchmark_models_vs_obs.py`

### Removed
- Python packages for RTD documenation builds from `docs/environment_files/environment.yml`
Copy link
Contributor

Choose a reason for hiding this comment

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

typo: documentation

CHANGELOG.md
- Moved a sentence about the RTD environment from the "Removed"
  section to the "Changed" section.

Signed-off-by: Bob Yantosca <[email protected]>
@yantosca yantosca merged commit db9064b into dev Feb 6, 2024
0 of 3 checks passed
@yantosca yantosca deleted the feature/separate-rtd-conda-env branch February 6, 2024 14:38
yantosca added a commit that referenced this pull request Feb 6, 2024
This merge brings the "dev" branch (as of the merge with PR #295)
into the feature/update-model-vs-obs (which far behind).

Signed-off-by: Bob Yantosca <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category: Feature Request New feature or request TODO: Documentation Related to manual pages or other documentation topic: User Environment Relating to python and/or conda environment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pip install geoschem-gcpy==1.4.2 fails with error due to awscli version
2 participants