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

Abstract miniconda.rst template #869

Merged
merged 4 commits into from
Jul 6, 2023

Conversation

marcoesters
Copy link
Contributor

Description

The current jinja2 template requires a lot of manual labor to update. To remove or add a python version, the template needs to be changed in multiple places and the create_miniconda_rst.py file needs to be updated, which is error prone. Currently, miniconda.rst does not correspond to the jinja2 file anymore either.

This PR abstracts the jinja2 template to minimize the number of changes needed for updating the release tables.

Changes:

  • Abstract the jinja2 template for Miniconda installers
  • Get the release date from the time stamps stored in the files.json file.

Notable differences in the output:

  • The AMD part for Apple M1 installers is removed and is now consistent with the "latest" Miniconda description.
  • The Windows installers are rearranged to be formatted like Linux and macOS.

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@marcoesters marcoesters changed the title Abstract miniconda rst Abstract miniconda.rst template Jul 5, 2023
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jul 5, 2023
@@ -56,29 +56,29 @@ Windows installers

Python 3.10,`Miniconda3 Windows 64-bit <https://repo.anaconda.com/miniconda/Miniconda3-py310_23.3.1-0-Windows-x86_64.exe>`_,53.9 MiB,``307194e1f12bbeb52b083634e89cc67db4f7980bd542254b43d3309eaf7cb358``
Python 3.9,`Miniconda3 Windows 64-bit <https://repo.anaconda.com/miniconda/Miniconda3-py39_23.3.1-0-Windows-x86_64.exe>`_,53.7 MiB,``155958e7922d8b7aa6cb3115aeb66d2efcdae1237a6f1c11e23ca75ea96d291a``
,`Miniconda3 Windows 32-bit <https://repo.anaconda.com/miniconda/Miniconda3-py39_23.3.1-0-Windows-x86.exe>`_,67.8 MiB,``4fb64e6c9c28b88beab16994bfba4829110ea3145baa60bda5344174ab65d462``
Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like we're missing the Python version at the beginning of these additions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That is correct. It will end up looking like the macOS installers: https://docs.conda.io/en/latest/miniconda.html#macos-installers

Right now, Windows is the only platform that doesn't sort by python version, but by platform, which is inconsistent.

To be honest, I wouldn't be against removing win-32 entirely. It hasn't been supported in a while.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, gotcha. I forgot these lists were creating tables.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I did just notice that the Miniconda version for win-32 was not correct though. I fixed that part.

kathatherine
kathatherine previously approved these changes Jul 5, 2023
Copy link
Contributor

@kathatherine kathatherine left a comment

Choose a reason for hiding this comment

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

👍

@marcoesters marcoesters merged commit e529e09 into conda:main Jul 6, 2023
1 check passed
@marcoesters marcoesters deleted the abstract-miniconda-rst branch July 6, 2023 23:15
@github-actions github-actions bot added the locked [bot] locked due to inactivity label Jul 6, 2024
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cla-signed [bot] added once the contributor has signed the CLA locked [bot] locked due to inactivity
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants