Merge pull request #2 from AuScalableDroneCloud/matt/tracker-107-pack…

…ages

Matt/tracker 107 packages

base/Dockerfile

@@ -18,7 +18,6 @@ USER ${NB_UID}
 # (We may want to build requirements in a builder image and use wheels to install in final image,
 #  see: https://github.com/jupyterhub/zero-to-jupyterhub-k8s/blob/main/images/singleuser-sample/Dockerfile)
 #(NOTE: opencv is CPU only - will need to build our own to use GPU)
-#COPY --chown=jovyan:users requirements.txt requirements.txt
 COPY --chown=jovyan:users environment.yml environment.yml
 
 #Ensure numpy is installed first for gdal
@@ -27,7 +26,6 @@ RUN export GDAL_VERSION=$(gdal-config --version) && \
     sed -i "s/GDAL_VERSION/$GDAL_VERSION/g" environment.yml && \
     mamba env update --file environment.yml 
 #    pip install --no-cache-dir numpy && \
-#    pip install --no-cache-dir -r requirements.txt
 
 # Create a python 3.8 environment and repeat package installations
 RUN conda create --yes -n Python3.8 python=3.8 && \

base/environment.yml

@@ -6,34 +6,14 @@ dependencies:
   - numpy
   - nb_conda_kernels
   - pip:
-    - matplotlib
-    #- scipy
     - ipywidgets
     - ipyfilechooser
     - ipylab
-    #- voila
     - jupytext
     - jupyter_http_over_ws
     - jupyter-resource-usage
     - jupyterlab-system-monitor
     - jupyterlab-git
-    #- python-dotenv
-    #- tqdm
+    - python-dotenv
     - jupyter-server-proxy
-    #- pillow
-    #- qrcode
-    #- pyodm==1.5.9
-    #- rasterio
-    #- rasterstats
-    #- GEOS
-    #- cartopy
-    #- opencv-contrib-python-headless
-    - lavavu-osmesa
-    - earthpy
-    - trimesh
-    - laspy[lazrs,laszip]
-    #- gdal==GDAL_VERSION
-    - git+https://github.com/AuScalableDroneCloud/asdc_python
-    #- git+https://github.com/AuScalableDroneCloud/nbgitpuller
-    #- git+https://github.com/AuScalableDroneCloud/odk2odm
-    #- git+https://github.com/AuScalableDroneCloud/odmax
+    - git+https://github.com/AuScalableDroneCloud/asdc_python