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

Django: link to 4.2 documentatoin #2476

Merged
merged 2 commits into from
Feb 18, 2025
Merged

Conversation

sbesson
Copy link
Member

@sbesson sbesson commented Feb 17, 2025

Noticed while writing ome/omero-web#608 (comment), the current OMERO documentation still points at the Django 1.11 documentation.

95080ea updated common/conf.py but it looks like this configuration file is either a no-op or overriden by omero/conf.py.

To reduce future confusion, bb89a34 proposes to remove this duplication configuration file.

Also cull links to obsolete Django versions
@sbesson sbesson requested review from jburel and will-moore February 17, 2025 09:29
@snoopycrimecop
Copy link
Member

snoopycrimecop commented Feb 17, 2025

Conflicting PR. Removed from build OMERO-docs#338. See the console output for more details.
Possible conflicts:

--conflicts Conflict resolved in build OMERO-docs#339. See the console output for more details.

@will-moore
Copy link
Member

Changes look good. Tried running the build job to check at https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-docs/338/artifact/ but conflict prevented inclusion.

@sbesson
Copy link
Member Author

sbesson commented Feb 17, 2025

Thanks, this is conflicting with #2473 which is also modifying both configuration files. To ease the review and integration process, I have pushed bb89a34 away and limited the scope to the Django 4.2 documentation link. The removal of the superfluous (?) configuration file can be assessed separately.

@will-moore
Copy link
Member

Re-ran the build, which failed on "ajax". I guess that term is a little dated now!

10:52:28 (developers/Web/CSRF: line   10) ok        https://docs.djangoproject.com/en/4.2/ref/csrf/
10:52:28 (developers/Web/CSRF: line   45) broken    https://docs.djangoproject.com/en/4.2/ref/csrf/#ajax - Anchor 'ajax' not found

@sbesson
Copy link
Member Author

sbesson commented Feb 17, 2025

Agreed, since it looks like they have split the CSRF documentation between reference and how-to guide. I have updated the AJAX link to point to the latter

Copy link
Member

@will-moore will-moore left a comment

Choose a reason for hiding this comment

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

Build output looks good, Django doc links to 4.2 as expected. https://merge-ci.openmicroscopy.org/jenkins/job/OMERO-docs/340/artifact/

@jburel jburel merged commit 930cd13 into ome:develop Feb 18, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants