diff --git a/.coveragerc b/.coveragerc index 6f57f7f..22435bf 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,23 +1,23 @@ -[run] -branch = True -source = - taxtools - -omit = - */taxtools/migrations/* - */taxtools/audit_views/* - */taxtools/task_helpers/* - */tests/* - */.tox/* - */bin/* - -[report] -exclude_lines = - if self.debug: - pragma: no cover - raise NotImplementedError - if __name__ == .__main__.: - def __repr__ - raise AssertionError - -ignore_errors = True +[run] +branch = True +source = + taxtools + +omit = + */taxtools/migrations/* + */taxtools/audit_views/* + */taxtools/task_helpers/* + */tests/* + */.tox/* + */bin/* + +[report] +exclude_lines = + if self.debug: + pragma: no cover + raise NotImplementedError + if __name__ == .__main__.: + def __repr__ + raise AssertionError + +ignore_errors = True diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1db45c3..06b6780 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,20 +1,115 @@ +# Apply to all files without committing: +# pre-commit run --all-files +# Update this file: +# pre-commit autoupdate + repos: + # Code Upgrades + - repo: https://github.com/asottile/pyupgrade + rev: v3.15.2 + hooks: + - id: pyupgrade + args: [--py38-plus] + - repo: https://github.com/adamchainz/django-upgrade + rev: 1.17.0 + hooks: + - id: django-upgrade + args: [--target-version=4.0] + # Code Logic + - repo: https://github.com/pycqa/isort + rev: 5.13.2 + hooks: + - id: isort + name: isort (python) + - repo: https://github.com/pre-commit/pygrep-hooks + rev: v1.10.0 + hooks: + - id: python-check-mock-methods + - id: python-no-log-warn + - id: python-use-type-annotations + - id: text-unicode-replacement-char + # Formatting - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.6.0 hooks: + # Identify invalid files + - id: check-ast + - id: check-yaml + - id: check-json + - id: check-toml + - id: check-xml + # git checks + - id: check-merge-conflict + - id: check-added-large-files + args: [--maxkb=1000] + - id: detect-private-key + - id: check-case-conflict + # Python checks + # - id: check-docstring-first + - id: debug-statements + # - id: requirements-txt-fixer + - id: fix-encoding-pragma + args: [--remove] + - id: fix-byte-order-marker + # General quality checks + - id: mixed-line-ending + args: [--fix=lf] - id: trailing-whitespace + args: [--markdown-linebreak-ext=md] + exclude: | + (?x)( + \.min\.css| + \.min\.js| + \.po| + \.mo| + swagger\.json + ) + - id: check-executables-have-shebangs - id: end-of-file-fixer - exclude: \.min\.css$ - - repo: https://github.com/pre-commit/mirrors-autopep8 - rev: "v1.7.0" + exclude: | + (?x)( + \.min\.css| + \.min\.js| + \.po| + \.mo| + swagger\.json + ) + - repo: https://github.com/editorconfig-checker/editorconfig-checker.python + rev: 2.7.3 hooks: - - id: autopep8 - - repo: https://github.com/pre-commit/mirrors-prettier - rev: "v3.0.0-alpha.0" + - id: editorconfig-checker + exclude: | + (?x)( + LICENSE| + allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less| + \.po| + \.mo| + swagger\.json + ) + - repo: https://github.com/pycqa/flake8 + rev: 7.0.0 hooks: - - id: prettier - - repo: https://github.com/pycqa/isort - rev: 5.10.1 + - id: flake8 + additional_dependencies: [Flake8-pyproject] + - repo: https://github.com/asottile/yesqa + rev: v1.5.0 hooks: - - id: isort - name: isort (python) + - id: yesqa + # Infrastructure + - repo: https://github.com/tox-dev/pyproject-fmt + rev: 2.1.1 + hooks: + - id: pyproject-fmt + name: pyproject.toml formatter + description: "Format the pyproject.toml file." + args: + - --indent=4 + additional_dependencies: + - tox==4.14.2 # https://github.com/tox-dev/tox/releases/latest + + - repo: https://github.com/abravalheri/validate-pyproject + rev: v0.17 + hooks: + - id: validate-pyproject + name: Validate pyproject.toml + description: "Validate the pyproject.toml file." diff --git a/.tx/transifex.yml b/.tx/transifex.yml new file mode 100644 index 0000000..aac38d6 --- /dev/null +++ b/.tx/transifex.yml @@ -0,0 +1,16 @@ +filters: + - filter_type: file + file_format: PO + source_file: taxtools/locale/en/LC_MESSAGES/django.po + source_language: en + translation_files_expression: taxtools/locale//LC_MESSAGES/django.po + + - filter_type: file + file_format: KEYVALUEJSON + source_language: en + source_file: frontend/locales/en.translation.json + translation_files_expression: frontend/locales/.translation.json + +settings: + language_mapping: + zh-Hans: zh_Hans diff --git a/LICENCE b/LICENSE similarity index 98% rename from LICENCE rename to LICENSE index d9587e7..d7f1051 100644 --- a/LICENCE +++ b/LICENSE @@ -1,339 +1,339 @@ -GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {description} - Copyright (C) {year} {fullname} - - 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. - - 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. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - {signature of Ty Coon}, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {description} + Copyright (C) {year} {fullname} + + 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. + + 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. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + {signature of Ty Coon}, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index bb0546d..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,5 +0,0 @@ -include LICENSE -include README.md -recursive-include taxtools/templates * -recursive-include taxtools/static * -recursive-include taxtools/ *.py diff --git a/Makefile b/Makefile index 5c8546a..a677492 100644 --- a/Makefile +++ b/Makefile @@ -28,8 +28,9 @@ deploy: twine upload dist/* package: -# cd frontend;yarn install;yarn build - python setup.py sdist + pip install flit + flit build + devjs: cd frontend;yarn install;yarn start diff --git a/README.md b/README.md index 9b91175..a8fb5ad 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ -# Tax Tools -Requires Corptools for data with the wallet module enabled +# Corp Tools - Tax Tools + +## Installation + +Requires AllianceAuth-CorpTools + +1. Install from pip `pip install allianceauth-corptools-tax-tools` +2. Add `'taxtools'` to INSTALLED_APPS in local.py +3. Run Migrations +4. Setup + +## Features + +## Permissions + +Category | Perm | Admin Site | Auth Site +--- | --- | --- | --- + +## Contributing + +Make sure you have signed the [License Agreement](https://developers.eveonline.com/resource/license-agreement) by logging in at before submitting any pull requests. All bug fixes or features must not include extra superfluous formatting changes. diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..190e907 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,106 @@ +[build-system] +build-backend = "flit_core.buildapi" + +requires = [ + "flit-core>=3.2,<4", +] + +[project] +name = "allianceauth-corptools-tax-tools" +readme = "README.md" +keywords = [ + "allianceauth", + "eveonline", +] +license = { file = "LICENSE" } +authors = [ + { name = "AaronKable", email = "aaronkable@gmail.com" }, +] +requires-python = ">=3.8" +classifiers = [ + "Environment :: Web Environment", + "Framework :: Celery", + "Framework :: Django", + "Framework :: Django :: 4.0", + "Framework :: Django :: 4.2", + "Intended Audience :: Developers", + "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3 :: Only", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: Implementation :: CPython", + "Topic :: Internet :: WWW/HTTP", + "Topic :: Internet :: WWW/HTTP :: Dynamic Content", +] +dynamic = [ + "description", + "version", +] +dependencies = [ + "allianceauth>=3.1,<5", + "allianceauth-corptools>=2.5.5", + "allianceauth-invoices>=0.1.5", +] + +urls.Homepage = "https://github.com/Solar-Helix-Independent-Transport/allianceauth-corp-tools-tax-tools" +urls.Source = "https://github.com/Solar-Helix-Independent-Transport/allianceauth-corp-tools-tax-tools" +urls.Tracker = "https://github.com/Solar-Helix-Independent-Transport/allianceauth-corp-tools-tax-tools/issues" + +[tool.flit.module] +name = "taxtools" + +[tool.isort] +profile = "django" +sections = [ + "FUTURE", + "STDLIB", + "THIRDPARTY", + "DJANGO", + "ALLIANCEAUTH", + "FIRSTPARTY", + "LOCALFOLDER", +] +known_allianceauth = [ + "allianceauth", + "esi", +] +known_django = [ + "django", +] +skip_gitignore = true + +[tool.flake8] +exclude = [ + ".git", + "*migrations*", + ".tox", + "dist", + "htmlcov", +] +max-line-length = 119 +select = [ + "C", + "E", + "F", + "W", + "B", + "B950", +] +ignore = [ + 'E203', + 'E231', + 'E501', + 'W503', + 'W291', + 'W293', +] + +[tool.djlint] +max_attribute_length = 119 +max_line_length = 119 +max_blank_lines = 1 diff --git a/runtests.py b/runtests.py index 7ab8948..d2c2813 100644 --- a/runtests.py +++ b/runtests.py @@ -1,23 +1,20 @@ -#!/usr/bin/env python -import os -import sys - -if __name__ == "__main__": - os.environ['DJANGO_SETTINGS_MODULE'] = 'tests.test_settings' - print(os.getcwd()) - try: - from django.core.management import execute_from_command_line - except ImportError: - # The above import may fail for some other reason. Ensure that the - # issue is really that Django is missing to avoid masking other - # exceptions on Python 2. - try: - import django - except ImportError: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) - raise - execute_from_command_line(sys.argv.insert(1, 'test')) +#!/usr/bin/env python +import sys + +if __name__ == "__main__": + try: + from django.core.management import execute_from_command_line + except ImportError: + # The above import may fail for some other reason. Ensure that the + # issue is really that Django is missing to avoid masking other + # exceptions on Python 2. + try: + import django # noqa: F401 + except ImportError: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) + raise + execute_from_command_line(sys.argv.insert(1, "test")) diff --git a/setup.py b/setup.py deleted file mode 100644 index 32ec6dd..0000000 --- a/setup.py +++ /dev/null @@ -1,39 +0,0 @@ -import os - -from setuptools import find_packages, setup - -from taxtools import __version__ - -install_requires = [ - 'allianceauth>=3.1.0', - 'allianceauth-corptools>=2.5.5' -] -with open(os.path.join(os.path.dirname(__file__), 'README.md')) as readme: - README = readme.read() -os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) - -setup( - name='allianceauth-tax-tools', - version=__version__, - packages=find_packages(), - include_package_data=True, - install_requires=install_requires, - license='GNU General Public License v3 (GPLv3)', - description='Alliance Auth Plugin', - long_description=README, - long_description_content_type="text/markdown", - url='https://github.com/pvyParts/allianceauth-corp-tools-tax-tools', - author='AaronKable', - author_email='aaronkable@gmail.com', - classifiers=[ - 'Development Status :: 4 - Beta', - 'Environment :: Web Environment', - 'Framework :: Django', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', - 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.6', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Internet :: WWW/HTTP :: Dynamic Content', - ], -) diff --git a/taxtools/__init__.py b/taxtools/__init__.py index 9c975f4..5b179e8 100644 --- a/taxtools/__init__.py +++ b/taxtools/__init__.py @@ -1,2 +1,6 @@ -default_app_config = 'taxtools.apps.TaxToolsConfig' +""" +Corp Tools - Tax Tools +""" + __version__ = "0.1.0b1" +__title__ = "Corp Tools - Tax Tools" diff --git a/taxtools/api.py b/taxtools/api.py index 0a1e9b6..b40f1a9 100644 --- a/taxtools/api.py +++ b/taxtools/api.py @@ -2,16 +2,18 @@ from datetime import timedelta from typing import List -from allianceauth.eveonline.models import EveCharacter from corptools.models import EveItemType, EveLocation from corptools.providers import esi from corptools.task_helpers.corp_helpers import get_corp_token -from django.conf import settings -from django.utils import timezone from ninja import NinjaAPI from ninja.responses import codes_4xx from ninja.security import django_auth +from django.conf import settings +from django.utils import timezone + +from allianceauth.eveonline.models import EveCharacter + from . import models logger = logging.getLogger(__name__) diff --git a/taxtools/auth_hooks.py b/taxtools/auth_hooks.py index 288563c..07ceb05 100644 --- a/taxtools/auth_hooks.py +++ b/taxtools/auth_hooks.py @@ -1,6 +1,7 @@ +from django.utils.translation import gettext_lazy as _ + from allianceauth import hooks from allianceauth.services.hooks import MenuItemHook, UrlHook -from django.utils.translation import gettext_lazy as _ from . import urls diff --git a/taxtools/management/commands/tax_defaults.py b/taxtools/management/commands/tax_defaults.py index c4112bd..8249fbd 100644 --- a/taxtools/management/commands/tax_defaults.py +++ b/taxtools/management/commands/tax_defaults.py @@ -1,14 +1,15 @@ -from allianceauth.authentication.models import State from corptools.models import EveName -from django.core.management.base import BaseCommand from django_celery_beat.models import CrontabSchedule, PeriodicTask -from taxtools.models import (CharacterPayoutTaxConfiguration, - CharacterRattingTaxConfiguration, - CorpTaxConfiguration, - CorpTaxPayoutTaxConfiguration, - CorpTaxPerMemberTaxConfiguration, - CorpTaxPerServiceModuleConfiguration) +from django.core.management.base import BaseCommand + +from allianceauth.authentication.models import State + +from taxtools.models import ( + CharacterPayoutTaxConfiguration, CharacterRattingTaxConfiguration, + CorpTaxConfiguration, CorpTaxPayoutTaxConfiguration, + CorpTaxPerMemberTaxConfiguration, CorpTaxPerServiceModuleConfiguration, +) from taxtools.tasks import send_taxes diff --git a/taxtools/management/commands/tax_explain.py b/taxtools/management/commands/tax_explain.py index 7badf9a..899a473 100644 --- a/taxtools/management/commands/tax_explain.py +++ b/taxtools/management/commands/tax_explain.py @@ -1,14 +1,15 @@ -from allianceauth.authentication.models import State from corptools.models import EveName -from django.core.management.base import BaseCommand from django_celery_beat.models import CrontabSchedule, PeriodicTask -from taxtools.models import (CharacterPayoutTaxConfiguration, - CharacterRattingTaxConfiguration, - CorpTaxConfiguration, - CorpTaxPayoutTaxConfiguration, - CorpTaxPerMemberTaxConfiguration, - CorpTaxPerServiceModuleConfiguration) +from django.core.management.base import BaseCommand + +from allianceauth.authentication.models import State + +from taxtools.models import ( + CharacterPayoutTaxConfiguration, CharacterRattingTaxConfiguration, + CorpTaxConfiguration, CorpTaxPayoutTaxConfiguration, + CorpTaxPerMemberTaxConfiguration, CorpTaxPerServiceModuleConfiguration, +) from taxtools.tasks import send_taxes diff --git a/taxtools/models.py b/taxtools/models.py index 86ab32c..2427b25 100644 --- a/taxtools/models.py +++ b/taxtools/models.py @@ -6,15 +6,14 @@ from math import floor, log import yaml -from allianceauth.authentication.models import State -from allianceauth.eveonline.models import (EveAllianceInfo, EveCharacter, - EveCorporationInfo) -from allianceauth.eveonline.providers import Corporation -from corptools.models import (CharacterWalletJournalEntry, CorporationAudit, - CorporationWalletJournalEntry, EveName, - MapRegion, MapSystem, Notification, Structure, - StructureService) +from corptools.models import ( + CharacterWalletJournalEntry, CorporationAudit, + CorporationWalletJournalEntry, EveName, MapRegion, MapSystem, Notification, + Structure, StructureService, +) from corptools.providers import esi +from invoices.models import Invoice + from django.contrib.auth.models import User from django.core.exceptions import ObjectDoesNotExist from django.core.serializers.json import DjangoJSONEncoder @@ -23,7 +22,12 @@ from django.db.models.functions import Coalesce from django.forms import model_to_dict from django.utils import timezone as tzone -from invoices.models import Invoice + +from allianceauth.authentication.models import State +from allianceauth.eveonline.models import ( + EveAllianceInfo, EveCharacter, EveCorporationInfo, +) +from allianceauth.eveonline.providers import Corporation logger = logging.getLogger(__name__) @@ -909,7 +913,7 @@ def human_format(number): units = ['', 'K', 'M', 'B', 'T'] k = 1000.0 magnitude = int(floor(log(number, k))) - return '%.2f%s' % (float(number) / k**magnitude, units[magnitude]) + return f'{float(number) / k**magnitude:.2f}{units[magnitude]}' def calculate_tax(self, start_date=datetime.min, end_date=datetime.max, alliance_filter=None): logger.debug("TAXTOOLS: Starting calculate_tax") diff --git a/taxtools/tasks.py b/taxtools/tasks.py index b3638bc..11898fa 100644 --- a/taxtools/tasks.py +++ b/taxtools/tasks.py @@ -2,11 +2,13 @@ import json import logging -from allianceauth.services.tasks import QueueOnce from celery import chain, shared_task from discord import Embed + from django.core.cache import cache +from allianceauth.services.tasks import QueueOnce + from . import models logger = logging.getLogger(__name__) diff --git a/taxtools/tax_cog.py b/taxtools/tax_cog.py index e010ffd..08988cd 100644 --- a/taxtools/tax_cog.py +++ b/taxtools/tax_cog.py @@ -5,14 +5,16 @@ from typing import Optional import discord -from allianceauth.services.modules.discord.models import DiscordUser from discord import Embed, SlashCommandGroup, option, ui from discord.ext import commands from discord.utils import get_or_fetch + # AA Contexts from django.conf import settings from django.utils import timezone +from allianceauth.services.modules.discord.models import DiscordUser + from taxtools.models import CorpTaxConfiguration from taxtools.tasks import send_tax_status diff --git a/taxtools/tests/test_tax.py b/taxtools/tests/test_tax.py index c5144ce..338924e 100644 --- a/taxtools/tests/test_tax.py +++ b/taxtools/tests/test_tax.py @@ -1,16 +1,19 @@ from datetime import timedelta from unittest import mock -from allianceauth.authentication.models import CharacterOwnership -from allianceauth.eveonline.models import (EveAllianceInfo, EveCharacter, - EveCorporationInfo) -from allianceauth.tests.auth_utils import AuthUtils from corptools import models as ct_models + from django.contrib.auth.models import Group, User from django.core.cache import cache from django.test import TestCase from django.utils import timezone +from allianceauth.authentication.models import CharacterOwnership +from allianceauth.eveonline.models import ( + EveAllianceInfo, EveCharacter, EveCorporationInfo, +) +from allianceauth.tests.auth_utils import AuthUtils + class TestSecGroupBotFilters(TestCase): @classmethod diff --git a/tests/__init__.py b/tests/__init__.py index c8c5d5f..cd04264 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,3 +1,3 @@ -from .celery import app as celery_app - -__all__ = ['celery_app'] +from .celery import app as celery_app + +__all__ = ['celery_app'] diff --git a/tests/celery.py b/tests/celery.py index 5b52754..a15cb48 100644 --- a/tests/celery.py +++ b/tests/celery.py @@ -1,21 +1,21 @@ -import os - -from celery import Celery - -# set the default Django settings module for the 'celery' program. -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings') - -from django.conf import settings # noqa - -app = Celery('devauth') - -# Using a string here means the worker don't have to serialize -# the configuration object to child processes. -app.config_from_object('django.conf:settings') -app.conf.ONCE = { - 'backend': 'allianceauth.services.tasks.DjangoBackend', - 'settings': {} -} - -# Load task modules from all registered Django app configs. -app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) +import os + +from celery import Celery + +# set the default Django settings module for the 'celery' program. +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings') + +from django.conf import settings # noqa + +app = Celery('devauth') + +# Using a string here means the worker don't have to serialize +# the configuration object to child processes. +app.config_from_object('django.conf:settings') +app.conf.ONCE = { + 'backend': 'allianceauth.services.tasks.DjangoBackend', + 'settings': {} +} + +# Load task modules from all registered Django app configs. +app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) diff --git a/tests/test_settings.py b/tests/test_settingsAA3.py similarity index 97% rename from tests/test_settings.py rename to tests/test_settingsAA3.py index 664259f..2c382e2 100644 --- a/tests/test_settings.py +++ b/tests/test_settingsAA3.py @@ -2,12 +2,12 @@ Alliance Auth Test Suite Django settings. """ -from allianceauth.project_template.project_name.settings.base import * +from allianceauth.project_template.project_name.settings.base import * # noqa # Celery configuration CELERY_ALWAYS_EAGER = True # Forces celery to run locally for testing -INSTALLED_APPS += [ +INSTALLED_APPS += [ # noqa 'corptools', 'taxtools', 'invoices' diff --git a/tests/test_settingsAA4.py b/tests/test_settingsAA4.py new file mode 100644 index 0000000..46441c9 --- /dev/null +++ b/tests/test_settingsAA4.py @@ -0,0 +1,56 @@ +""" +Alliance Auth Test Suite Django settings. +""" + +from allianceauth.project_template.project_name.settings.base import * # noqa + +# Celery configuration +CELERY_ALWAYS_EAGER = True # Forces celery to run locally for testing + +SITE_URL = "https://example.com" +CSRF_TRUSTED_ORIGINS = [SITE_URL] + +INSTALLED_APPS += [ # noqa + 'corptools', + 'taxtools', + 'invoices' +] + +ROOT_URLCONF = 'tests.urls' + +NOSE_ARGS = [ + # '--with-coverage', + # '--cover-package=', + # '--exe', # If your tests need this to be found/run, check they py files are not chmodded +x +] + + +PASSWORD_HASHERS = [ + 'django.contrib.auth.hashers.MD5PasswordHasher', +] + +# LOGGING = None # Comment out to enable logging for debugging + +# Register an application at https://developers.eveonline.com for Authentication +# & API Access and fill out these settings. Be sure to set the callback URL +# to https://example.com/sso/callback substituting your domain for example.com +# Logging in to auth requires the publicData scope (can be overridden through the +# LOGIN_TOKEN_SCOPES setting). Other apps may require more (see their docs). +ESI_SSO_CLIENT_ID = '123' +ESI_SSO_CLIENT_SECRET = '123' +ESI_SSO_CALLBACK_URL = '123' + +CACHES = { + "default": { + # "BACKEND": "redis_cache.RedisCache", + # "LOCATION": "localhost:6379", + # "OPTIONS": { + # "DB": 1, + # } + "BACKEND": "django_redis.cache.RedisCache", + "LOCATION": "redis://localhost:6379/1", + "OPTIONS": { + "COMPRESSOR": "django_redis.compressors.lzma.LzmaCompressor", + } + } +} diff --git a/tests/urls.py b/tests/urls.py index 7844f45..afc1427 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -1,13 +1,14 @@ -import allianceauth.urls -from django.urls import re_path - -from . import views - -urlpatterns = allianceauth.urls.urlpatterns - -urlpatterns += [ - # Navhelper test urls - re_path(r'^main-page/$', views.page, name='p1'), - re_path(r'^main-page/sub-section/$', views.page, name='p1-s1'), - re_path(r'^second-page/$', views.page, name='p1'), -] +from django.urls import path + +import allianceauth.urls + +from . import views + +urlpatterns = allianceauth.urls.urlpatterns + +urlpatterns += [ + # Navhelper test urls + path('main-page/', views.page, name='p1'), + path('main-page/sub-section/', views.page, name='p1-s1'), + path('second-page/', views.page, name='p1'), +] diff --git a/tests/views.py b/tests/views.py index f65f451..bc14824 100644 --- a/tests/views.py +++ b/tests/views.py @@ -1,5 +1,5 @@ -from django.http import HttpResponse - - -def page(request): - return HttpResponse('Hello World!') +from django.http import HttpResponse + + +def page(request): + return HttpResponse('Hello World!') diff --git a/tox.ini b/tox.ini index 58d0ae3..eb90a66 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,23 @@ [tox] -skipsdist = False -usedevelop = True -envlist = py3 +isolated_build = True +skipsdist = true +usedevelop = true +envlist = {py38, py39, py310, py311}-django40, {py38, py39, py310, py311, py312}-django42 [testenv] setenv = - DJANGO_SETTINGS_MODULE = tests.test_settings - -basepython = - py3: python3 - + django40: DJANGO_SETTINGS_MODULE = tests.test_settingsAA3 + django42: DJANGO_SETTINGS_MODULE = tests.test_settingsAA4 deps= + django40: allianceauth<4 + django42: allianceauth>=4.0.0 coverage - allianceauth-corptools - allianceauth-invoices -commands = - pip freeze - coverage run runtests.py - coverage report -m - coverage html +install_command = pip install -e ".[test]" -U {opts} {packages} + +commands= + coverage run runtests.py taxtools -v 2 --debug-mode + pip list coverage xml + coverage html + coverage report -m