Commit Graph

1800 Commits

Author SHA1 Message Date
Charlie Crane
c1f4cb050e #2457 - Retesting the use of --no-cache-dir to see if that prevents hash issue 2024-05-15 09:00:54 +01:00
Charlie Crane
dc0f46270f #2457 - Adding a line to build pipeline to purge pip cache. Seeing if this could resolve hash error seen on some pipeline failures 2024-05-14 14:50:06 +01:00
Charlie Crane
f66d9d5817 Merge branch 'dev' into feature/2457-Set_link_bandwidth_via_config 2024-05-14 14:44:20 +01:00
Charlie Crane
084f48c721 #2457 - Updating changelog and testing a minor change in pipeline config to see if it resolves package hash errors 2024-05-14 11:11:42 +01:00
Charlie Crane
74514e977d #2457 - Syncing changes made. Updates to documentation and tests 2024-05-14 11:05:37 +01:00
Christopher McCarthy
7367fc67cf Merged PR 373: 2536 - Removed 'real files' from FileSystem and FTP
## Summary
Removed 'real files' from FileSystem and FTP

## Test process
- Dropped any tests that contain 'real files'
- Ran remaining tests to check that everything still works

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

2536 - Removed 'real files' from FileSystem and FTP

Related work items: #2536
2024-05-14 08:05:56 +00:00
Czar Echavez
2774623fba #2472: switch to using nbsphinx + added readme steps to setup pandoc + revert changes 2024-05-14 07:36:29 +01:00
Charlie Crane
71684dc5f0 #2457 - Initial commit removing the hardcoding of bandwidth values within links. Now pull it from configuration files, defaulting to 100 if not implemented 2024-05-13 14:42:15 +01:00
Chris McCarthy
e2f061fde0 #2561 - Set the DatabaseServer service to automatically install the upon install to enable backup. Added some defensive statements that gracefully handle backup/restore requests when FTPClient is not installed. 2024-05-13 07:58:43 +01:00
Chris McCarthy
ebbdea517e 2536 - Removed 'real files' from FileSystem and FTP 2024-05-13 07:30:33 +01:00
Marek Wolan
22e4b04a21 Merged PR 370: Merge back release
bump version basically.

Related work items: #2552
2024-05-10 14:48:08 +00:00
Czar Echavez
795004be5b #2472: copy image assets + applying change to makefile 2024-05-09 14:16:29 +01:00
Czar Echavez
81c523dc67 #2472: integrating jupyter notebooks into documentation 2024-05-09 13:43:55 +01:00
Nick Todd
d80eb15fa2 #2560: Fix typos and punctuation. 2024-05-08 14:56:44 +01:00
Marek Wolan
c6b6753aeb Updated VERSION 2024-05-08 11:13:32 +00:00
Marek Wolan
d02b7744ae Merged PR 368: #2550 Backport changes into core
## Summary
Backport changes from sensitive into core.

Mainly the application install and a couple of test changes.

## Test process
pytest

## Checklist
- [ ] PR is linked to a **work item**
- [ ] **acceptance criteria** of linked ticket are met
- [ ] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [ ] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

#2550 Backport changes into core

Related work items: #2549, #2550
2024-05-08 08:38:44 +00:00
Marek Wolan
4d3c85bc14 #2550 Backport changes into core 2024-05-07 15:35:02 +01:00
Charlie Crane
75fd6b923a Merged PR 361: #2464 - v3b7 install errors when using Python 3.11
## Summary
This is a two line change to `README.md` to correct the Python versions listed as a pre-requisite for PrimAITE, contradicting what is in `pyproject.toml`
We do not currently support Python3.11, which the README suggests we do.

## Test process
Not Applicable - Although I have installed v3b7 using Python3.11 as part of the bugfix investigation on a blank Ubuntu VM, and the install looks to of ran smoothly.
`Data-Manipulation-E2E-Demonstration` & `Training-an-SB3-Agent` both ran fine.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [X] updated the **documentation** if this PR changes or adds functionality
- [X] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code

#2464 - Correcting Python versioning pre-req range on README.md as we do not currently support Python3.11

Related work items: #2464
2024-05-07 13:23:35 +00:00
Nick Todd
bfb8fbd1bf Merged PR 365: Run SB3 training in SubprocVecEnv
## Summary
Demonstration notebook show how to use SB3 SubprocVecEnv to vectorise environments to speed up training.
## Test process
Successfully run notebook on Windows and Linux.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [ ] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

Related work items: #2442
2024-05-03 16:02:34 +00:00
Nick Todd
e510c3ceff #2442: Removed 'primaite setup' call 2024-05-03 15:10:24 +01:00
Marek Wolan
727a05f291 Merged PR 363: Make ftp client only default on computers, not servers
## Summary
REMOVE ftp client from host node default software and add it to computer default software, effectively removing it from servers.

Ensure tests are using the uc2 yaml file instead of outdated network generator function.

Fix some tests to make sure it all passing

## Test process
I have tested it.

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [ ] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [ ] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [X] attended to any **TO-DOs** left in the code

Make ftp client only default on computers, not servers

Related work items: #2546
2024-05-03 12:40:17 +00:00
Marek Wolan
535e064af5 unflake test 2024-05-03 11:05:33 +01:00
Marek Wolan
4f38184959 remove redundant comment 2024-05-03 09:08:26 +01:00
Charlie Crane
4cd15a39aa #2457 - Commit before switching branches to review 2024-05-03 08:35:24 +01:00
Nick Todd
689400e95c Merge branch 'dev' into bugfix/2442-add_SubprocVecEnv_support 2024-05-02 17:04:43 +01:00
Marek Wolan
4a02d1d8e5 Readd import statement 2024-05-02 17:00:29 +01:00
Nick Todd
3c5e107f81 Merge branch 'dev' into bugfix/2442-add_SubprocVecEnv_support 2024-05-02 16:59:08 +01:00
Nick Todd
5a3b6ade2f #2442: Updated changelog. 2024-05-02 16:52:35 +01:00
Marek Wolan
6ef6a5cd18 Merge remote-tracking branch 'origin/dev' into feature/remove-ftp-client-default-app 2024-05-02 16:52:24 +01:00
Nick Todd
7c689a0d35 #2442: Markdown changes. 2024-05-02 16:32:54 +01:00
Nick Todd
a37ed4e487 #2442: Fix config file path to be OS independent. 2024-05-02 16:16:36 +01:00
Marek Wolan
b9b922e776 Make ftp client only default on computers, not servers 2024-05-02 15:51:06 +01:00
Nick Todd
2774442561 Merge branch 'bugfix/2442-add_SubprocVecEnv_support' of ssh.dev.azure.com:v3/ma-dev-uk/PrimAITE/PrimAITE into bugfix/2442-add_SubprocVecEnv_support 2024-05-02 15:48:30 +01:00
Nick Todd
db29d33629 #2442: Add multi-processing notebook example. 2024-05-02 15:44:18 +01:00
Czar Echavez
a5794e5df1 Merged PR 359: Improved Dev CLI tools
## Summary
Improved dev tools:
- can configure what the dev mode can override
  - sys log level
  - outputting sys log
  - outputting pcap logs
  - outputting to terminal
  - the location where to output session (by default will print to the primaite repo root)

## Test process
https://dev.azure.com/ma-dev-uk/PrimAITE/_git/PrimAITE/pullrequest/359?_a=files&path=/tests/integration_tests/cli/test_dev_cli.py

and a lot of manually checking if the thing outputs to the correct directories

## Checklist
- [X] PR is linked to a **work item**
- [X] **acceptance criteria** of linked ticket are met
- [X] performed **self-review** of the code
- [X] written **tests** for any new functionality added with this PR
- [X] updated the **documentation** if this PR changes or adds functionality
- [ ] written/updated **design docs** if this PR implements new functionality
- [X] updated the **change log**
- [X] ran **pre-commit** checks for code style
- [ ] attended to any **TO-DOs** left in the code

Related work items: #2447, #2533
2024-05-02 13:37:16 +00:00
Czar Echavez
e599e03c10 #2533: cleaner output text for dev-mode show + consistent colors 2024-05-02 12:21:24 +01:00
Charlie Crane
5cfa9c7fa2 #2464 - Version typo in README.md 2024-05-02 08:54:37 +01:00
Charlie Crane
ec582c0002 #2464 - Reverting flake8 change 2024-05-01 17:08:08 +01:00
Charlie Crane
d25a8aa0ef #2464 - Reverting changes from Python3.12 investigations, updating README and prproject.toml so that python 3.11 is allowed 2024-05-01 17:06:58 +01:00
Czar Echavez
ec6d2bf640 #2533: fix missing implementation of output_dir override in io.py + moving the dev mode override in SIM_OUTPUT to prevent the override from being overridden 2024-05-01 16:53:37 +01:00
Charlie Crane
0fd85722ae #2464 I missed a linting error 2024-05-01 16:37:16 +01:00
Czar Echavez
952f6ee225 #2533: fix is_dev_mode for missing or outdated configs 2024-05-01 16:23:44 +01:00
Charlie Crane
a2482dc744 #2464 - Forgot to save and add a file that would cause flake8 failure 2024-05-01 16:22:26 +01:00
Charlie Crane
c2cc5228ae #2464 - Linting changes to see if the python 3.12 pipeline will pass 2024-05-01 16:20:01 +01:00
Czar Echavez
25807653f4 Merge remote-tracking branch 'origin/dev' into feature/2533-improve-dev-tools-in-primaite-cli 2024-05-01 16:11:52 +01:00
Czar Echavez
d7572dc18b #2533: changelog 2024-05-01 16:10:27 +01:00
Czar Echavez
61e7a4e439 #2533: documentation on use of dev-mode 2024-05-01 16:04:18 +01:00
Charlie Crane
57cff8d4e3 #2464 - Seeing if python 3.12 will also run... 2024-05-01 16:01:08 +01:00
Czar Echavez
5516fbc6fc #2533: output directory for sessions 2024-05-01 14:48:10 +01:00
Charlie Crane
392b83fc64 #2464 - Correcting use of spaces in pipeline job names 2024-05-01 14:34:38 +01:00