Merge branch 'main' into fix/bump-pypi-action

Author: FuhuXia

ckanext/geodatagov/tests/test_category_tags.py

@@ -19,7 +19,6 @@ def setup(cls):
         os.system("PGPASSWORD=ckan psql -h db -U ckan -d ckan -c 'create extension postgis;'")
         # PY2
         os.system("ckan -c test.ini harvester initdb")
-        os.system("ckan -c test.ini spatial initdb")
         # echo "Downloading locations table"
         os.system("wget https://github.com/GSA/datagov-deploy/raw/71936f004be1882a506362670b82c710c64ef796/"
                   "ansible/roles/software/ec2/ansible/files/locations.sql.gz -O /tmp/locations.sql.gz")

docker-entrypoint.d/10-setup-db.sh

@@ -3,6 +3,3 @@
 echo "Init Harvest database tables"
 ckan harvester initdb
 
-echo "Init Spatial database tables"
-ckan spatial initdb
-

requirements.txt

@@ -1,4 +1,4 @@
--e git+https://github.com/ckan/ckanext-harvest.git#egg=ckanext_harvest
+-e git+https://github.com/ckan/ckanext-harvest.git@v1.5.6#egg=ckanext_harvest
 -e git+https://github.com/ckan/ckanext-spatial.git#egg=ckanext-spatial
 -e git+https://github.com/asl2/PyZ3950.git#egg=PyZ3950
 git+https://github.com/gsa/ckan.git@ckan-210-temp#egg=ckan

test.sh

@@ -28,7 +28,6 @@ PASS=ckan
 # cd -
 
 ckan -c $test_ini harvester initdb
-ckan -c $test_ini spatial initdb
 
 pytest --ckan-ini=test.ini --cov=ckanext.geodatagov --disable-warnings ckanext/geodatagov/tests/