Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating development branch with hotfix #273

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Updating development branch with hotfix #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2243c8d
Updating __init__.py
Ulvetanna Apr 11, 2024
faf4302
Updating README.md Authorship
Ulvetanna Apr 11, 2024
9bf9b97
Merge pull request #269 from antarctica/hotfix_authoship_init_
Ulvetanna Apr 11, 2024
bddd7bf
Merge branch '0.4.x' into main
Ulvetanna Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ Sometimes the cache needs to be cleared for internal links to update. If facing
rm -r docs/html/.doctrees/
```
## Developers
Jonathan Smith, Samuel Hall, George Coombs, James Byrne, Michael Thorne, Maria Fox, Harrison Abbot, Ayat Fekry
Autonomous Marine Operations Planning (AMOP) Team, AI Lab, British Antarctic Survey

## Collaboration
We are currently assessing the best practice for collaboration on the codebase, until then please contact [polarroute@bas.ac.uk](polarroute@bas.ac.uk) for further info.
We are currently assessing the best practice for collaboration on the codebase, until then please contact [amop@bas.ac.uk](amop@bas.ac.uk) for further info.

## License
This software is licensed under a MIT license, but request users cite our publication.
Expand Down
6 changes: 3 additions & 3 deletions polar_route/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
__version__ = "0.4.0"
__description__ = "PolarRoute: Long-distance maritime polar route planning taking into account complex changing environmental conditions"
__license__ = "MIT"
__author__ = "Jonathan Smith, Samuel Hall, George Coombs, Ayat Fekry, Harrison Abbot - Software Developers\n Samuel Hall - Technical Lead\n Maria Fox - Project Manager\n Jonathan Smith - Codebase Champion"
__author__ = "Autonomous Marine Operations Planning (AMOP) Team, AI Lab, British Antarctic Survey"
__email__ = "[email protected]"
__copyright__ = "2022-, BAS AI Lab"
__copyright__ = "2021-, BAS AI Lab"

# Wrapped in try-except so that setup.py can import polar_route without crashing due to dependency errors
try:
Expand All @@ -16,4 +16,4 @@
from polar_route.route_planner import RoutePlanner as RoutePlanner

except ModuleNotFoundError as err:
print(f'{err}\n Is PolarRoute installed correctly?')
print(f'{err}\n Is PolarRoute installed correctly?')