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

Separate replace & shift function #349

Merged
merged 7 commits into from
Nov 26, 2016

Conversation

Syeberman
Copy link
Contributor

@Syeberman Syeberman commented Aug 12, 2016

This resolves the merge conflicts from #276. It also fixes (in b5eee6d) a bug in the quarters functionality, adds quarters to shift, and gets back to 100% code coverage.

Separating replace and shift functionality would save a lot of headaches!

sipp11 and others added 3 commits October 29, 2015 01:59
according to PR Request from issue arrow-py#220
Replace w/shift function will be removed in next release hopefully
…d sipp11:shift

Conflicts:
	arrow/arrow.py
	tests/arrow_tests.py
@codecov-io
Copy link

Current coverage is 100% (diff: 100%)

Merging #349 into master will not change coverage

@@           master   #349   diff @@
====================================
  Files           8      8          
  Lines        1244   1253     +9   
  Methods         0      0          
  Messages        0      0          
  Branches      193    193          
====================================
+ Hits         1244   1253     +9   
  Misses          0      0          
  Partials        0      0          

Powered by Codecov. Last update 319f2d0...c99b58f

@andrewelkins
Copy link
Contributor

I'll get this merged in tonight.

@andrewelkins andrewelkins merged commit ac0e403 into arrow-py:master Nov 26, 2016
samdroid-apps added a commit to samdroid-apps/arrow that referenced this pull request Jan 4, 2017
Commit 15d903a (from arrow-py#349), separated the replace and shift features
into two functions.  However the docs still show the old, deprecated and
more confusing use of replace to shift the time.
andrewelkins pushed a commit that referenced this pull request Jan 7, 2017
Commit 15d903a (from #349), separated the replace and shift features
into two functions.  However the docs still show the old, deprecated and
more confusing use of replace to shift the time.
@Syeberman Syeberman deleted the sipp11-shift branch May 11, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants