Skip to content

Commit

Permalink
some fixes
Browse files Browse the repository at this point in the history
* bumped moody to 0.2.1
* bumped asap_stereo to 0.2.1
* added full res dem hillshade to hirise workflow
* fixed typo
  • Loading branch information
AndrewAnnex committed Jun 28, 2021
1 parent 17e9cd8 commit 4cf988a
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 7 deletions.
2 changes: 1 addition & 1 deletion asap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ dependencies:
- sh
- pip
- pip:
- moody>=0.0.4
- moody>=0.2.0
- readme-renderer
2 changes: 1 addition & 1 deletion asap_stereo/_version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version_info = (0, 2, 0)
version_info = (0, 2, 1)
__version__ = ".".join(map(str, version_info))
53 changes: 53 additions & 0 deletions asap_stereo/asap_hirise_workflow.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,59 @@
"source": [
"!asap hirise step-eleven --mpp {img_gsd} --just-ortho True 2>&1 | tee -i -a ./13_img_full_ortho.log ./full_log.log"
]
},
{
"cell_type": "markdown",
"source": [
"## Hillshade of full res geoid adjusted DEM"
],
"metadata": {
"collapsed": false
}
},
{
"cell_type": "code",
"execution_count": null,
"outputs": [],
"source": [
"both = f'{left}_{right}'\n",
"img = str(next(Path(f'./{both}/results_ba/dem_align/').glob(f'{both}*DEM-adj.tif')))\n",
"out = img.replace('.tif','_h.png')"
],
"metadata": {
"collapsed": false,
"pycharm": {
"name": "#%%\n"
}
}
},
{
"cell_type": "code",
"execution_count": null,
"outputs": [],
"source": [
"!gdaldem hillshade {img} {out}"
],
"metadata": {
"collapsed": false,
"pycharm": {
"name": "#%%\n"
}
}
},
{
"cell_type": "code",
"execution_count": null,
"outputs": [],
"source": [
"Image(filename=out)"
],
"metadata": {
"collapsed": false,
"pycharm": {
"name": "#%%\n"
}
}
}
],
"metadata": {
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Andrew M. Annex'

# The full version, including alpha/beta/rc tags
release = '0.2.0'
release = '0.2.1'

# set latex engine for unicode
latex_engine = 'xelatex'
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
requests
fire
moody>=0.0.4
moody>=0.2.0
sh
pvl
papermill
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# some influences here came from https://github.com/audreyr/cookiecutter/blob/master/setup.py

version = '0.2.0'
version = '0.2.1'


with io.open('README.rst', 'r', encoding='utf-8') as readme_file:
Expand All @@ -16,14 +16,14 @@
packages = ['asap_stereo'],
include_package_data=True,
license = 'BSD-3-Clause',
description = 'A high level CLI and reproduceable workflow for the Ames Stereo Pipeline',
description = 'A high level CLI and reproducible workflow for the Ames Stereo Pipeline',
long_description = readme,
# Author details
author='Andrew M. Annex',
author_email='ama6fy@virginia.edu',
url='https://github.com/AndrewAnnex/asap_stereo/',

install_requires=['requests', 'fire', 'moody>=0.0.4', 'sh', 'papermill', 'rasterio', 'pyproj'],
install_requires=['requests', 'fire', 'moody>=0.2.0', 'sh', 'papermill', 'rasterio', 'pyproj'],

entry_points={
'console_scripts': [
Expand Down

0 comments on commit 4cf988a

Please sign in to comment.