Skip to content

Upstream integration #6

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.

Sign up for GitHub

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

Jump to bottom
Open
tacaswell wants to merge 87 commits into
base: master
Choose a base branch
from
Open

Upstream integration #6

tacaswell wants to merge 87 commits into from

Conversation

@tacaswell
Copy link

@tacaswell tacaswell commented Jan 31, 2016

Move a whole bunch of code written at NSLS-II (and in production) upstream so we stop maintaining an un-merged fork.

This adds:

  • a bunch of ipython magics + convenience functions for throwing entries at olog from the python prompt
  • python 3 compatibility (I think it is also python2 compatible, but all of our production installations of pyolog at NSLS-II are running py3.4+)

@stuwilkins
Modified to correctly install script
bb5d70d
@stuwilkins
Added option to supply filename for attachmnet to allow use of string
35048a9
@stuwilkins
Added conda-recipie (not tested yet)
df2a513
@stuwilkins
Added blank files for API and IPython extension
08fa22e
@stuwilkins
Initial Rebuild
9755a93
@stuwilkins
Checkin with new version. Major changes to structure
1193157
@stuwilkins
Added "magic" for ipython
741eeea
@stuwilkins
Added *.swo
da2a0cb
@stuwilkins
DOC : Added documentation
6f7f00c
@stuwilkins
Moved simple API to root of module
f5d709a
@stuwilkins
API : Updated to new API
24f5767
@stuwilkins
API : Changed to SimpleOlogClient
93167a1
@stuwilkins
API : Added OlogHander (to use with python logging)
41f0dfc
@stuwilkins
Added example for python logging
a1672e1
@stuwilkins
MNT : Removed default logging
b71a26c
@stuwilkins
Updated logger to use getMessage()
7def13e
@stuwilkins
Fixed formatting of log message
e324368
@stuwilkins
Moved utility to open editor to utils
2f9ecdc
@stuwilkins
Added magic to capture command output and add to log
a013f96
@stuwilkins
Create README.md
b40ce99
@stuwilkins
Fixed script to correctly use tags and logbooks with SimpleParser
7c875ad
@stuwilkins
Added message to get_text_from_editor
02801d2
@stuwilkins
Merge branch 'master' of https://github.com/NSLS-II-CSX/pyOlog
c320e58
@stuwilkins
Added save_pyplot_figure
afa9ece
@stuwilkins
Added prepend and postpend messages
7dde871
@stuwilkins
Rebuilt ipy module with magics and helper function
970d1fe
@stuwilkins
DOC : Added docstrings to magic functions
470d2a2
@stuwilkins
Added thumbnail image to savefig along with PDF copy to Olog
8130885
@stuwilkins
Fixed some bugs
7845bcd
@stuwilkins
Bug Fix
ee734ad
stuwilkins and others added 23 commits December 28, 2014 13:14
@stuwilkins
Refactored as per PEP8
8077aa1
@stuwilkins
Removed doxy stuff
b1ea1a8
@stuwilkins
Removed Std Log
c9ee8d9
@stuwilkins
Fixed attachment and completed doc strings
f4b1101
@tacaswell
MNT : Ensure have_keyring is always defined
1b2f652
@tacaswell
MNT : python3 compatibility changes
70a6de7
@stuwilkins
Merge pull request #1 from tacaswell/log_entry_norm
5d6f8c2 
Log entry norm
@stuwilkins
Fixed docstrings
f4f1b70
@stuwilkins
Fixed bug where None for text field was unallowed
3304fdc
@stuwilkins
Merge branch 'refactor' of https://github.com/NSLS-II-CSX/pyOlog into…
96dbb1a 
… refactor
@stuwilkins
Merge pull request #2 from NSLS-II-CSX/refactor
099076b 
Refactor - Merge to get snapshot of now
@stuwilkins
BUG : Fixed None on log message
e73e63d
@stuwilkins
Merge branch 'master' of https://github.com/NSLS-II-CSX/pyOlog
f2972c6
@stuwilkins
Fixed setup.py
a2f2944
@stuwilkins
Fixed setup.py
cfd6b2a
@stuwilkins
Merge branch 'master' of https://github.com/NSLS-II-CSX/pyOlog
e5b0507
@tacaswell
MNT: more py3k compatibility fixes
be199dc
@tacaswell
MNT: use items
e7f5e7b 
Not worrying about py2k performance.
@tacaswell
MNT: yet more py3k
0f9a6b6
@tacaswell
MNT: yet py3k
b70dd21 
Open a text file, not as binary file
@stuwilkins
Merge pull request #3 from tacaswell/mnt_more_py3k
1a24409 
MNT: more py3k compatibility fixes
@tacaswell
FIX: handle ctrl-c during grabit
338f1a5
@danielballan
Merge pull request #1 from tacaswell/fix_grabit_cancel
4a0581d 
FIX: handle ctrl-c during grabit
@tacaswell tacaswell mentioned this pull request Jan 31, 2016
Closed
@tacaswell
Copy link
Author

tacaswell commented Jan 31, 2016

attn @stuwilkins

@danielballan
Copy link

danielballan commented Jan 31, 2016

It's important to notice that, in the service making the code more Pythonic (state="Active" -> active=True) and PEP8-compliant (getFilePost -> get_file_post), the NSLS-II fork diverged severely from upstream and would probably break quite a lot of user code. This would have to be merged selectively or as part of a major version bump with a list of API changes.

berryma4
berryma4 reviewed Jan 31, 2016
View reviewed changes
conda-recipie/meta.yaml
Copy link
Member

@berryma4 berryma4 Jan 31, 2016

Choose a reason for hiding this comment

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

Change?

@berryma4
Copy link
Member

berryma4 commented Jan 31, 2016

@shroffk

@berryma4 berryma4 requested a review from shroffk September 13, 2017 13:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@shroffk shroffk Awaiting requested review from shroffk

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tacaswell @danielballan @berryma4 @stuwilkins