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.

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

Merge release 3.4.2 from pilot branch to master branch #230

Merged
merged 53 commits into from
Nov 21, 2024
Merged

Conversation

rkoumis
Copy link
Collaborator

@rkoumis rkoumis commented Nov 20, 2024

whartond and others added 30 commits November 14, 2019 09:48
Make the pilot branch the same as master
Update pilot CHANGELOG from master
- updated Dockerfile-dalton
- emptied out the requirements.txt file
Run ruff format to standardize file formatting
- there are 22 items to fix manually.
Ran ruff check --fix to fix style issues automatically
- updated the changelog
- small refactoring inside dalton.py and flowsynth.py
- initialize logging at init time not import time
- check for rulesets at init time not import time
- added some basic tests
- these fixes all were done by ruff
- I used `ruff format` and `ruff check --fix --unsafe-fixes`
- Some manual fixes still are needed
- Added a Makefile target to lint the Dockerfiles
- The default nginx docker image has a CMD of ["nginx" "-g" "daemon off;"] so
  - we don't need the CMD in our Dockerfile
  - and we can't have "daemon off" in our nginx config
- do not send a NoneType or a boolean False to redis-py
- Small refactoring
- Small tweaks to comments
- Update Makefile
- Properly show any flowsynth errors
Add unit tests for the flowsynth web UI
- ruff found a couple of good fixes
- added a unit test for dalton
Additional code checking by ruff
- slight tweaks to the Dockerfiles
- ran hadolint
- Added two makefile targets for bumping the version.
Use bump-my-version tool to help with versioning
- since the redis update in #205
job results boolean bug with zeek and json
- zeek_json contains the data or "False"
- eliminate the redis global variable 'r'
- remove other usages of the 'global' keyword
- added github workflow for hadolint
- remove unused or unuseful dependencies
- added changelog entry
- start the flask app with the `flask` command line tool
@rkoumis rkoumis self-assigned this Nov 20, 2024
@rkoumis
Copy link
Collaborator Author

rkoumis commented Nov 20, 2024

@da667 there will be some conflicts with your #228 - apologies

@rkoumis
Copy link
Collaborator Author

rkoumis commented Nov 21, 2024

@rkoumis rkoumis merged commit ff74db3 into master Nov 21, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants