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

Fix Docker image for debugging. #1080

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Fix Docker image for debugging. #1080

merged 5 commits into from
Oct 22, 2024

Conversation

SpacemanPaul
Copy link
Contributor

@SpacemanPaul SpacemanPaul commented Oct 22, 2024

Recent docker image changes broke debugging. This fixes it.

Changes:

  1. Call apt-get upgrade -y: not strictly necessary, but seems like a good idea.
  2. Change /code directory to /src. This is the important one. pydevd imports stuff from the standard library code which the /code directory hides. Required some tweaks to GHAs.
  3. Update to pydevd for most recent version of pycharm.
  4. Other misc cleanup.
  5. Remove pipdeptree as a dev dependency. I can't remember why we needed it and it has pip version dependencies that cause issues because we can't upgrade the Debian-controlled pip.

This has been holding up OWS progress for ages and nearly driving me nuts. Relieved to finally have it working again.


📚 Documentation preview 📚: https://datacube-ows--1080.org.readthedocs.build/en/1080/

@SpacemanPaul SpacemanPaul marked this pull request as draft October 22, 2024 04:58
Copy link

codecov bot commented Oct 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.64%. Comparing base (11f6787) to head (b07c766).
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1080   +/-   ##
=======================================
  Coverage   93.64%   93.64%           
=======================================
  Files          43       43           
  Lines        6510     6510           
=======================================
  Hits         6096     6096           
  Misses        414      414           
Files with missing lines Coverage Δ
datacube_ows/startup_utils.py 92.56% <100.00%> (ø)

@SpacemanPaul SpacemanPaul marked this pull request as ready for review October 22, 2024 10:37
@SpacemanPaul SpacemanPaul requested a review from Ariana-B October 22, 2024 10:37
@SpacemanPaul
Copy link
Contributor Author

@pjonsson Any of this unnecessary? (Anything I've missed?)

Copy link
Contributor

@pjonsson pjonsson left a comment

Choose a reason for hiding this comment

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

My ows-rebuild patches in the apt-get upgrade -y, so it's nice to get it into the Dockerfile instead.

I have not used pydevd, but on Ubuntu, you automatically get a new PyCharm as soon as it is released. If it works the same on Windows/Mac and pydevd versions are tied to PyCharm versions, it might be easiest to just drop the version constraint on pydevd and always get the latest. But do that in a separate PR, this PR makes it work and that is worth a lot.

Unrelated to this PR, it would be nice with a datacube-ows release with the cache-fixes and your fix that makes it stop spamming the logs with warnings.

I'm out of commission now and it will most likely last for the rest of the week, so don't hold this waiting for me, but for what it is worth, I think this change looks good.

@SpacemanPaul SpacemanPaul merged commit fc499cf into master Oct 22, 2024
14 checks passed
@SpacemanPaul SpacemanPaul deleted the fix-debugging branch October 22, 2024 23:55
SpacemanPaul added a commit that referenced this pull request Nov 7, 2024
SpacemanPaul added a commit that referenced this pull request Nov 14, 2024
SpacemanPaul added a commit that referenced this pull request Nov 14, 2024
* Hackathon WIP

* Fix Docker image for debugging.

* Additional docker fixes from #1080

* Tweak antimeridian hack and timezone handling.

* Misc cleanup.

* Fix tests - auto-publish 3832 if 3857 is published.

* Fix tests - pass boxed point instead of raw point.

* What layers are getting hidden?

* Layer reprs.

* Typo from a couple of commits ago.

* REALLY fix typo (sigh)

* Workaround core bug and cleanup

* print to echo fix

* Remove separate test db build script.
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.

3 participants