Skip to content

Commit

Permalink
Merge pull request #16 from badpacketsllc/change-license
Browse files Browse the repository at this point in the history
Update license and contact information.
  • Loading branch information
woodrad authored Jun 17, 2022
2 parents 9957c45 + 8212002 commit 6fc4c11
Show file tree
Hide file tree
Showing 9 changed files with 235 additions and 323 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @woodrad @okta-mat
2 changes: 0 additions & 2 deletions .github/FUNDING.yml

This file was deleted.

1 change: 0 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
Bad Packets, LLC
Mathew Woodyard
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Run prospector static analysis using docker.
# Copyright (C) 2020-2022 Bad Packets, LLC
# https://www.badpackets.net
# Licensed under a GPLv2 license
# Copyright (C) 2022 Okta, Inc.
# Licensed under the Apache License 2.0
#
# To run `prospector` against code in the current directory using the image
# from Docker Hub:
Expand Down
479 changes: 201 additions & 278 deletions LICENSE

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ Please be nice and follow our
License
-------

GPLv2
Apache License 2.0

Author Information
------------------

[Mathew Woodyard](https://www.matwoodyard.com)

[Bad Packets LLC](https://badpackets.net)
22 changes: 10 additions & 12 deletions test/bad_code.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
"""
prospector static analysis failing test example
Copyright (C) 2020-2022 Bad Packets, LLC
https://www.badpackets.net
Copyright (C) 2022 Okta, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""


Expand Down
22 changes: 10 additions & 12 deletions test/good_code.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
"""
prospector static analysis passing test example
Copyright (C) 2020-2022 Bad Packets, LLC
https://www.badpackets.net
Copyright (C) 2022 Okta, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""


Expand Down
22 changes: 10 additions & 12 deletions test/test_build.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
"""
prospector container build test suite
Copyright (C) 2020-2022 Bad Packets, LLC
https://www.badpackets.net
Copyright (C) 2022 Okta, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
http://www.apache.org/licenses/LICENSE-2.0
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
"""

import subprocess
Expand Down

0 comments on commit 6fc4c11

Please sign in to comment.