Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge PACE #167

Merged
merged 82 commits into from
Dec 3, 2017
Merged

Merge PACE #167

merged 82 commits into from
Dec 3, 2017

Conversation

wtgee
Copy link
Member

@wtgee wtgee commented Dec 3, 2017

Merges the PACE history into POCS.

Arduino files are placed in $POCS/resources/arduino_files

Note: Should not be squashed.

panoptes and others added 30 commits October 2, 2013 14:21
…xpose, cancel, query), but needs query and cancel to be written.
Added Test_DSLR.py python script to send command string to Arduino.
…mit has a timing problem and the exposure times are way off.
@wtgee wtgee requested a review from a team December 3, 2017 07:13
@codecov
Copy link

codecov bot commented Dec 3, 2017

Codecov Report

Merging #167 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           develop    #167   +/-   ##
=======================================
  Coverage     80.6%   80.6%           
=======================================
  Files           36      36           
  Lines         2527    2527           
  Branches       319     319           
=======================================
  Hits          2037    2037           
  Misses         386     386           
  Partials       104     104

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a436f2a...58b0fc6. Read the comment docs.

Copy link
Contributor

@jamessynge jamessynge left a comment

Choose a reason for hiding this comment

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

I can't readily tell if there are any changes to these files being moved into this repo, except for their locations. Are there?

@@ -1,4 +1,6 @@
## [Unreleased]
### Added
Copy link
Contributor

Choose a reason for hiding this comment

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

FYI, I'm a bit skeptical about using a file like this for tracking major changes that should be included release notes. One issue is that we'll have frequent conflicts on this file as there will be many changes at the same point in the file.

I wonder if using the github PR "labels" feature would be useful here (e.g. mark new features with FEATURE and mark notable bug fixes with BUGFIX). Thoughts?

Copy link
Member Author

Choose a reason for hiding this comment

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

Essentially these are the release notes.

I couldn't quite figure out what to do about the frequent conflicts either. It's an issue when there are multiple outstanding Feature PRs that you want to merge at once.

The idea is to alleviate the work on whomever is doing the release so they don't have to dig back through everything that has been changed since last release.

Definitely open to other suggestions.

@wtgee
Copy link
Member Author

wtgee commented Dec 3, 2017

There are files removed but nothing is changed.

@wtgee wtgee merged commit 6840576 into panoptes:develop Dec 3, 2017
@wtgee wtgee deleted the merge-PACE branch December 3, 2017 22:31
@wtgee wtgee mentioned this pull request Dec 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants