search

BBN-Q / PyQLab

A python library for instrument control and superconducting QIP experiments.
Apache License 2.0
25 stars 11 forks source link

Update master branch #51

Closed matthewware closed 9 years ago

matthewware commented 9 years ago

It's been over a year since we merged changes on develop into master. I know a lot is changing at the moment, but should we update master at some point soon?

blakejohnson commented 9 years ago

Indeed, we seem overdue for a point release. I'd be happy to tag 1.2 today, but it will take a while to write the release notes.

caryan commented 9 years ago

Should we also switch to tagged releases and unstable master development style?

blakejohnson commented 9 years ago

Since this isn't a repo that produces binary releases, I would prefer to stick with the git-flow style and keep master in sync with the latest tagged release.

blakejohnson commented 9 years ago

I've pushed v2.0.