Skip to content

Commit 14d7d9f

Browse files
markmac99markmac99
authored
Merge pull request #402 from ukmda/markmac99
Merging in multiple changes mainly to user and fireball management
2 parents 15c6838 + 590c292 commit 14d7d9f

82 files changed

Lines changed: 3261 additions & 396 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/automated-testing.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: automated_testing
1+
name: Automated Testing
22
env:
33
AWS_REGION: eu-west-2
44
permissions:
@@ -7,10 +7,10 @@ permissions:
77

88
on:
99
push:
10-
branches: [ dev, markmac99 ]
10+
branches: [dev, markmac99]
1111
pull_request:
1212
# The branches below must be a subset of the branches above
13-
branches: [ master ]
13+
branches: [master]
1414
jobs:
1515
conttests:
1616
runs-on: thelinux
@@ -20,7 +20,7 @@ jobs:
2020
username: ${{ secrets.DH_LOGIN_MM }}
2121
password: ${{ secrets.DH_PATT_MM }}
2222
env:
23-
BRANCH: ${{ github.head_ref || github.ref_name }}
23+
BRANCH: ${{ github.head_ref || github.ref_name }}
2424
volumes:
2525
- testdata:/data
2626
steps:
@@ -46,7 +46,7 @@ jobs:
4646
apitests:
4747
runs-on: ubuntu-latest
4848
steps:
49-
- name: checkout code
49+
- name: checkout code
5050
uses: actions/checkout@v3
5151
- name: run api tests
5252
run: |

‎.github/workflows/build_tools.yml‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
name: Build Fireball and Management Tools
2+
env:
3+
AWS_REGION: eu-west-2
4+
permissions:
5+
id-token: write
6+
contents: read
7+
8+
on:
9+
push:
10+
branches: [dev, markmac99, master]
11+
pull_request:
12+
# The branches below must be a subset of the branches above
13+
branches: [master]
14+
jobs:
15+
local_tests:
16+
name: local test stage
17+
runs-on: win10
18+
steps:
19+
- name: "☁️ checkout repository"
20+
uses: actions/checkout@v4
21+
- name: testing
22+
run: |
23+
echo "hello from test"
24+
conda activate ukmon-admin
25+
dir
26+
build_usermgmt:
27+
name: build usermanagement
28+
runs-on: win10
29+
needs: local_tests
30+
steps:
31+
- name: building
32+
run: |
33+
echo "running build step"
34+
conda activate ukmon-admin
35+
cd usermgmt\windows
36+
pyinstaller ./stationMaint2.py --noconsole --onefile --windowed --icon .\camera.ico
37+
dir dist
38+
package_usermgmt:
39+
name: package usermanagement
40+
runs-on: win10
41+
needs:
42+
- build_usermgmt
43+
steps:
44+
- name: packaging
45+
run: |
46+
echo "packaging the app now"
47+
cd usermgmt\windows\dist
48+
copy ../camera.ico .
49+
copy ../stationmaint.ini.sample .
50+
copy ../../README.md .
51+
compress-archive -path . -update -destinationpath c:\temp\ukmon_usermgmt.zip
52+
release_usermgmt:
53+
name: release usermanagement
54+
runs-on: win10
55+
needs:
56+
- package_usermgmt
57+
steps:
58+
- name: release
59+
uses: xresloader/upload-to-github-release@v1
60+
env:
61+
GITHUB_TOKEN: ${{ secrets.MM_PAT }}
62+
with:
63+
file: c:\temp\ukmon_usermgmt.zip
64+
tags: true
65+
draft: true
66+
overwrite: true
67+
tag_name: 2025.10.1
68+
default_release_name: User Management Tool
69+
default_release_body_path: usermgmt\windows\release_notes.md
70+
cleanup_usermgmt:
71+
name: clean up temp usermanagement files
72+
runs-on: win10
73+
needs:
74+
- release_usermgmt
75+
steps:
76+
- name: delete temp usermgmt package
77+
run: |
78+
del c:\temp\ukmon_usermgmt.zip
79+
build_fbtool:
80+
name: build fbcollector
81+
runs-on: win10
82+
needs: local_tests
83+
steps:
84+
- name: building
85+
run: |
86+
echo "running build step"
87+
conda activate fbcollector
88+
cd fbCollector
89+
pyinstaller ./fireballCollector.py --onefile --windowed --icon .\ukmda.ico
90+
package_fbtool:
91+
name: package fbcollector
92+
runs-on: win10
93+
needs:
94+
- build_fbtool
95+
steps:
96+
- name: packaging
97+
run: |
98+
echo "packaging the app now"
99+
cd fbCollector\dist
100+
copy ../ukmda.ico .
101+
copy ../config.ini.sample .
102+
copy ../download_events.sh .
103+
copy ../noimage.jpg .
104+
copy ../README.md .
105+
compress-archive -path . -update -destinationpath c:\temp\fbcollector.zip
106+
release_fbtool:
107+
name: release fbcollector
108+
runs-on: win10
109+
needs:
110+
- package_fbtool
111+
steps:
112+
- name: release
113+
uses: xresloader/upload-to-github-release@v1
114+
env:
115+
GITHUB_TOKEN: ${{ secrets.MM_PAT }}
116+
with:
117+
file: c:\temp\fbcollector.zip
118+
tags: true
119+
draft: true
120+
overwrite: true
121+
tag_name: 2025.10.1
122+
default_release_name: Tools to Gather Fireball data and Manage UKMON Cameras
123+
default_release_body_path: fbCollector\README.md
124+
cleanup_fbtool:
125+
name: clean up temp fbcollector files
126+
runs-on: win10
127+
needs:
128+
- release_fbtool
129+
steps:
130+
- name: delete package
131+
run: |
132+
del c:\temp\fbcollector.zip

‎.github/workflows/build_usermgmt.yml‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches: [ master ]
16+
branches: [master]
1717
pull_request:
1818
# The branches below must be a subset of the branches above
19-
branches: [ master ]
19+
branches: [master]
2020
schedule:
21-
- cron: '26 14 * * 6'
21+
- cron: "26 14 * * 6"
2222

2323
jobs:
2424
analyze:
@@ -32,40 +32,40 @@ jobs:
3232
strategy:
3333
fail-fast: false
3434
matrix:
35-
language: [ 'javascript', 'python' ]
35+
language: ["javascript", "python"]
3636
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
3737
# Learn more:
3838
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
3939

4040
steps:
41-
- name: Checkout repository
42-
uses: actions/checkout@v3
41+
- name: Checkout repository
42+
uses: actions/checkout@v3
4343

44-
# Initializes the CodeQL tools for scanning.
45-
- name: Initialize CodeQL
46-
uses: github/codeql-action/init@v2
47-
with:
48-
languages: ${{ matrix.language }}
49-
# If you wish to specify custom queries, you can do so here or in a config file.
50-
# By default, queries listed here will override any specified in a config file.
51-
# Prefix the list here with "+" to use these queries and those in the config file.
52-
# queries: ./path/to/local/query, your-org/your-repo/queries@main
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v2
47+
with:
48+
languages: ${{ matrix.language }}
49+
# If you wish to specify custom queries, you can do so here or in a config file.
50+
# By default, queries listed here will override any specified in a config file.
51+
# Prefix the list here with "+" to use these queries and those in the config file.
52+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
5353

54-
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55-
# If this step fails, then you should remove it and run the build manually (see below)
56-
- name: Autobuild
57-
uses: github/codeql-action/autobuild@v2
54+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55+
# If this step fails, then you should remove it and run the build manually (see below)
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v2
5858

59-
# ℹ️ Command-line programs to run using the OS shell.
60-
# 📚 https://git.io/JvXDl
59+
# ℹ️ Command-line programs to run using the OS shell.
60+
# 📚 https://git.io/JvXDl
6161

62-
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63-
# and modify them (or add more) to build your code if your project
64-
# uses a compiled language
62+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63+
# and modify them (or add more) to build your code if your project
64+
# uses a compiled language
6565

66-
#- run: |
67-
# make bootstrap
68-
# make release
66+
#- run: |
67+
# make bootstrap
68+
# make release
6969

70-
- name: Perform CodeQL Analysis
71-
uses: github/codeql-action/analyze@v2
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v2

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -614,3 +614,6 @@ tests/testing/RMS/
614614
tests/testing/WesternMeteorPyLib/
615615
archive/ukmon_pylib/tests/testdata.tar.gz
616616
servercopybkp/*
617+
fbcollector/config.ini
618+
usermgmt/windows/stationmaint.ini
619+
usermgmt/windows/README.md

‎.vscode/c_cpp_properties.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"includePath": [
66
"${workspaceFolder}/**",
77
"${vcpkgRoot}/x64-windows/include",
8-
"${vcpkgRoot}/x86-windows/include",
9-
"e:/dev/opencv3/opencv-3.4.11/build/install/include"
8+
"${vcpkgRoot}/x86-windows/include"
109
],
1110
"defines": [
1211
"_DEBUG",

‎archive/containers/trajsolver/Dockerfile‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
# Copyright (C) 2018-2023 Mark McIntyre
2-
FROM continuumio/miniconda3:4.11.0
2+
#FROM continuumio/miniconda3:4.11.0
3+
FROM continuumio/miniconda3:24.7.1-0
34

4-
RUN conda install -y -c conda-forge "numpy<1.25.0" scipy cython pytz pyqt
5+
#RUN conda install -y -c conda-forge "numpy<1.25.0" scipy cython pytz pyqt
6+
RUN conda install -y -c conda-forge "numpy<2" scipy cython pytz pyqt
57
RUN conda install -y -c conda-forge jplephem ephem
68
RUN conda install -y -c conda-forge basemap basemap-data-hires
79
RUN conda install -y -c conda-forge pandas cartopy
8-
RUN conda install -y matplotlib=3.4.3
10+
RUN conda install -y matplotlib
911
RUN pip install boto3
1012
RUN apt-get update && apt-get -y upgrade
1113
RUN conda install -y -c conda-forge numba
1214

1315
COPY WesternMeteorPyLib/ ./WesternMeteorPyLib
14-
ENV PYTHONPATH ./WesternMeteorPyLib
15-
ENV PROJ_LIB ./
16+
ENV PYTHONPATH=./WesternMeteorPyLib
17+
ENV PROJ_LIB=./
1618
COPY *.py ./
1719
#ENV NUMPY_EXPERIMENTAL_DTYPE_API 1
1820

‎archive/containers/trajsolver/build.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ write-output "building $imagename in $accid"
1717
$yn=read-host -prompt "update WMPL?"
1818
if ($yn.tolower() -eq "y") { bash -c "./update_wmpl.sh $env" }
1919

20-
if ($env -eq "test") { copy-item awskeys.test awskeys}
20+
if ($env -eq "test") { move-item awskeys.test awskeys}
2121

2222
docker build . -t ${imagename}
2323
if (! $?)
@@ -26,7 +26,7 @@ if (! $?)
2626
exit
2727
}
2828
set-location $loc
29-
if ($env -eq "test") { Remove-Item awskeys}
29+
if ($env -eq "test") { move-item awskeys awskeys.test }
3030

3131
$yn=read-host -prompt "upload to ECR?"
3232
if ($yn.tolower() -eq "y") {

0 commit comments

Comments
 (0)