Commit 724ed538 authored Jul 12, 2022 by Laura, Jason R

Merge branch 'clean_denali_build' into 'main'

Clean denali build

See merge request astrogeology/autocnet!669

parents f8390762 0b2d06ab

.gitlab-ci.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ unit-test-job:
		- conda init
		- source /root/.bashrc
		- source activate autocnet_env
		- pip install -r test_requirements.txt
		- psql -h $POSTGRES_HOST -c 'create database template_postgis;' -U postgres ;
		- psql template_postgis -h $POSTGRES_HOST -U postgres -c 'create extension postgis';
		- psql template_postgis -U $POSTGRES_USER -h $POSTGRES_HOST -c 'create extension postgis_topology';

conda/meta.yaml

+0 −2

Original line number	Diff line number	Diff line
		@@ -54,8 +54,6 @@ requirements:
		- pvl >= 1.0
		- psycopg2
		- pyproj
		- pytest
		- pytest-cov
		- python>=3
		- pyyaml
		- redis-py

environment.yml

+1 −16

Original line number	Diff line number	Diff line
		name: root
		prefix: /opt/conda
		channels:
		- conda-forge
		- usgs-astrogeology
		@@ -7,42 +5,30 @@ channels:

		dependencies:
		- python>=3
		- coveralls
		- csmapi
		- cython
		- cyvlfeat
		- matplotlib
		- dill
		- gdal
		- fakeredis
		- geoalchemy2
		- geopandas
		- gdal
		- hiredis
		- hoggorm
		- imageio
		- ipykernel
		- jupyter
		- kalasiris
		- knoten=0.2.0
		- ncurses
		- networkx=2
		- numexpr
		- numpy
		- opencv <= 3.5
		- pillow
		- plio>=1.3
		- pandas
		- pyyaml
		- plurmy
		- psycopg2
		- proj=7.0.0
		- pvl = 1.0
		- pyproj
		- pytest
		- pytest-cov
		- pytest-mock
		- runipy
		- richdem
		- scikit-image=0.17
		- scikit-learn
		@@ -55,4 +41,3 @@ dependencies:
		- vlfeat
		- pip
		- protobuf
		No newline at end of file
		- pysal
		No newline at end of file

requirements.txt

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		numpy>=1.10.0
		numexpr
		scipy>=0.17.0
		gdal>=1.11.2
		protobuf==3.0.0b2
		networkx
		pandas
		geopandas
		shapely
		scikit-image
		sqlalchemy
		dill
		plio
		h5py

test_requirements.txt

0 → 100644

+5 −0

Original line number	Diff line number	Diff line
		coveralls
		fakeredis
		pytest
		pytest-cov
		pytest-mock
		No newline at end of file