Merge pull request #33 from kerel-fs/various_fixes

Cleanup remnants of unfinished PR; Update python-satnogs-api dependency

config.sh

@@ -1 +0,0 @@
-../sattools/config.sh

contrib/README.md

@@ -5,7 +5,7 @@
 - Create Pyhton virtual environment and install dependencies via pip:
   ```
   mkvirtualenv strf
-  pip insatll -r contrib/requirements.txt
+  pip install -r contrib/requirements.txt
   ```
 
 - Create initial configuration from `env-dist`

contrib/requirements.txt

@@ -4,7 +4,7 @@ numpy
 Pillow
 python-decouple
 requests
-git+https://gitlab.com/librespacefoundation/satnogs/python-satnogs-api.git@e20a7d3c
+git+https://gitlab.com/kerel-fs/python-satnogs-api.git@0.2
 h5py~=3.6.0
 pandas~=1.3.4
-ephem~=4.3.1
+ephem~=4.1.4

contrib/test_artifact_download.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/bash
-
-DB_API_TOKEN="4f20a493a3f5fd85074d61db944365bf94987613"
-URL="https://db-satnogs.freetls.fastly.net/media/artifacts/b4975058-04eb-4ab7-9c40-9bcce76d94db.h5"
-echo "Authorization: Token $DB_API_TOKEN"
-curl -H "Authorization: Token $DB_API_TOKEN" "$URL"
-

env-dist

@@ -1,12 +1,11 @@
 # "New" Python STRF environment variables
 
-# SATNOGS_DIR is used by config.sh for STRF configuration
 SATNOGS_DIR=/home/pi/satnogs_data
 
 # SatNOGS Waterfall Tabulation Helper
-export SATNOGS_TLE_DIR=/home/pi/satnogs_data/tles/satnogs
-export SATNOGS_ARTIFACTS_DIR=/home/pi/satnogs_data/artifacts
-export SATNOGS_DOPPLER_OBS_DIR=/home/pi/satnogs_data/doppler_obs
+export SATNOGS_TLE_DIR=$SATNOGS_DIR/tles/satnogs
+export SATNOGS_ARTIFACTS_DIR=$SATNOGS_DIR/artifacts
+export SATNOGS_DOPPLER_OBS_DIR=$SATNOGS_DIR/doppler_obs
 SATNOGS_SITES_TXT=$SATNOGS_DIR/sites.txt