Skip to content

Remove broken Tidelift logo url#816

Open
julianz- wants to merge 1 commit intocherrypy:mainfrom
julianz-:fix-tidelift-logo
Open

Remove broken Tidelift logo url#816
julianz- wants to merge 1 commit intocherrypy:mainfrom
julianz-:fix-tidelift-logo

Conversation

@julianz-
Copy link
Member

@julianz- julianz- commented Feb 25, 2026

What kind of change does this PR introduce?

  • 🐞 bug fix
  • 🐣 feature
  • 📋 docs update
  • 📋 tests/coverage improvement
  • 📋 refactoring
  • 💥 other

📋 What is the related issue number (starting with #)
#812

Resolves #

What is the current behavior? (You can also link to an open issue here)
#812

What is the new behavior (if this is a feature change)?
#812

📋 Other information:

📋 Contribution checklist:

(If you're a first-timer, check out
this guide on making great pull requests)

  • I wrote descriptive pull request text above
  • I think the code is well written
  • I wrote good commit messages
  • I have squashed related commits together after
    the changes have been approved
  • Unit tests for the changes exist
  • Integration tests for the changes exist (if applicable)
  • I used the same coding conventions as the rest of the project
  • The new code doesn't generate linter offenses
  • Documentation reflects the changes
  • The PR relates to only one subject with a clear title
    and description in grammatically correct, complete sentences

@codecov
Copy link

codecov bot commented Feb 25, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.19%. Comparing base (4bb134f) to head (f4487aa).
✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #816      +/-   ##
==========================================
- Coverage   78.21%   78.19%   -0.03%     
==========================================
  Files          41       41              
  Lines        4788     4788              
  Branches      547      547              
==========================================
- Hits         3745     3744       -1     
  Misses        905      905              
- Partials      138      139       +1     

@webknjaz
Copy link
Member

  • [ X] 🐞 bug fix

@julianz- ^ when you have a whitespace in there, it doesn't render as a checkbox. Try fixing it in the PR description?

README.rst Outdated
.. _Tidelift Subscription: https://tidelift.com/subscription/pkg/pypi-cheroot?utm_source=pypi-cheroot&utm_medium=referral&utm_campaign=readme

.. |tideliftlogo| image:: https://cdn2.hubspot.net/hubfs/4008838/website/logos/logos_for_download/Tidelift_primary-shorthand-logo.png
.. |tideliftlogo| image:: https://tidelift.com/badges/package/pypi/cheroot
Copy link
Member

Choose a reason for hiding this comment

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

I don't think we should have a duplicate badge in this place — it's already present at the top of the document.

How about integrating a Sphinx extension following what's done in pypa/setuptools@918a415 instead? We could drop this section from the readme that's rendered on GH but keep it integrated in the Sphinx docs (the directive from jaraco's extension would go into docs/index.rst).

Copy link
Member Author

Choose a reason for hiding this comment

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

There are a couple of issues in doing this:

  1. I believe removing the Enterprise section from README.rst would mean it will no longer appear on the PyPI page. Is that acceptable?
  2. Moving the Enterprise section to docs/index.rst would change the order in which things appear here. I guess it would have to go under the license. Again is that acceptable?

Copy link
Member

@webknjaz webknjaz Feb 26, 2026

Choose a reason for hiding this comment

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

Yeah, that should be fine — though, we could either include a text paragraph of have an additional document listed @

file = "README.rst"
setuptools has a feature to merge multiple documents into the metadata (https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html#dynamic-metadata). Actually, that ToC at the end of the index page on RTD is rather weird. Ideally, it shouldn't duplicate the left sidebar — perhaps, we could remove it. Not sure what causes it appearing in there.

Anyway, I'm good with either a text paragraph in readme or none at all. No logo in both cases, only in the Sphinx docs. Another alternative could be integrating cogapp (I think examples of it would be found in the attrs and coveragepy repos). But for now, I just want Sphinx to stop failing and thats my primary motivation.

Copy link
Member Author

@julianz- julianz- Feb 27, 2026

Choose a reason for hiding this comment

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

I removed the logo from Enterprise section of README.rst. Adding the logo to docs/index.rst instead is not really viable unless we also move the Enterprise section out of the README. I also removed the duplicated ToC in the RTD and some additional stuff called Indices and tables. Is that actually needed?

I also added:

"Source" = "https://github.com/cherrypy/cheroot" 

to the [project.urls] in pyproject.toml as its absence was causing another linter error. Maybe there's been a change of version that brought this issue to light? Should this go in a separate PR?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I'd rather go with atomic PRs. We can force-merge if the CI's temporarily unhappy. Worst case, we could have PRs with multiple atomic commits and multiple change notes but those are more difficult to track/reason about and more small details often end up blocking parts of the patch that could be merged sooner.

@julianz- julianz- force-pushed the fix-tidelift-logo branch 4 times, most recently from 4fe9983 to cee11d0 Compare February 27, 2026 07:11
@julianz- julianz- changed the title Update the Tidelift banner with a working logo Remove non-functioning Tidelift logo url Feb 27, 2026
@@ -0,0 +1,3 @@
Removed non-functioning Tidelift Logo url from README.rst.
Copy link
Member

@webknjaz webknjaz Feb 27, 2026

Choose a reason for hiding this comment

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

If you want to reference a file in RST, you can use roles like

Suggested change
Removed non-functioning Tidelift Logo url from README.rst.
Removed the non-functioning Tidelift logo URL from :file:`README.rst`.

Though, since the change log is supposed to be more high-level, instead of files we could be talking about the effect the users would observe.

Suggested change
Removed non-functioning Tidelift Logo url from README.rst.
Removed the malfunctioning Tidelift logo URL from the project description metadata.

@webknjaz
Copy link
Member

Resolves #

Keywords like this can be used to auto-close issues/PRs once this PR is merged. But only if you actually fill out the issue number to close after #, not on a previous line: https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests

pure-Python HTTP server used by `CherryPy <https://www.cherrypy.dev>`_.


Indices and tables
Copy link
Member

Choose a reason for hiding this comment

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

We may want to keep this. It may be good for navigation (or for web spiders crawling the URLs). Something to discuss separately.

.. toctree::
:maxdepth: 1
:glob:
:hidden:
Copy link
Member

Choose a reason for hiding this comment

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

Oh, I'd forgotten about this solution. Of course, its should go into a separate PR. If you're up it, feel free to send the same fix to my octomachinery project.


Tip

Additionally, I've here's a few Sphinx docs examples to bookmark:

We can later borrow some nice ideas from these — like an additional MyST-Parser integration and partial inclusion of README/CONTRIBUTING/LICENSE files into Sphinx docs, plus the ability to mix RST+MD in the same Sphinx project.

In general, I'm usually trying to sync bits of the project structure/layout across the repos I'm involved in. So any change that can be scaled to other projects is usually considered through the prism of how easy it is to reproduce across the board with minimum effort.

Copy link
Member

Choose a reason for hiding this comment

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

I think I'd use the doc, or packaging, or even just contrib note category. Though, a case could be made for not having a change note for this bit at all.

If you believe that a patch truly does not need to show up in the change log, feel free to apply the bot:chronographer:skip label to PRs and the bot will stop complaining about a news fragment missing. Be ready to justify this, of course since sometimes I may have a different opinion and we'll need to agree on what to do.

@webknjaz webknjaz added the documentation Docs-related tasks label Feb 27, 2026
@webknjaz
Copy link
Member

@julianz- plz feel free to apply any labels you see fit on your own too.

@webknjaz webknjaz moved this to 🧐 @webknjaz's review queue 📋 in 📅 Procrastinating in public 😵‍💫 Feb 27, 2026
@julianz- julianz- force-pushed the fix-tidelift-logo branch 3 times, most recently from 0698ad7 to 9a36d02 Compare February 27, 2026 17:54
@webknjaz
Copy link
Member

Looks like you need to configure your text editor not to trim trailing LF @ EOF..

The linkcheck linter was failing due to the logo disappearing from the
old hosting. Kept the verbiage for Tidelift Enterprise support
but removed the logo.
@julianz- julianz- changed the title Remove non-functioning Tidelift logo url Remove broken Tidelift logo url Feb 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants