Code Monkey home page Code Monkey logo

Comments (6)

esc avatar esc commented on July 22, 2024

See PR #13 for the setup.

from python-blosc.

esc avatar esc commented on July 22, 2024

See PR #14 for the submodule version.

from python-blosc.

esc avatar esc commented on July 22, 2024

See PR #15 for the subtree version.

from python-blosc.

esc avatar esc commented on July 22, 2024

So, now for some discussion.

The submodule requires additional commands of those users who checkout the repository. However, the sources themselves are never actually checked into the repository. The subtree merge requires additional commands on the side of the person merging the sources from upstream. In the current instructions, I have chosen to use --squash, which means that each time a new Blosc version is merged, all the new commits are squashed into a single commit. In previous versions of the subtree merge approach, all commits in the history would be merged. This was sometimes confusing because the history of the original project would be quite polluted even with tags of the merged project. To clarify what an update would look like, the most recent commit of #15 is a merge from master. One advantage of the subtree merge is, that the users need not worry about anything, since the sources are part of this project. On the downside of course, the sources are actually checked in to the repository, but this shouldn't be too bad since Blosc sources are quite small.

Perhaps you should clone my fork into /tmp when testing these approaches, since the submodule approach may do weird things, when switching branches, esp. if the new branch doesn't use submodules.

from python-blosc.

esc avatar esc commented on July 22, 2024

We have decided to go with the subtree approach, see #15 and #23.

from python-blosc.

FrancescAlted avatar FrancescAlted commented on July 22, 2024

Subtree approach introduced in commit 77ca657

from python-blosc.

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.