Merged
Conversation
+ move "mintpy" to "src/mintpy" + setup.py: update "version" and "packages" settings for the new src layout
+ move/rename "mintpy/data/input_files" to "docs/templates" - setup.py: remove "data/input_files" from the package data section + update links for the new "src" layout in: - docs/api/attributes.md - docs/google_earth.md - docs/hdfeos5.md - docs/README.md - mkdocs.yml
jhkennedy
reviewed
Nov 9, 2022
Collaborator
jhkennedy
left a comment
There was a problem hiding this comment.
This looks good to me! I haven't fully tested the pip build/install yet but will do so in the morning
scottstanie
approved these changes
Nov 9, 2022
Contributor
scottstanie
left a comment
There was a problem hiding this comment.
Looks good!
(mapping) staniewi:MintPy$ ls /Users/staniewi/miniconda3/envs/mapping/lib/python3.10/site-packages/__editabl*mint*
/Users/staniewi/miniconda3/envs/mapping/lib/python3.10/site-packages/__editable__.mintpy-1.4.1.post43.pth
(mapping) staniewi:MintPy$ cat /Users/staniewi/miniconda3/envs/mapping/lib/python3.10/site-packages/__editabl*mint*
/Users/staniewi/repos/MintPy/src
(mapping) staniewi:MintPy$ cd
(mapping) staniewi:~$ mkdir -p mintpy
(mapping) staniewi:~$ python
Python 3.10.5 | packaged by conda-forge | (main, Jun 14 2022, 07:07:06) [Clang 13.0.1 ] on darwin
Type "help", "copyright", "credits" or "license" for more information.
>>> import mintpy
>>> mintpy.__file__
'/Users/staniewi/repos/MintPy/src/mintpy/__init__.py'
scottstanie
reviewed
Nov 9, 2022
+ installation: revert back $MINTPY_HOME to the path of "MintPy" folder, from "MintPy/src". + update usage of MINTPY_HOME for the "src" layout
jhkennedy
approved these changes
Nov 9, 2022
Collaborator
jhkennedy
left a comment
There was a problem hiding this comment.
Looks good to me, and is working the way I'd expect.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of proposed changes
switch
mintpyto the standardsrc/mintpylayout for the source code, to fixpip -einstalledmintpy.__file__ = Nonewhen there is amintpyfolder in current dir #882 as suggested by @scottstanie.move and rename
mintpy/data/input_filestodocs/templatesupdate links and paths for 1) the
srclayout, 2) the renamedtemplatedir and 3)$MINTPY_HOMEusage:update
setup.py:srclayoutdata/input_filesfrom thepackage_datasectionversion: use.postXstyle for the commits after release, to be consistent withpipconventionReminders