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

Fixes to work with collection-2021* conda envs #18

Merged
merged 35 commits into from
Apr 13, 2022
Merged

Conversation

mrakitin
Copy link
Member

@mrakitin mrakitin commented Oct 15, 2020

These fixed made the startup files to start successfully against the collection-2020-2.0rc8 conda env. Done with @dmgav during today's deployment visit at HXN.

xref #17 and NSLS-II-HXN/hxnfly#3 and the latest tag of https://github.com/NSLS-II-HXN/hxntools.

Requires:

@mrakitin mrakitin mentioned this pull request Oct 15, 2020
21 tasks
Comment on lines 376 to 377
# UserWarning: Couldn't start log: Log file is already active:
# /home/xf03id/logs/ophyd_user_log_xf03id.log
Copy link
Member Author

Choose a reason for hiding this comment

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

@jklynch, this is the IPython logging issue we've observed today.

Copy link

Choose a reason for hiding this comment

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

Maybe it is this line from ipython_ophyd/profile_collection/ipython_config.py:

# Start logging to the given file in append mode.
c.TerminalInteractiveShell.logappend = '/home/xf03id/logs/ophyd_user_log_xf03id.log'

Copy link

@jklynch jklynch Oct 15, 2020

Choose a reason for hiding this comment

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

You could remove that line from ipython_config.py and specify that file with BLUESKY_IPYTHON_LOG_FILE.

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed! Not sure why I wasn't able to find it with git grep... probably I was in the startup/ directory that time.

That's the place in the code:
https://github.com/NSLS-II-HXN/ipython_ophyd/blob/d59ecd4799f4d212525aca1e1956cc989405bb48/profile_collection/ipython_config.py#L297-L298

@mrakitin mrakitin mentioned this pull request Jan 21, 2021
1 task
@mrakitin mrakitin force-pushed the deploy-2020-2 branch 2 times, most recently from dcd4a6c to 8502195 Compare October 27, 2021 18:53
@mrakitin mrakitin changed the title WIP: Fixes to work with collection-2020-2.0rc8 conda env WIP: Fixes to work with collection-2021* conda envs Oct 27, 2021
kafka_publisher = Publisher(
topic="hxn.bluesky.datum.documents",
bootstrap_servers=os.environ['BLUESKY_KAFKA_BOOTSTRAP_SERVERS'],
bootstrap_servers=os.getenv("BLUESKY_KAFKA_BOOTSTRAP_SERVERS", ""),

Choose a reason for hiding this comment

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

I don't think that you want to make this change because this environment variable is mandatory.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'd like to keep in mind that the code should also be testable in the cloud. Any idea how to test it in the CI?

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, #22 should resolve that. Please review.

@mrakitin mrakitin changed the title WIP: Fixes to work with collection-2021* conda envs Fixes to work with collection-2021* conda envs Oct 27, 2021
@mrakitin mrakitin marked this pull request as ready for review October 27, 2021 22:44
@dmgav
Copy link
Contributor

dmgav commented Oct 27, 2021

This PR should not be merged yet, because more work must be done before the new environment can be used at the beamline. Converting to draft.

@dmgav dmgav marked this pull request as draft October 27, 2021 23:15
@dmgav
Copy link
Contributor

dmgav commented Nov 6, 2021

CI fails because change-xspress3-imports branch of hxnfly was merged.

@dmgav
Copy link
Contributor

dmgav commented Nov 6, 2021

I manually added changes from #22 to avoid long rebase.

@danielballan danielballan marked this pull request as ready for review April 13, 2022 17:12
@danielballan
Copy link
Contributor

This fails CI but it is what the beamline is actually running on. Merging.

@danielballan danielballan merged commit d724c46 into master Apr 13, 2022
@danielballan danielballan deleted the deploy-2020-2 branch April 13, 2022 17:15
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.

5 participants