oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,951 Commits 3 Branches 10 Tags
9bf8d0f8cbce18542622bf772fd9abb1edf50bc6
Commit Graph

1951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marek Wolan
9bf8d0f8cb #2676 Put NMNE back into network module 2024-07-31 13:20:15 +01:00
Marek Wolan
5b976c7985 Merge remote-tracking branch 'origin/dev' into bugfix/2676_NMNE_var_access 2024-07-31 12:49:21 +01:00
Christopher McCarthy
2c2d140bf0 Merged PR 487: #2778 - fixed the mis-merge that was trying to call the old latex function 
## Summary
- Fixed the mis-merge that was trying to call the old latex function instead of the new md function
- Removed the old threshold leftover stuff in the report too

## Test process
- Tested the benchmark report locally and it runs end-to-end

## 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

#2778 - fixed the mis-merge that was trying to call the old latex function instead of the new md function. removed the old threshold leftover stuff in the report too

Related work items: #2778
 2024-07-30 09:42:10 +00:00
Chris McCarthy
2e1d622228 #2778 - pinned Ray version to <2.33 until they fix their bug 2024-07-30 09:57:48 +01:00
Chris McCarthy
8af7fc0ecd #2778 - ran pre-commit 2024-07-29 09:31:50 +01:00
Chris McCarthy
a0cfe8cdfa #2778 - fixed the mis-merge that was trying to call the old latex function instead of the new md function. removed the old threshold leftover stuff in the report too 2024-07-29 08:52:16 +01:00
Chris McCarthy
e67b4b54ce bumped version number and ran pre-commit 2024-07-22 14:46:58 +01:00
Chris McCarthy
db50a4d457 Merge remote-tracking branch 'refs/remotes/origin/release/3.2.0' into dev 
# Conflicts:
#	src/primaite/VERSION
 2024-07-22 14:38:01 +01:00
Chris McCarthy
85a530382c merged 3.1.0 into dev for git history alignment [skip ci] 2024-07-22 14:30:33 +01:00
Chris McCarthy
8ce39a09ad merged 3.0.0 into dev for git history alignment [skip ci] 2024-07-22 14:06:08 +01:00
Chris McCarthy
6bfe1510e8 merged 3.1.0 into 3.2.0 for git history alignment [skip ci] 2024-07-22 13:59:28 +01:00
Chris McCarthy
9dd1d6b742 merged 3.0.0 into 3.1.0 for git history alignment [skip ci] 2024-07-22 13:50:29 +01:00
Chris McCarthy
0789244df8 refactored the performance benchmark plot so that there's no benchmark threshold line and all bars are blue [skip ci] 2024-07-22 10:12:43 +01:00
Defence Science and Technology Laboratory UK
4631f19e84 Automated benchmark output commit for version 3.2.0 [skip ci] 2024-07-21 09:10:19 +00:00
Chris McCarthy
4ae3573f70 release/3.2.0 2024-07-21 07:44:26 +01:00
Defence Science and Technology Laboratory UK
3f7d6c6ba6 Automated benchmark output commit for version 3.1.0 [skip ci] 2024-07-20 18:36:58 +00:00
Chris McCarthy
fba85cebfd retrospectively benchmarked 3.1.0 using the new benchmark process 2024-07-20 17:15:53 +01:00
Defence Science and Technology Laboratory UK
7f9acc4329 Automated benchmark output commit for version 3.0.0 [skip ci] 2024-07-20 16:11:46 +00:00
Chris McCarthy
213e301e58 retrospectively benchmarked 3.0.0 using the new benchmark process 2024-07-20 15:05:56 +01:00
Archer.Bowen
22d10bf0d5 #2734 Minor grammatical issue. 2024-07-19 14:28:00 +01:00
Nick Todd
82a11b8b85 #2676: Updated doc strings 2024-07-19 12:54:01 +01:00
Archer Bowen
da13eb3dea Merged PR 472: User Guide Updates - Following Feedback 
Implements the following changes:

**Moving some of the text from index.html into about.html (reduces repeated text**)

Index.html (home)
	i.	Overview
	ii.	Features (the ones we have listed currently in v3.2.0)
About.html
	i.	Architecture
	ii.	Training & Evaluation Capability
	iii.	What is PrimAITE built with
	iv.	Getting started with PrimAITE

**Adds deepdiff and sb3_contrib to the dependencies list**

![image.png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image.png)

**NMAP headers were inconsistent with other documentation. **

This may be an issue with the other documentation rather than NMAP however refactoring every header could cause a lot more headache.

![image (2).png](https://dev.azure.com/ma-dev-uk/b50a61ee-86c4-48bc-9a0b-a67645ba12ee/_apis/git/repositories/2825053e-bd3b-45b2-8680-1281809eefa2/pullRequests/472/attachments/image%20%282%29.png)

**General Improvements**

Small link fixes

changing up python outdated python information

adding the common.config to .rst documents that didnt have them previously.

Related work items: #2734
 2024-07-19 11:52:02 +00:00
Archer.Bowen
bd9f69f062 #2734 Forgot the comma.... 2024-07-19 12:22:22 +01:00
Archer.Bowen
047117cba0 #2734 Slight grammatical improvements following PR 2024-07-19 12:21:16 +01:00
Nick Todd
e4ade6ba54 #2676: Merge nmne.py with io.py 2024-07-19 12:02:43 +01:00
Archer.Bowen
3ff0a37a71 #2734 User guide feedback core changes. 2024-07-19 11:54:10 +01:00
Nick Todd
9fb3790c1a #2726: Resolve pydantic validators PR comment 2024-07-19 11:10:57 +01:00
Nick Todd
ec6d7b46d1 Merge branch 'dev' into bugfix/2676_NMNE_var_access 2024-07-19 08:57:12 +01:00
Archer.Bowen
538c9e1e42 #2734 User Guide Update fixes. 2024-07-18 17:52:31 +01:00
Christopher McCarthy
7ccfea9c57 Merged PR 470: Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool' 
## Summary
Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool'

## Test process
Manually tested that it runs end-to-end

## 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

Related work items: #2758
 2024-07-17 19:17:15 +00:00
Christopher McCarthy
28ee00d990 Merged PR 469: Bumped version number to 3.3.0-dev0 
Bumped version number to 3.3.0-dev0

Related work items: #2630
 2024-07-17 19:15:14 +00:00
Nick Todd
4361734014 #2676: Code review changes 2024-07-17 17:50:55 +01:00
Christopher McCarthy
b651ee3837 fixed line ending in VERSION 2024-07-17 16:08:30 +00:00
Christopher McCarthy
6b14d6de44 Bumped version number to 3.3.0-dev0 2024-07-17 15:45:25 +00:00
Archer Bowen
05c33b57e0 Merged PR 465: 2734 - Initial User Guide Updates 
## Summary
3.2 User Guide Updates for 3.2 release.

Related work items: #2734
 2024-07-17 15:18:17 +00:00
Archer.Bowen
819062b627 2734 - updated following pr v2 2024-07-17 16:15:56 +01:00
Christopher McCarthy
b83bab2e2e #2758 - Updated azure-benchmark-pipeline.yaml 2024-07-17 14:34:51 +00:00
Christopher McCarthy
2900ca9b2a #2758 - Updated azure-benchmark-pipeline.yaml so that is created a venv on the vm 2024-07-17 14:33:44 +00:00
Christopher McCarthy
c7431fa0c8 #2758 - Updated azure-benchmark-pipeline.yaml to use python3.10 on the yak pool vm 2024-07-17 14:20:53 +00:00
Christopher McCarthy
f409d0c27c #2758 - Updated azure-benchmark-pipeline.yaml to use 'Imaginary Yak Pool' 2024-07-17 14:11:48 +00:00
Archer.Bowen
8bc84e33be Updated following PR 2024-07-17 15:07:37 +01:00
Archer.Bowen
e9d9cea739 Updated action masking to include copyright 2024-07-17 14:27:01 +01:00
Archer Bowen
587a5d48c8 Merged PR 466: #2757 fixed dev mode cli double -level alternative issue 
#2757 fixed dev mode cli double -level alternative issue

Related work items: #2757
 2024-07-17 11:02:53 +00:00
Archer.Bowen
9fd4c8b8dd #2734 - Updating developer_tools.rst to follow #2757 2024-07-17 11:54:53 +01:00
Archer.Bowen
fd57986512 #2757 fixed dev mode cli double -level alternative issue 2024-07-17 11:48:29 +01:00
Nick Todd
061509dffd #2676: Further test fixes. 2024-07-17 10:43:04 +01:00
Nick Todd
07e736977c #2676: Fix some more integration tests 2024-07-16 16:58:11 +01:00
Archer.Bowen
bc660d651d 2734 - Initial User Guide Updates 2024-07-16 09:32:26 +01:00
Nick Todd
34969c588b #2676: Fix mismerge. 2024-07-16 08:59:36 +01:00
Marek Wolan
99af67023a Updated VERSION 2024-07-15 13:41:01 +00:00