Skip to content

Commit

Permalink
Merge pull request #61 from crest42/u/rl/copyright
Browse files Browse the repository at this point in the history
Fix copyright notice in LICENSE file: Enter Copyright holder and year, version bump dependencies and add jake ignore file for false positives
  • Loading branch information
crest42 authored Dec 21, 2023
2 parents 27febe3 + 87effb6 commit cb2f40a
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pythonx-boot-check.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Runs with Python3.8 - Python3.10'

on:
pull_request_target:
pull_request:
branches:
- master
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pythonx-pytest.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'PyTest with Python3.8 - Python3.10'

on:
pull_request_target:
pull_request:
branches:
- master
push:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonatype-jack.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Sonatype Jake'

on:
pull_request_target:
pull_request:
branches:
- master
push:
Expand Down Expand Up @@ -31,4 +31,4 @@ jobs:
pip3 freeze > frozen.requirements.txt
pip3 install jake
jake ddt
jake ddt --whitelist jake-whitelist.json
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@ maltego_trx.egg-info
venv
env
*.code-workspace
**/*.pem
settings.csv
transforms.csv
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) [year] [fullname]
Copyright (c) [2024] [Maltego Technologies GmbH]

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

## Release Notes

__1.6.2__: Update cryptography (42.0.0) and Flask (3.0.0) dependencies

__1.6.1__: Update cryptography and Flask dependency and deprecate Python 3.7

__1.6.0__: Automatically generate am `.mtz` for your local transforms
Expand Down
1 change: 1 addition & 0 deletions jake-whitelist.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ignore": [{"id": "CVE-2018-20225", "reason": "Only valid if private indexes are used"}]}
2 changes: 1 addition & 1 deletion maltego_trx/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "1.6.1"
VERSION = "1.6.2"
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
flask>=2.2.3
cryptography==39.0.1
flask>=3.0.0
cryptography>=41.0.7
requests>=2.31.0
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
author_email='support@maltego.com',
license='MIT',
install_requires=[
'flask>=2.2.0',
'cryptography>=39.0.1'
'flask>=3.0.0',
'cryptography>=41.0.0',
'requests>=2.31.0'
],
packages=[
'maltego_trx',
Expand Down

0 comments on commit cb2f40a

Please sign in to comment.