-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Create CI.yml Complete unittests whenever any pull request is created * IT WORKS This wont work This wont work This wont work This wont work This wont work This wont work Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Oh hellfire Please lord work Please lord work Testing9 Testing8 Testing7 Testing6 Testing5 Testing4 Remove Pytest Testing3 Testing2 Testing1 Fix indentation Add push check Add push check Test Linux compatible * Don't save figure, just shows it * Change filepath * Add data folder * Fix layer tests * Fix tests * Change working dir * Change working dir * Change working dir * Change working dir * Please god work * Please god work x2 * Please god work x3 * Please god work x4 * Please god work x5 * Please god work x6 * Please god work x7 * Change workflow name * Test CI * Trigger CI on push * Join paths properly * Typing is hard * Check file exists * fiona supported drivers * Spit out GIS package versions * LPT: Only import packages that exist * Remove unused tests * Include lfs * Fix lfs * create folders for save files * Assert array almost equal within 1e-14 * Import correct numpy testing * Checking for proper test correction * The names Intergration, Continuous Intergration. * The names Intergration, Continuous Intergration. Checking for proper test correction Import correct numpy testing Assert array almost equal within 1e-14 create folders for save files Fix lfs Include lfs Remove unused tests * Remove commented code * Change name of risk threshold input field * Change resolution to 30m as standard * Change plot_server res * Change algo input regex * Add tests for filepath references (#64) * Add tests for filepath references * Check for platform in filepath tests * Fix graph regen (#66) * Do not verify SSL (temporary fix) * Disable InsecureRequestWarning console printout * Change default aircraft base FatalityLayer * Change if loop to a function * Ask user to regen plot upon errors * Add third API URL * Add all API global instances * Add TODO to remind about SSL certs * Change GET req for POST req * Change headers * Header now connected to installed version * Feature allow risk threshold input (#67) * Change name of risk threshold input field * Change resolution to 30m as standard * Change plot_server res * Change algo input regex * Correctly input the threshold value * Change README to update and correct grammar (#71) * Add resolution to distance calculations * Input raster grid and indices * Correct path distance now calculated * Use linspace to calculate x values * Remove unnecessary code * Add Postcode Dialog Box * Change button selections to allow for map or post * Call Postcode dialog when button clicked * Use QInputDialog instead of own QWidget * Clean and remove unnecessary code * Add postcode API to requirements * Change dialog title when invalid postcode is inputted * Add unittest to check api * Change unittest to only check for what we require * Remove unneeded code * Add in the ability to cancel the input * Revert "feature_postcode_locations" (#74) * Feature postcode selector (#75) * Add Postcode Dialog Box * Change button selections to allow for map or post * Call Postcode dialog when button clicked * Use QInputDialog instead of own QWidget * Clean and remove unnecessary code * Add postcode API to requirements * Change dialog title when invalid postcode is inputted * Add unittest to check api * Change unittest to only check for what we require * Remove unneeded code * Add in the ability to cancel the input * Break invalid postcode loop * Add dummy aircraft (#79) * Add dummy aircraft * Change the point the dummy variable is added in * Fix menu selection (#83) * Account for dummy variable addition * REDO THE TEST * Risk Map Match Feature (#77) * Insert aircraft parameters into fatality risk layer * Aircraft and wind now dhown in layer label * Aircraft now have name built into the dictionary * Replaces Fatality Risk layer with that of the Pathfinding layer's aircraft * Change initial Fatality Risk Layer name * Remove all old layers and add new ones * Add TODO * Loop the data layers when annotating layers * Remove duplication of layers * Only plot top data layer * Path analysis popups now show the correct layer * Remove test cases * Remove serial res.append code * Remove unnecessary for loop * Add in more granular reporting to the UI * Add name to DAV * Remove the ability to duplicate aircraft and inform user of their saved aircraft's name * Spelling of the dummy * Change to V0.15.0 Co-authored-by: Aliaksei Pilko <[email protected]> Co-authored-by: Aliaksei Pilko <[email protected]>
- Loading branch information
3 people
authored
Nov 28, 2021
1 parent
caa56ff
commit 0ec0bb1
Showing
34 changed files
with
518 additions
and
337 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| # This workflow will install Python dependencies, run tests and lint with a single version of Python | ||
| # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions | ||
|
|
||
| name: SEEDPOD Linux | ||
|
|
||
| on: [ push, pull_request ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| lfs: true | ||
| - name: Set up Python 3.8 | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: 3.8 | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| sudo apt-get install libproj-dev proj-data proj-bin | ||
| sudo apt-get install libgeos-dev | ||
| sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable | ||
| sudo apt-get update | ||
| sudo apt-get install gdal-bin libgdal-dev | ||
| pip install wheel GDAL==3.2.3 | ||
| pip install flake8 pytest Cython numpy pyproj pygeos | ||
| if [ -f requirements-linux.txt ]; then pip install -r requirements-linux.txt; fi | ||
| mkdir "tests/layers/figs" | ||
| mkdir "tests/layers/tiffs" | ||
| - name: Lint with flake8 | ||
| run: | | ||
| # stop the build if there are Python syntax errors or undefined names | ||
| flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics | ||
| # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide | ||
| flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics | ||
| - name: Test with pytest | ||
| run: | | ||
| pytest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # This workflow will install Python dependencies, run tests and lint with a single version of Python | ||
| # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions | ||
|
|
||
| name: SEEDPOD Windows | ||
|
|
||
| on: [ push, pull_request ] | ||
|
|
||
| jobs: | ||
| build: | ||
|
|
||
| runs-on: windows-latest | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| lfs: true | ||
| - name: Set up Python 3.8 | ||
| uses: actions/setup-python@v2 | ||
| with: | ||
| python-version: 3.8 | ||
| - name: Install dependencies | ||
| run: | | ||
| python -m pip install --upgrade pip | ||
| pip install wheel | ||
| pip install -r requirements.txt | ||
| pip wheel --wheel-dir=extern -r requirements.txt | ||
| pip install flake8 | ||
| pip install pytest | ||
| mkdir "tests/layers/figs" | ||
| mkdir "tests/layers/tiffs" | ||
| - name: Lint with flake8 | ||
| run: | | ||
| # stop the build if there are Python syntax errors or undefined names | ||
| flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics | ||
| # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide | ||
| flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics | ||
| - name: Test with pytest | ||
| run: | | ||
| pytest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # . # Set in setup.py | ||
|
|
||
| altgraph==0.17 | ||
| attrs==20.3.0 | ||
| bokeh==2.3.1 | ||
| Cartopy==0.19.0.post1 | ||
| certifi==2020.12.5 | ||
| chardet==4.0.0 | ||
| click==7.1.2 | ||
| click-plugins==1.1.1 | ||
| cligj==0.7.1 | ||
| cloudpickle==1.6.0 | ||
| colorama==0.4.4 | ||
| colorcet==2.0.6 | ||
| commonmark==0.9.1 | ||
| cycler==0.10.0 | ||
| dask==2021.4.0 | ||
| datashader==0.12.1 | ||
| datashape==0.5.2 | ||
| defusedxml==0.7.1 | ||
| dill==0.3.3 | ||
| distributed==2021.4.0 | ||
| fastparquet==0.6.3 | ||
| Fiona==1.8.19 | ||
| fsspec==2021.4.0 | ||
| future==0.18.2 | ||
| geopandas==0.9.0 | ||
| geoviews==1.9.1 | ||
| HeapDict==1.0.1 | ||
| holoviews==1.14.3 | ||
| import-profiler==0.0.3 | ||
| Jinja2==2.11.3 | ||
| kiwisolver==1.3.1 | ||
| llvmlite==0.36.0 | ||
| locket==0.2.1 | ||
| Markdown==3.3.4 | ||
| MarkupSafe==1.1.1 | ||
| matplotlib==3.4.1 | ||
| msgpack==1.0.2 | ||
| multipledispatch==0.6.0 | ||
| multiprocess==0.70.11.1 | ||
| munch==2.5.0 | ||
| numba==0.53.1 | ||
| numpy==1.20.2 | ||
| odfpy==1.4.1 | ||
| packaging==20.9 | ||
| pandas==1.2.4 | ||
| panel==0.11.3 | ||
| param==1.10.1 | ||
| partd==1.2.0 | ||
| pathos==0.2.7 | ||
| pefile==2019.4.18 | ||
| Pillow==8.2.0 | ||
| postcodes-io-api==0.0.4 | ||
| pox==0.2.9 | ||
| ppft==1.6.6.3 | ||
| psutil==5.8.0 | ||
| pyarrow==3.0.0 | ||
| pyct==0.4.8 | ||
| pygeos==0.8 # Keep at 0.8 for geopandas to play nice | ||
| Pygments==2.8.1 | ||
| pyinstaller | ||
| pyinstaller-hooks-contrib==2021.1 | ||
| pyparsing==2.4.7 | ||
| pyproj==3.0.1 | ||
| pyshp==2.1.3 | ||
| PySide2==5.15.2 | ||
| python-dateutil==2.8.1 | ||
| pytz==2021.1 | ||
| pyviz-comms==2.0.1 | ||
| pywin32-ctypes==0.2.0 | ||
| PyYAML==5.4.1 | ||
| rasterio==1.2.3 | ||
| requests==2.25.1 | ||
| retrying==1.3.3 | ||
| rich==10.1.0 | ||
| Rtree==0.9.7 | ||
| scipy==1.6.2 | ||
| Shapely==1.7.1 | ||
| shiboken2==5.15.2 | ||
| six==1.15.0 | ||
| sortedcontainers==2.3.0 | ||
| spatialpandas==0.3.6 | ||
| tabulate==0.8.9 | ||
| tblib==1.7.0 | ||
| thrift==0.13.0 | ||
| toolz==0.11.1 | ||
| topojson==1.0 | ||
| tornado==6.1 | ||
| tqdm==4.60.0 | ||
| typing-extensions==3.7.4.3 | ||
| urllib3==1.26.4 | ||
| xarray==0.17.0 | ||
| zict==2.0.0 | ||
| casex~=1.0.5 | ||
| scikit-learn~=0.24.1 | ||
| scikit-image~=0.18.1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.