banesullivan / scooby

🐶 🕵️ Great Dane turned Python environment detective
MIT License
47 stars 12 forks source link

Bump main to 0.7.dev0 #90

Closed akaszynski closed 2 years ago

akaszynski commented 2 years ago

This follows the trunk based development release pattern used for PyVista by:

codecov-commenter commented 2 years ago

Codecov Report

Merging #90 (0ecfa87) into main (999d9ca) will increase coverage by 0.08%. The diff coverage is 79.45%.

@@            Coverage Diff             @@
##             main      #90      +/-   ##
==========================================
+ Coverage   87.15%   87.23%   +0.08%     
==========================================
  Files           4        4              
  Lines         366      384      +18     
==========================================
+ Hits          319      335      +16     
- Misses         47       49       +2     
akaszynski commented 2 years ago

So, for future reference to anyone doing this on their own (and writing it down in CONTRIBUTING, but I'm lazy/busy/procrastiworking):

prisae commented 2 years ago

Thanks @akaszynski !

akaszynski commented 2 years ago

Seems it worked: https://pypi.org/project/scooby/0.6.0/

prisae commented 2 years ago

But I think it did not propagate through to conda? Edit: It did, just took unusually long...

banesullivan commented 2 years ago

I'm not terribly excited about this... scooby sees few contributions (intentionally) and is fairly stable at this point. Having a release branch structure might be more overhead than it's worth as most of the time, we just add a change and push a patch release.

I'm happy to keep this structure if you two prefer it, but I have no intention of supporting more than one previous MINOR release. i.e. as soon as release/0.7 is created, I plan on deleting release/0.6

banesullivan commented 2 years ago

Love me some trunk-based development, but I also like to minimize overhead when maintaining smaller projects

prisae commented 2 years ago

I also think that scooby is so small that it probably never needs a patch release. If anything needs fixing it simply gives a new regular release. However, I have no strong opinion and am fine with either way.

akaszynski commented 2 years ago

The main reason why I think this is a good idea is so when we pip install -e . and I want to see what my current version of scooby is (at least with #91):

(.venv) () scooby $ python -c "import scooby; print(scooby.Report())"

--------------------------------------------------------------------------------
  Date: Tue Jul 26 18:52:53 2022 UTC

                OS : Linux
            CPU(s) : 16
           Machine : x86_64
      Architecture : 64bit
       Environment : Python

  Python 3.8.13 (default, Apr 19 2022, 02:32:06)  [GCC 11.2.0]

           IPython : 8.4.0
            scooby : 0.7.dev0
--------------------------------------------------------------------------------

I'm not even proposing that we maintain any old minor branches. Infact, a git merge main works just fine for the release branch, but the main branch shouldn't have a semantic version.

banesullivan commented 2 years ago

Sounds good to me then!

banesullivan commented 2 years ago

We could also get that with use_scm_version in setuptools though?

banesullivan commented 2 years ago

But that add setuptools-scm as a depend so no-go

prisae commented 2 years ago

True that, setuptools-scm would be a dependency...

prisae commented 2 years ago

No @banesullivan - It is only a build dependency, not a run dependency.

banesullivan commented 2 years ago

Then I'd be happy to use it, but as highlighted in the other thread -- let's keep it as simple as possible