Merge pull request #33 from paarnes/dev

Dev

Author: paarnes

.github/workflows/pypi-package-upload-pypi.yml

@@ -0,0 +1,52 @@
+name: Upload Python Package to PYPI
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade setuptools wheel build twine
+
+    - name: Get current version from pyproject.toml
+      id: get_version
+      run: echo "::set-output name=version::$(grep -oP '(?<=version = ")[^"]*' pyproject.toml)"
+
+    - name: Increment version
+      id: increment_version
+      run: echo "::set-output name=version::$(python -c "version='${{ steps.get_version.outputs.version }}'.split('.'); version[-1] = str(int(version[-1]) + 1); print('.'.join(version))")"
+
+    - name: Update version in pyproject.toml
+      run: sed -i "s/version = \".*\"/version = \"${{ steps.increment_version.outputs.version }}\"/" pyproject.toml
+
+    - name: Commit changes to pyproject.toml
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "Per Helge Aarnes"
+        git add pyproject.toml
+        git commit -m "Bump version to ${{ steps.increment_version.outputs.version }}"
+
+    - name: Push changes to the master branch
+      run: git push origin HEAD:${{ github.ref }}
+      if: github.ref == 'refs/heads/master'
+
+    - name: Build and upload to PyPI (master branch)
+      if: github.ref == 'refs/heads/master' && github.event_name == 'release' && github.event.action == 'created'
+      run: |
+        python -m build
+        twine upload --repository-url https://upload.pypi.org/legacy/ --username __token__ --password ${{ secrets.PYPI_TOKEN }} dist/*

.github/workflows/pypi-package-upload-testpypi.yml

@@ -0,0 +1,41 @@
+name: Upload Python Package to TEST PYPI
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install --upgrade setuptools wheel build twine
+
+    - name: Get current version from pyproject.toml
+      id: get_version
+      run: echo "::set-output name=version::$(grep -oP '(?<=version = ")[^"]*' pyproject.toml)"
+
+    - name: Increment version
+      id: increment_version
+      run: echo "::set-output name=version::$(python -c "version='${{ steps.get_version.outputs.version }}'.split('.'); version[-1] = str(int(version[-1]) + 1); print('.'.join(version))")"
+
+    - name: Update version in pyproject.toml
+      run: sed -i "s/version = \".*\"/version = \"${{ steps.increment_version.outputs.version }}\"/" pyproject.toml
+
+    - name: Build and upload to Test PyPI (master branch)
+      if: github.ref == 'refs/heads/master'
+      run: |
+        python -m build
+        twine upload --repository-url https://test.pypi.org/legacy/ --username __token__ --password ${{ secrets.TEST_PYPI_TOKEN }} dist/*

.gitignore

@@ -128,8 +128,9 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-Admin 
+Admin
 launch.json
+SLETT_*
 
 Output_Files/
 .vscode/

README.md

@@ -110,19 +110,18 @@ cutoff_elevation_angle = 10 # drop satellites lower than 10 degrees
 nav_data_rate = 60 # desired datarate for ephemerides (to improve speed)
 
 analysisResults = GNSS_MultipathAnalysis(rinex_obs_file,
-										 broadcastNav1=rinNav_file,
-										 include_SNR = True,
-										 outputDir = output_folder,
-										 nav_data_rate = nav_data_rate,
-										 cutoff_elevation_angle = cutoff_elevation_angle)
+					broadcastNav1=rinNav_file,
+					include_SNR = True,
+					outputDir = output_folder,
+					nav_data_rate = nav_data_rate,
+					cutoff_elevation_angle = cutoff_elevation_angle)
 ```
 
 #### Read a RINEX observation file
 ```
 from gnssmultipath import readRinexObs
 
 rinObs_file = 'OPEC00NOR_S_20220010000_01D_30S_MO_3.04'
-
 GNSS_obs, GNSS_LLI, GNSS_SS, GNSS_SVs, time_epochs, nepochs, GNSSsystems,\
 		obsCodes, approxPosition, max_sat, tInterval, markerName, rinexVersion, recType, timeSystem, leapSec, gnssType,\
 		rinexProgr, rinexDate, antDelta, tFirstObs, tLastObs, clockOffsetsON, GLO_Slot2ChannelMap, success = \
@@ -136,7 +135,6 @@ GNSS_obs, GNSS_LLI, GNSS_SS, GNSS_SVs, time_epochs, nepochs, GNSSsystems,\
 from gnssmultipath import Rinex_v3_Reader
 
 rinNav_file = 'BRDC00IGS_R_20220010000_01D_MN.rnx'
-
 navdata = Rinex_v3_Reader().read_rinex_nav(rinNav_file, data_rate=60)
 
 ```
@@ -147,8 +145,7 @@ navdata = Rinex_v3_Reader().read_rinex_nav(rinNav_file, data_rate=60)
 from gnssmultipath import PickleHandler
 
 path_to_picklefile = 'analysisResults.pkl'
-
-result_dict = PickleHandler.read_pickle(pickl_file)
+result_dict = PickleHandler.read_pickle(path_to_picklefile)
 
 
 ```
@@ -158,8 +155,7 @@ result_dict = PickleHandler.read_pickle(pickl_file)
 from gnssmultipath import PickleHandler
 
 path_to_picklefile = 'analysisResults.pkl'
-
-result_dict = PickleHandler.read_zstd_pickle(pickl_file)
+result_dict = PickleHandler.read_zstd_pickle(path_to_picklefile)
 
 ```