Coder Social home page Coder Social logo

Replace black with ruff formatter about skeleton HOT 3 CLOSED

jaraco avatar jaraco commented on September 18, 2024
Replace black with ruff formatter

from skeleton.

Comments (3)

bswck avatar bswck commented on September 18, 2024

Based! 🚀

from skeleton.

jaraco avatar jaraco commented on September 18, 2024

While rolling this out, I've learned that the removal of the black badge triggers merge conflicts due to changes in the subsequent RTD badge (when it's been enabled downstream). The jaraco.develop routine that resolves the conflict ends up discarding the downstream change (causing the RTD badge to be commented out again if it had been uncommented).

from skeleton.

jaraco avatar jaraco commented on September 18, 2024

This is what the conflict looks like unresolved:

 path main @ git diff
diff --cc README.rst
index c8f71e1,2fabcf3..0000000
--- a/README.rst
+++ b/README.rst
@@@ -11,12 -11,8 +11,17 @@@
      :target: https://github.com/astral-sh/ruff
      :alt: Ruff
  
++<<<<<<< HEAD
 +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
 +   :target: https://github.com/psf/black
 +   :alt: Code style: Black
 +
 +.. image:: https://readthedocs.org/projects/path/badge/?version=latest
 +   :target: https://path.readthedocs.io/en/latest/?badge=latest
++=======
+ .. .. image:: https://readthedocs.org/projects/PROJECT_RTD/badge/?version=latest
+ ..    :target: https://PROJECT_RTD.readthedocs.io/en/latest/?badge=latest
++>>>>>>> b8c6c1530ef937521b60aabb0ecd98a8b5dca761
  
  .. image:: https://img.shields.io/badge/skeleton-2023-informational
     :target: https://blog.jaraco.com/skeleton

from skeleton.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.