From 921082cc9cfeaa354fbed0b0800750eced8ba444 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:18:10 +0200 Subject: [PATCH 01/49] Towards V2 --- .pep8 | 11 - LICENSE | 674 ------------------ PackageTemplate_Inputs.xlsx | Bin 0 -> 103134 bytes README.md | 197 ++++- ci_tests.py | 11 - coverage.py | 43 -- create_package.py | 78 ++ logo.png | Bin 2118 -> 0 bytes .../methods_check_inputs.cpython-310.pyc | Bin 0 -> 2327 bytes ..._get_parameters_from_excel.cpython-310.pyc | Bin 0 -> 1653 bytes methods/methods_check_inputs.py | 55 ++ methods/methods_get_parameters_from_excel.py | 77 ++ package_foler/.coveragerc | 2 + .gitignore => package_foler/.gitignore | 0 package_foler/.gitlab-ci.yml | 59 ++ .../.gitlab/issue_templates/issue_template.md | 46 ++ .../merge_request_template.md | 39 + package_foler/.isort.cfg | 2 + package_foler/.pre-commit-config.yaml | 40 ++ .pylintrc => package_foler/.pylintrc | 11 +- package_foler/CHANGELOG.md | 26 + package_foler/README.md | 31 + package_foler/code_pydocstyle.py | 81 +++ package_foler/code_pylint.py | 178 +++++ package_foler/coverage.py | 41 ++ package_foler/folder/__init__.py | 9 + package_foler/folder/module_1.py | 7 + package_foler/folder/module_2.py | 7 + package_foler/requirements.txt | 3 + package_foler/scripts/ci_scripts.py | 44 ++ package_foler/scripts/script_1.py | 6 + package_foler/scripts/script_2.py | 6 + package_foler/setup.py | 103 +++ package_foler/tests/__init__.py | 0 package_foler/tests/test_exemple.py | 12 + python.gitignore | 139 ---- quickstart.py | 263 ------- requirements.txt | 3 + setup.py | 101 +++ setup_template.py | 99 --- templates.py | 382 ---------- 41 files changed, 1230 insertions(+), 1656 deletions(-) delete mode 100644 .pep8 delete mode 100644 LICENSE create mode 100644 PackageTemplate_Inputs.xlsx delete mode 100644 ci_tests.py delete mode 100644 coverage.py create mode 100644 create_package.py delete mode 100644 logo.png create mode 100644 methods/__pycache__/methods_check_inputs.cpython-310.pyc create mode 100644 methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc create mode 100644 methods/methods_check_inputs.py create mode 100644 methods/methods_get_parameters_from_excel.py create mode 100644 package_foler/.coveragerc rename .gitignore => package_foler/.gitignore (100%) create mode 100644 package_foler/.gitlab-ci.yml create mode 100644 package_foler/.gitlab/issue_templates/issue_template.md create mode 100644 package_foler/.gitlab/merge_request_templates/merge_request_template.md create mode 100644 package_foler/.isort.cfg create mode 100644 package_foler/.pre-commit-config.yaml rename .pylintrc => package_foler/.pylintrc (98%) create mode 100644 package_foler/CHANGELOG.md create mode 100644 package_foler/README.md create mode 100644 package_foler/code_pydocstyle.py create mode 100644 package_foler/code_pylint.py create mode 100644 package_foler/coverage.py create mode 100644 package_foler/folder/__init__.py create mode 100644 package_foler/folder/module_1.py create mode 100644 package_foler/folder/module_2.py create mode 100644 package_foler/requirements.txt create mode 100644 package_foler/scripts/ci_scripts.py create mode 100644 package_foler/scripts/script_1.py create mode 100644 package_foler/scripts/script_2.py create mode 100644 package_foler/setup.py create mode 100644 package_foler/tests/__init__.py create mode 100644 package_foler/tests/test_exemple.py delete mode 100644 python.gitignore delete mode 100644 quickstart.py create mode 100644 requirements.txt create mode 100644 setup.py delete mode 100644 setup_template.py delete mode 100644 templates.py diff --git a/.pep8 b/.pep8 deleted file mode 100644 index fcaeb4b..0000000 --- a/.pep8 +++ /dev/null @@ -1,11 +0,0 @@ -[pycodestyle] -max_line_length = 120 -ignore = E402, E722, E126, E731 -recursive = true -aggressive = 1 - -# config file used by autopep, which enhance pycodestyle -# see config options at : -# see https://pypi.org/project/autopep8/#features -# https://pycodestyle.pycqa.org/en/latest/intro.html#error-codes -# interesting codes : E501, W6 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. 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 -them 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 prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. 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. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey 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; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If 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 convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU 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 that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - 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. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -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. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - 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 -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 3 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, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program 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, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU 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. But first, please read -. diff --git a/PackageTemplate_Inputs.xlsx b/PackageTemplate_Inputs.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..b7b4b60a4ce0c9402ede26743d51e1a8f84a1a70 GIT binary patch literal 103134 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 G;r{?b$_jx1 literal 0 HcmV?d00001 diff --git a/README.md b/README.md index 7b6810b..e4b945d 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,194 @@ -# dessia_bot_template -A template to build a dessia-compatible bot. +## PackageTemplate + +This repository provides a template for creating new Python packages. It includes all the necessary boilerplate code and directory structure to help you get started quickly and maintain consistency across your projects. + + +## Table of Contents + + - [Overview](#overview) + - [Features](#features) + - [Getting Started](#getting-started) + - [Usage](#usage) + - [Directory Structure](#directory-structure) + - [Troubleshooting](#troubleshooting) + - [Contact](#contact) + + +## Overview + +PackageTemplate is a streamlined tool designed to help developers quickly generate new Python packages by providing a pre-configured project structure. By simply filling out an Excel file with essential package metadata, users can create a new package with all the necessary structure, including essential files like setup.py, README.md, and tests, initialize a Git repository, and push it to a remote Git repository. + +This template simplifies the process of starting a new Python project, allowing you to focus more on coding and less on setup. + + +## Features + + - **Standardized Directory Structure for Python Packages:** +Automatically creates a well-organized directory structure, including directories for your package's modules, tests, and additional resources. This ensures your project is easy to navigate and adheres to Python best practices. + + - **Pre-configured setup.py for Easy Package Installation and Distribution:** + Provides a ready-to-use setup.py file tailored to your package's metadata. This file simplifies the installation process and makes your package easily distributable via PyPI or other distribution platforms. + + - **Example Test Cases Using pytest:** + Includes a set of example test cases to get you started with testing your package using pytest. This helps ensure your package is robust and reliable, encouraging best practices in test-driven development. + + - **Automated Git Initialization and Remote Repository Setup:** + Automatically initializes a Git repository for your package, commits the initial setup, and pushes it to a remote repository specified by you. This feature helps you manage your code from the very beginning with version control. + + - **Customizable Package Metadata:** + Easily customize your package's name, version, author information, dependencies, and more through an Excel input file. This flexibility allows you to tailor the package to your specific project requirements. + + - **Python Version and Dependency Management:** + Specify the required Python version and manage package dependencies directly from the Excel input file. This ensures your package is compatible with the intended Python environment and has all necessary dependencies. + + - **Cross-Platform Compatibility:** + Designed to work seamlessly on Windows, macOS, and Linux, making it accessible to developers across different platforms. + + - **Error Handling and Validation:** + Built-in checks validate your input data, such as checking for valid package names, correctly formatted email addresses, and non-conflicting dependencies. This reduces the likelihood of common errors and saves you time. + + - **Expandable and Customizable:** + The template can be easily modified to include additional files, directories, or configurations. You can extend the template to suit more complex project requirements or specific use cases. + + - **Built-in Documentation Support:** + Automatically generates a basic README.md file based on your input, providing a starting point for your project documentation. This ensures your package is well-documented from the outset. + + - **Continuous integration (CI) configuration examples:** + The template is pre-configured for easy integration with CI/CD tools such as GitHub Actions, Travis CI, or Jenkins. This feature allows you to automate testing, deployment, and other processes, streamlining your development workflow. + + +## Getting Started + +1. **Prerequisites** + +Before using this template, ensure you have the following installed: + +- Python: Version 3.8 or later. +- Git: Version control system to manage your codebase. +- Excel: To edit the input data file (alternatively, use LibreOffice or any spreadsheet editor compatible with .xlsx files). + + +2. **Installation** + + +Clone this template repository to your local machine: +``` + git clone + cd PackageTemplate +``` + + +This template includes some Python dependencies for the script, install them: + +``` + pip install -r requirements.txt +``` ## Usage -### 1. Clone the Repository +1. **Fill in the Excel File** + +Open the file PackageTemplate_Inputs.xlsx, and fill in the following fields: + + - **Package Name**: This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). + - **Short Description**: A concise summary of what your package does. This will appear in package listings and should be clear and to the point. Aim for one sentence. + - **Long Description**: A more detailed description of your package. This can be a few paragraphs long and should explain the package’s features, use cases, and any important details. This will typically be included in the README.md file which can be updated after. + - **Required Packages**: A list of other Python packages that your package depends on. These dependencies will be automatically installed when your package is installed. List each package separated by a comma. + - **Python Version**: The minimum version of Python that your package is compatible with. Specify the version in the format >= followed by the version number. + - **Author**: The name of the person or team responsible for maintaining the package. This should be the operations-team that will handle updates, support, and maintenance of the package. + - **Email**: The contact email for the operations-team responsible for the package. This email should be monitored for any support requests, questions, or issues related to the package. + - **Package URL**: This URL where the package's source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub, or Bitbucket repository). Like: gitlab.com:dessia -First, clone this repository to your local machine using the following command: +**Example:** + +``` + | Item | Example | + ├──────────────────├────────────────────────────────────────────────────────────| + | Package Name | my_package | + | Short Description| A package that does awesome things | + | Long Description | This package provides awesome features for awesome people. | + | Required Packages| dessia_common>=0.18.0, plot_data>=0.26.0 | + | Python Version | >=3.9 | + | Author | Operations-Team | + | Email | support@dessia.io | + | Package URL | gitlab.com:Organisation/ClientFolder | ``` -git clone https://github.com/Dessia-tech/dessia_bot_template.git -cd dessia_bot_template -2. Execute the Quickstart Script -Run the quickstart Python script to set up your bot project. Depending on your operating system, you might need to use python or python3. Choose the appropriate command for your system: +2. **Run the Script** -On Linux/macOS: -python3 quickstart.py +After filling in the Excel file, run the create_package.py script to generate your new package: -On Windows: -python quickstart.py +``` + python3 create_package.py +``` -The quickstart script will ask you a series of questions to configure your bot project. +The script will: -3. Answer the Questions: + - Create a new directory for your package. + - Populate it with the necessary files (e.g., setup.py, README.md, gitlab-ci.yml, etc.). + - Initialize a local Git repository. + - Add and commit all the files. + - Push the initial commit to the remote repository specified in the Excel file. -The quickstart script will prompt you with questions to customize your bot project. Here's what each question is about: +3. **Push to Git** -Package Name: Enter a name for your bot's package. This should be a lowercase name without special characters except for underscores. +If the script hasn't automatically pushed to the remote repository, you can manually push your changes: -Git Integration: Decide if you want to use Git for version control. If you choose "yes," make sure you have a Git repository set up and cloned to your computer. +``` + git push -u origin master +``` -Parent Folder: Specify the parent folder where your bot project will be generated. You can choose an existing folder or create a new one. -Module Name: Choose a name for the main module of your bot. The default is "core." +## Directory Structure -Short Description: Provide a short description of your bot. +Here's an overview of the directory structure provided by this template: -Author Name: Enter your name. +``` + MyPackage/ + ├── my_package/ # Main source code directory + │ ├── __init__.py # Initialize your package + │ ├── module_1.py # Example module 1 + │ └── module_2.py # Example module 2 + ├── scripts/ # Directory for utility scripts related to the package + │ ├── script_1.py # Utility script 1 + │ ├── script_2.py # Utility script 2 + │ └── ci_scripts.py # Script to run all utility scripts + ├── tests/ # Directory for unit tests + │ ├── __init__.py # Initialize test package + │ └── test_example.py # Example test file + ├── CHANGELOG.md # Changelog for tracking changes + ├── README.md # Main documentation file + ├── setup.py # Installation and package metadata + ├── code_pydocstyle.py # Configuration script for Pydocstyle + ├── code_pylint.py # Configuration script for Pylint + ├── coverage.py # Coverage configuration script + ├── requirements.txt # Python dependencies for the package + ├── .gitlab/ # GitLab configuration files and templates + │ ├── issue_template.md # Template for submitting issues + │ └── merge_request_template.md # Template for merge requests + ├── .gitlab-ci.yml # GitLab CI/CD pipeline configuration + ├── .coveragerc # Coverage configuration file + ├── .gitignore # Git ignore rules + ├── .isort.cfg # Configuration for isort + ├── .pre-commit-config.yaml # Pre-commit hooks configuration + └── .pylintrc # Pylint configuration file +``` -Author Email: Enter your mail address. -Required Packages: List any required Python packages separated by commas. You can use the default requirements or specify your own. +## Troubleshooting -Python Version: Specify the minimum Python version your bot requires. The default is ">=3.8." + - Git Push Failures: + Ensure you have push access to the remote repository. If you encounter authentication issues, check your Git credentials and SSH keys. -Version from Git Tags: Decide whether you want to enable versioning based on Git tags (example v0.0.1). + - Excel File Issues: + If you encounter problems reading the Excel file, ensure it's properly formatted and saved as .xlsx. -Gitignore File: Choose whether to create a Python-specific .gitignore file. + - Package Name Conflicts: + Be sure that the choosen package name does not already exist in your organization or on PyPI. So, consider choosing a different name to avoid conflicts. -Readme File: Choose whether to create a README file. This file will be used as the description of your project. -Tests: Decide whether to include code coverage and CI tests. +## Contact -Code Quality Checks: Choose whether to include code quality checks like PEP8 and pylint. +For any questions or issues, please contact the Operations-Team. -CI (Continuous integraton): Decide whether to generate a .drone.yml file for drone.io CI. \ No newline at end of file diff --git a/ci_tests.py b/ci_tests.py deleted file mode 100644 index bc5feef..0000000 --- a/ci_tests.py +++ /dev/null @@ -1,11 +0,0 @@ - -import os - -# for some akward reason, put scripts before unittests tests -scripts = [ - 'import.py', - ] - -for script_name in scripts: - print('\n## Executing script {}'.format(script_name)) - exec(open(script_name).read()) diff --git a/coverage.py b/coverage.py deleted file mode 100644 index 6060cf9..0000000 --- a/coverage.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" - -""" - -import json - -MIN_FILE_COVERAGE = 50. -MIN_MODULE_COVERAGE = 50. - -untracked_modules = [ -] - -print("untracked modules:", untracked_modules) - -with open("coverage.json", "r") as file: - d = json.load(file) - -print('total covered', d['totals']['percent_covered'], '%') -if d['totals']['percent_covered'] < MIN_MODULE_COVERAGE: - raise RuntimeError('Package is not covered enough by tests: {}% expected minimum {}%'.format( - d['totals']['percent_covered'], MIN_MODULE_COVERAGE)) - -print('[Coverage] You can increase MIN_MODULE_COVERAGE to maximum {}% (actual {}%)'.format( - d['totals']['percent_covered'], MIN_MODULE_COVERAGE)) - -min_actual_coverage = 100 -for file_name, data in d['files'].items(): - print(file_name, data['summary']['percent_covered'], '%') - # print('/'.join(file_name.split('/')[-2:])) - if '/'.join(file_name.split('/')[-2:]) in untracked_modules: - print(file_name, '-> in untrack list') - else: - # print('Testing if {} is above {}'.format(file_name, MIN_FILE_COVERAGE)) - if data['summary']['percent_covered'] < MIN_FILE_COVERAGE: - raise RuntimeError('Module {} is not covered enough by tests: {}% expected minimum {}%'.format( - file_name, data['summary']['percent_covered'], MIN_FILE_COVERAGE)) - min_actual_coverage = min( - min_actual_coverage, data['summary']['percent_covered']) - -print('[Coverage] You can increase MIN_FILE_COVERAGE to maximum {}% (actual:{})%'.format( - min_actual_coverage, MIN_FILE_COVERAGE)) diff --git a/create_package.py b/create_package.py new file mode 100644 index 0000000..4c88513 --- /dev/null +++ b/create_package.py @@ -0,0 +1,78 @@ +import os +import shutil +from datetime import date +import subprocess +from methods.methods_get_parameters_from_excel import get_parameters_from_excel + +# %% Inputs + +parameters = get_parameters_from_excel(excel_file='PackageTemplate_Inputs.xlsx') + +# %% New Directory + +# Path to the template directory +template_dir = 'package_foler' +new_package_dir = f'../{parameters["project_package_name"]}' + +# Copy the template directory to a new location +shutil.copytree(template_dir, new_package_dir) + +# Rename the package folder +old_folder = f'../{parameters["project_package_name"]}/folder' +new_folder = f'../{parameters["project_package_name"]}/' + parameters["package_name"] +os.rename(old_folder, new_folder) + +# %% Updates the files + +# Function to replace placeholders in a file +def replace_placeholders(file_path, placeholders): + with open(file_path, 'r') as file: + content = file.read() + for placeholder, value in placeholders.items(): + content = content.replace(placeholder, value) + with open(file_path, 'w') as file: + file.write(content) + + +# Dictionary of placeholders to replace +placeholders = { + "{{PACKAGE_NAME}}": parameters["package_name"], + "{{PROJECT_NAME}}": parameters["project_package_name"], + "{{LONG_DESCRIPTION}}": parameters["long_description"], + "{{SHORT_DESCRIPTION}}": parameters["description"], + "{{AUTHOR}}": parameters["author"], + "{{CONTACT}}": parameters["contact"], + "{{VERSION}}": parameters["version"], + "{{DATE}}": date.today().strftime("%d/%m/%Y") + " (Initialization)", + '{{REQUIRED_PACKAGES}}': parameters["required_packages"]} + + +# Recursively find and update all files in the new package directory +for root, dirs, files in os.walk(new_package_dir): + for file_name in files: + file_path = os.path.join(root, file_name) + replace_placeholders(file_path, placeholders) + +print(f"The package '{parameters['package_name']}' has been successfully generated in {new_package_dir}.") + +# %% Git Repository + +# Initialize a new Git repository +os.chdir(new_package_dir) # Change directory to the new package directory +subprocess.run(['git', 'init']) # Initialize a new git repository +subprocess.run(['git', 'add', '.']) # Add all files to staging +subprocess.run(['git', 'commit', '-m', 'Initial commit']) # Commit the changes + +# Rename the default branch to 'master' +subprocess.run(['git', 'branch', '-M', 'master']) + + +# Set up the upstream repository and push +push_command = ( + f"git push --set-upstream git@{parameters['remote_url']}/" + f"$(git rev-parse --show-toplevel | xargs basename).git " + f"$(git rev-parse --abbrev-ref HEAD)" +) +subprocess.run(push_command, shell=True) + +print(f"A new Git repository has been initialized in {new_package_dir}.") diff --git a/logo.png b/logo.png deleted file mode 100644 index 70050e88c8358105ef9650a453844e24bedc6b9e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2118 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 t$xw=?(\d+\.\d+)$', version): + raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: '>=3.8'.") + +def validate_required_packages(packages): + """ + Validate the format of required packages and versions. + """ + if packages: + for package in packages.split(','): + if not re.match(r'^[a-zA-Z0-9_-]+(==|>=|<=|~=)?[0-9.]*$', package.strip()): + raise ValueError(f"Invalid package requirement '{package}'. Ensure correct formatting.") diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py new file mode 100644 index 0000000..c1c4ba7 --- /dev/null +++ b/methods/methods_get_parameters_from_excel.py @@ -0,0 +1,77 @@ + +import pandas as pd +from .methods_check_inputs import * + +def get_parameters_from_excel(excel_file): + + # Read the Excel file + df = pd.read_excel(excel_file) + df = df.fillna("") + + parameters = {} + + # %% Package name + + package_name = df['Package name'][0] + validate_package_name(package_name) + check_pypi_package_name(package_name) + project_package_name = ''.join(x.title() for x in package_name.split('_')) + + parameters["package_name"] = package_name + parameters["project_package_name"] = project_package_name + + # %% Package URL + + remote_url = df["Package URL"][0] + validate_url(remote_url) + parameters["remote_url"] = remote_url + + # %% Short description + + description = df['Short description'][0] + if not description: + description = "A Specific package for a technological issue." + parameters["description"] = description + + # %% Long description + + long_description = df['Long description'][0] + if not long_description: + long_description = "A Python package using DessiA SDK and DessiA coding guidelines (https://documentation.dessia.io)" + parameters["long_description"] = long_description + + # %% Python version + + version = df['Python version'][0] + if not version: + version = ">=3.9" + else: + validate_python_version(version) + parameters["version"] = version + + # %% Author + + author = df['Author'][0] + if not author: + author = "Operations-Team" + parameters["author"] = author + + # %% E-mail + + contact = df['E-mail'][0] + if not contact: + contact = "support@dessia.io" + else: + validate_email(contact) + parameters["contact"] = contact + + # %% Required packages + + required_packages = df['Required packages'][0].replace("\n", "") + if not required_packages: + required_packages = ["dessia_common>=0.18.0, plot_data>=0.26.0"] + else: + validate_required_packages(required_packages) + parameters["required_packages"] = required_packages + + return parameters \ No newline at end of file diff --git a/package_foler/.coveragerc b/package_foler/.coveragerc new file mode 100644 index 0000000..434f28c --- /dev/null +++ b/package_foler/.coveragerc @@ -0,0 +1,2 @@ +[run] +source={{PACKAGE_NAME}} diff --git a/.gitignore b/package_foler/.gitignore similarity index 100% rename from .gitignore rename to package_foler/.gitignore diff --git a/package_foler/.gitlab-ci.yml b/package_foler/.gitlab-ci.yml new file mode 100644 index 0000000..b6fe5b4 --- /dev/null +++ b/package_foler/.gitlab-ci.yml @@ -0,0 +1,59 @@ +stages: + - check + - test + + +check_changelog_update: + stage: check + tags: + - dessia_ubuntu + image: python:3.9 + script: + - git fetch --depth=1000 origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME + - if git diff --name-only origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME...HEAD | grep -q 'CHANGELOG.md'; then echo "Changelog has been updated"; else echo "CHANGELOG.md has not been updated. Update it for the PR to be accepted in CI."; exit 1; fi + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + + +check_code_complexity: + stage: check + tags: + - dessia_ubuntu + image: dessia/python-ci:3.9 + script: + - pip install numpy Cython>3 + - pip install pylint==3.2.6 pydocstyle==6.3.0 pre-commit shellcheck-py cython-lint pyenchant==3.2.2 + - python code_pylint.py + - python code_pydocstyle.py + - pre-commit run -a + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + + +install_run_scripts_and_unittests: + stage: test + tags: + - dessia_ubuntu + image: python:3.9 + script: + - cd .. + - git clone https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.com/dessia/sdk/volmdlr.git + - cd volmdlr + - git checkout master + - pip install . + - cd ../{{PROJECT_NAME}} + - pip install coverage + - git fetch --tags + - pip install . + - cd tests + - coverage run --rcfile=../.coveragerc --data-file=../.coverage --source {{PACKAGE_NAME}} -m unittest discover -v + - cd ../scripts + - coverage run --rcfile=../.coveragerc --data-file=../.coverage --source {{PACKAGE_NAME}} -a ci_scripts.py + - cd .. + - coverage json + - coverage report + - coverage html + - python coverage.py + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + diff --git a/package_foler/.gitlab/issue_templates/issue_template.md b/package_foler/.gitlab/issue_templates/issue_template.md new file mode 100644 index 0000000..94feecc --- /dev/null +++ b/package_foler/.gitlab/issue_templates/issue_template.md @@ -0,0 +1,46 @@ +### Issue Type + - [ ] bug report + - [ ] feature request + + +### Description +- Provide a detailed description of the issue or feature request. Include as much relevant information as possible. + + +### Steps to Reproduce (for bugs) +1. Describe the steps necessary to reproduce the issue. +2. Include any relevant commands or code snippets. + + +### Expected Behavior +- Describe what you expected to happen. + + +### Actual Behavior +- Describe what actually happened. Include screenshots or logs if they help illustrate the issue + + +### Environment +- Include information about your environment that might be relevant: + - **Python Version**: + + - **Package Version**: + + - **Volmdlr Version**: + + - **Dessia_common Version**: + + - **Plot_data Version**: + + +### Additional Information +- Provide any additional information that might help diagnose the problem, such as recent changes to your system or configuration. + + +### Possible Solution (optional) +- If you have an idea of what might be causing the issue or how to fix it, please provide details here. + + +### Related Issues +- If this issue is related to or duplicates another issue, please provide links to those issues. + diff --git a/package_foler/.gitlab/merge_request_templates/merge_request_template.md b/package_foler/.gitlab/merge_request_templates/merge_request_template.md new file mode 100644 index 0000000..8962805 --- /dev/null +++ b/package_foler/.gitlab/merge_request_templates/merge_request_template.md @@ -0,0 +1,39 @@ +### Description +- Provide a detailed description of the changes proposed in this merge request. Explain why these changes are being made and what problem they solve. + + +### Related Issues +- Link any related issues or tickets that this merge request addresses. For example: `Fixes #123`, `Related to #456`. + + +### Type of Change +- Select the type of change this merge request introduces: + - [ ] **Bug fix**: Fixes an issue or bug. + - [ ] **New feature**: Adds a new feature or functionality. + - [ ] **Enhancement**: Improves existing functionality. + - [ ] **Refactoring**: Changes code structure without affecting functionality. + - [ ] **Documentation**: Updates or adds documentation. + - [ ] **Other**: Describe any other type of change. + + +### Checklist +- Ensure that your merge request meets the following criteria: + - The request is thematic and its title is explicit. + - The commit messages follow our guidelines (explicit, in english) + - Code follows the project's coding style guidelines. + - Code is well-tested with unit tests and/or integration tests. + - Documentation has been updated. + - Any new dependencies have been added to `requirements.txt` (if applicable). + - CHANGELOG.md has been updated + - Merge request includes relevant screenshots (if applicable). + + +### Testing +- Describe how you tested the changes. Include details about the environment and any specific tests you performed. +- Include any relevant test results or logs. + + +### Additional Information +- Provide any additional information that may be useful for reviewers, such as potential impacts on other parts of the project, specific areas to review, or known issues. + + diff --git a/package_foler/.isort.cfg b/package_foler/.isort.cfg new file mode 100644 index 0000000..5d7bf33 --- /dev/null +++ b/package_foler/.isort.cfg @@ -0,0 +1,2 @@ +[tool.isort] +profile = "black" diff --git a/package_foler/.pre-commit-config.yaml b/package_foler/.pre-commit-config.yaml new file mode 100644 index 0000000..3099cf7 --- /dev/null +++ b/package_foler/.pre-commit-config.yaml @@ -0,0 +1,40 @@ +# File introduces automated checks triggered on git events +# to enable run `pip install pre-commit && pre-commit install` + +repos: + - repo: https://github.com/pycqa/isort + rev: 5.12.0 + hooks: + - id: isort + args: ["--profile", "black"] + + - repo: https://github.com/psf/black + rev: 22.10.0 + hooks: + - id: black + args: [-l, "120"] + # It is recommended to specify the latest version of Python + # supported by your project here, or alternatively use + language_version: python3.9 + + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v3.2.0 + hooks: + - id: check-added-large-files + args: ['--maxkb=50'] + - id: check-docstring-first + - id: check-json + - id: check-added-large-files + - id: check-yaml + - id: debug-statements + - id: requirements-txt-fixer + - id: check-merge-conflict + #- id: end-of-file-fixer + + - repo: local + hooks: + - id: shellcheck + name: shellcheck + entry: shellcheck + language: system + types: [shell] diff --git a/.pylintrc b/package_foler/.pylintrc similarity index 98% rename from .pylintrc rename to package_foler/.pylintrc index b1c3501..1f7127b 100644 --- a/.pylintrc +++ b/package_foler/.pylintrc @@ -3,7 +3,7 @@ # A comma-separated list of package or module names from where C extensions may # be loaded. Extensions are loading into the active Python interpreter and may # run arbitrary code. -extension-pkg-whitelist= +extension-pkg-whitelist=scipy # Specify a score threshold to be exceeded before program exits with error. fail-under=10.0 @@ -130,7 +130,7 @@ ignore-docstrings=yes ignore-imports=no # Minimum lines number of a similarity. -min-similarity-lines=4 +min-similarity-lines=6 [TYPECHECK] @@ -354,6 +354,9 @@ function-naming-style=snake_case good-names=i, j, k, + x, + y, + z, ex, Run, _ @@ -507,5 +510,5 @@ valid-metaclass-classmethod-first-arg=cls # Exceptions that will emit a warning when being caught. Defaults to # "BaseException, Exception". -overgeneral-exceptions=BaseException, - Exception +overgeneral-exceptions=builtins.BaseException, + builtins.Exception diff --git a/package_foler/CHANGELOG.md b/package_foler/CHANGELOG.md new file mode 100644 index 0000000..8c8e677 --- /dev/null +++ b/package_foler/CHANGELOG.md @@ -0,0 +1,26 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + + +## [v0.1.0] - Unreleased + +### New Features + +### Fixes + +### Updates + +### Refactorings + +### Performance improvements & Optimization + +### Untittests + +### CI + + +## [v0.0.1] - {{DATE}} diff --git a/package_foler/README.md b/package_foler/README.md new file mode 100644 index 0000000..8edc34e --- /dev/null +++ b/package_foler/README.md @@ -0,0 +1,31 @@ +# {{PROJECT_NAME}} + +{{LONG_DESCRIPTION}} + +## Installation + +To install the package, move to the folder next to setup.py and run: +```bash +python setup.py install +``` +or +```bash +python3 setup.py install +``` +## Usage + +See the scripts folder for examples. + +## Features + + +## Contributing + + +## License + + +## Contact + +For any questions or issues, please contact the {{AUTHOR}} at {{CONTACT}}. + diff --git a/package_foler/code_pydocstyle.py b/package_foler/code_pydocstyle.py new file mode 100644 index 0000000..56c5a24 --- /dev/null +++ b/package_foler/code_pydocstyle.py @@ -0,0 +1,81 @@ +""" +PyDocStrings Analysis. +""" + +import os +import random +from glob import glob + +import pydocstyle + +exclude_folders = {""} + + +def should_exclude_folder(path): + # Vérifie si le chemin contient un des dossiers à exclure + return any(ex in path for ex in exclude_folders) + + +file_list = filter( + lambda z: not z.endswith("__init__.py") and not should_exclude_folder(z), + [y for x in os.walk("./{{PACKAGE_NAME}}") for y in glob(os.path.join(x[0], "*.py"))], +) + + +UNWATCHED_ERRORS = [ + # Do not watch these errors + # General Format and Content Issues + 'D100', 'D104', 'D105', 'D107', + # Docstring Formatting + 'D200', 'D202', 'D203', 'D204', 'D206', 'D210', 'D212', + # Docstring Content and Structure + 'D301', 'D302', + 'D401', 'D402', 'D407', 'D408', 'D409', + 'D412', 'D415', 'D418' +] + +MAX_ERROR_BY_TYPE = { + # If the error code is not in this dict, then there is no tolerance on the error. + # http://www.pydocstyle.org/en/stable/error_codes.html + } + +error_detected = False +error_over_ratchet_limit = False +ratchet_limit = 9 + +code_to_errors = {} +for error in pydocstyle.check(file_list, ignore=UNWATCHED_ERRORS): + code_to_errors.setdefault(error.code, []) + code_to_errors[error.code].append(error) + +code_to_number = {code: len(errors) for code, errors in code_to_errors.items()} + +for error_code, number_errors in code_to_number.items(): + if error_code not in UNWATCHED_ERRORS: + max_errors = max(MAX_ERROR_BY_TYPE.get(error_code, 0), 0) + + if number_errors > max_errors: + error_detected = True + print(f"\nFix some {error_code} errors: {number_errors}/{max_errors}") + + errors = code_to_errors[error_code] + errors_to_show = sorted(random.sample(errors, min(30, len(errors))), key=lambda m: (m.filename, m.line)) + for error in errors_to_show: + print(f"{error.filename} line {error.line}: {error.message}") + elif max_errors - ratchet_limit <= number_errors < max_errors: + print( + f"\nYou can lower number of {error_code} to {number_errors} (actual {max_errors})" + ) + elif number_errors < max_errors - ratchet_limit: + error_over_ratchet_limit = True + print( + f"\nYou MUST lower number of {error_code} to {number_errors} (actual {max_errors})" + ) + +if error_detected: + raise RuntimeError("Too many errors\nRun pydocstyle {{PACKAGE_NAME}} to get the errors") + +if error_over_ratchet_limit: + raise RuntimeError( + "Please lower the error limits in code_pydocstyle.py MAX_ERROR_BY_TYPE according to warnings above" + ) diff --git a/package_foler/code_pylint.py b/package_foler/code_pylint.py new file mode 100644 index 0000000..fd1880c --- /dev/null +++ b/package_foler/code_pylint.py @@ -0,0 +1,178 @@ +""" +Pylint Analysis. +""" + +from pylint.lint import Run + +MIN_NOTE = 8 + +UNWATCHED_ERRORS = [] + +MAX_ERROR_BY_TYPE = { + "line-too-long": 0, + "consider-using-f-string": 0, + "no-else-return": 0, + "implicit-str-concat": 0, + "consider-using-in": 0, + "used-before-assignment": 0, + "missing-docstring": 0, + "too-many-arguments": 0, + "too-many-locals": 0, + "too-many-return-statements": 0, + "invalid-name": 0, + "redefined-outer-name": 0, + "unused-variable": 0, + "import-error": 0, + "duplicate-code": 0, + "bad-continuation": 0, + "no-member": 0, + "logging-format-interpolation": 0, + "too-many-nested-blocks": 0, + "abstract-method": 0, + "access-member-before-definition": 0, + "arguments-differ": 0, + "bare-except": 0, + "blacklisted-name": 0, + "breaking-import": 0, + "const-righteous": 0, + "deprecated-module": 0, + "duplicate-argument-name": 0, + "duplicate-key": 0, + "eval-used": 0, + "fixme": 0, + "global-statement": 0, + "import-outside-toplevel": 0, + "invalid-unary-operand-type": 0, + "length-of-docstring": 0, + "no-attribute": 0, + "no-else-continue": 0, + "no-self-use": 0, + "not-callable": 0, + "not-supported-yet": 0, + "redundant-unittest-assert": 0, + "reimported": 0, + "too-many-branches": 0, + "too-many-function-args": 0, + "too-many-function-attributes": 0, + "too-many-instance-attributes": 0, + "too-many-public-methods": 0, + "unexpected-keyword-arg": 0, + "unidiomatic-typecheck": 0, + "unnecessary-comprehension": 0, + "unused-import": 0, + "wrong-import-position": 0, + "abstract-method": 0, + "access-member-before-definition": 0, + "arguments-differ": 0, + "bare-except": 0, + "blacklisted-name": 0, + "breaking-import": 0, + "const-righteous": 0, + "deprecated-module": 0, + "duplicate-argument-name": 0, + "duplicate-key": 0, + "eval-used": 0, + "fixme": 0, + "global-statement": 0, + "import-outside-toplevel": 0, + "invalid-unary-operand-type": 0, + "length-of-docstring": 0, + "no-attribute": 0, + "no-else-continue": 0, + "no-self-use": 0, + "not-callable": 0, + "not-supported-yet": 0, + "redundant-unittest-assert": 0, + "reimported": 0, + "too-many-branches": 0, + "too-many-function-args": 0, + "too-many-function-attributes": 0, + "too-many-instance-attributes": 0, + "too-many-public-methods": 0, + "unexpected-keyword-arg": 0, + "unidiomatic-typecheck": 0, + "unnecessary-comprehension": 0, + "unused-import": 0, + "wrong-import-position": 0, + "invalid-name": 0, + "missing-module-docstring": 0, + "missing-class-docstring": 0, + "missing-function-docstring": 0, + "no-qa": 0, + "no-else-continue": 0, + "not-context-manager": 0, + "too-few-public-methods": 0, + "unnecessary-pass": 0, + "invalid-sequence-index": 0, + "logging-format-interpolation": 0, + "no-method-argument": 0, + "too-many-nested-blocks": 0, + "no-else-return": 0, + "redefined-builtin": 0, + "superfluous-parens": 0, + "useless-object-inheritance": 0, + "no-member": 0, + "not-callable": 0, + "trailing-whitespace": 0, + "invalid-name": 0, + "duplicate-code": 0, + "bad-continuation": 0, + "fixme": 0, + "redefined-outer-name": 0, +} + +import os +import sys + +f = open(os.devnull, "w") + +old_stdout = sys.stdout +sys.stdout = f + +results = Run(["{{PACKAGE_NAME}}", "--output-format=json", "--reports=no"], do_exit=False) +# `exit` is deprecated, use `do_exit` instead +sys.stdout = old_stdout + +PYLINT_OBJECTS = True +if hasattr(results.linter.stats, "global_note"): + pylint_note = results.linter.stats.global_note + PYLINT_OBJECT_STATS = True +else: + pylint_note = results.linter.stats["global_note"] + PYLINT_OBJECT_STATS = False + +print("Pylint note: ", pylint_note) +assert pylint_note >= MIN_NOTE +print("You can increase MIN_NOTE in pylint to {} (actual: {})".format(pylint_note, MIN_NOTE)) + + +def extract_messages_by_type(type_): + return [m for m in results.linter.reporter.messages if m.symbol == type_] + + +# uncontrolled_errors = {} +error_detected = False + +if PYLINT_OBJECT_STATS: + stats_by_msg = results.linter.stats.by_msg +else: + stats_by_msg = results.linter.stats["by_msg"] + +for error_type, number_errors in stats_by_msg.items(): + if error_type not in UNWATCHED_ERRORS: + if error_type in MAX_ERROR_BY_TYPE: + max_errors = MAX_ERROR_BY_TYPE[error_type] + else: + max_errors = 0 + + if number_errors > max_errors: + error_detected = True + print("Fix some {} errors: {}/{}".format(error_type, number_errors, max_errors)) + for message in extract_messages_by_type(error_type): + print("{} line {}: {}".format(message.path, message.line, message.msg)) + elif number_errors < max_errors: + print("You can lower number of {} to {} (actual {})".format(error_type, number_errors, max_errors)) + + +if error_detected: + raise RuntimeError("Too many errors. Run pylint {{PACKAGE_NAME}} to get the errors") diff --git a/package_foler/coverage.py b/package_foler/coverage.py new file mode 100644 index 0000000..1d16def --- /dev/null +++ b/package_foler/coverage.py @@ -0,0 +1,41 @@ +""" +Coverage Analysis. +""" + +import json + +MIN_FILE_COVERAGE = 60 +MIN_PROJECT_COVERAGE = 74 + +untracked_modules = [] + +print("untracked modules:", untracked_modules) + +with open("coverage.json", "r") as file: + d = json.load(file) + +project_coverage = d["totals"]["percent_covered"] + +print(f"total covered: {project_coverage} %") +assert project_coverage > MIN_PROJECT_COVERAGE +print( + f"[Coverage] You can increase MIN_PROJECT_COVERAGE to maximum {project_coverage}%" + f" (actual {MIN_PROJECT_COVERAGE}%)" +) + +min_actual_coverage = 100 +for file_name, data in d["files"].items(): + print(file_name, data["summary"]["percent_covered"], "%") + if "/".join(file_name.split("/")[-2:]) in untracked_modules: + print(file_name, "-> in untrack list") + else: + file_coverage = data["summary"]["percent_covered"] + if file_coverage < MIN_FILE_COVERAGE: + raise RuntimeError(f"File {file_name} is not covered enough: {file_coverage} % / {MIN_FILE_COVERAGE} %") + min_actual_coverage = min(min_actual_coverage, data["summary"]["percent_covered"]) + +print( + "[Coverage] You can increase MIN_FILE_COVERAGE to maximum {}% (actual:{})%".format( + min_actual_coverage, MIN_FILE_COVERAGE + ) +) diff --git a/package_foler/folder/__init__.py b/package_foler/folder/__init__.py new file mode 100644 index 0000000..cd98dcd --- /dev/null +++ b/package_foler/folder/__init__.py @@ -0,0 +1,9 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +{{PROJECT_NAME}} Package +""" + +import pkg_resources + +__version__ = pkg_resources.require("{{PACKAGE_NAME}}")[0].version diff --git a/package_foler/folder/module_1.py b/package_foler/folder/module_1.py new file mode 100644 index 0000000..5f5ba6f --- /dev/null +++ b/package_foler/folder/module_1.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Module Documentation +""" + + diff --git a/package_foler/folder/module_2.py b/package_foler/folder/module_2.py new file mode 100644 index 0000000..5f5ba6f --- /dev/null +++ b/package_foler/folder/module_2.py @@ -0,0 +1,7 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Module Documentation +""" + + diff --git a/package_foler/requirements.txt b/package_foler/requirements.txt new file mode 100644 index 0000000..74fa65e --- /dev/null +++ b/package_foler/requirements.txt @@ -0,0 +1,3 @@ +matplotlib +numpy +scipy diff --git a/package_foler/scripts/ci_scripts.py b/package_foler/scripts/ci_scripts.py new file mode 100644 index 0000000..a452749 --- /dev/null +++ b/package_foler/scripts/ci_scripts.py @@ -0,0 +1,44 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Excute Scripts. +""" + +import os +import time + +scripts = ["script_1.py"] + +# Testing if all scripts exists before launching them +for script_name in scripts: + if not os.path.isfile(script_name): + raise FileNotFoundError(f"Script {script_name} does not exists in CI scripts") + +# Executing scripts +print("Executing scripts for CI:") +total_time = time.time() +top_level_dir = os.getcwd() +times = {} +for script_name in scripts: + print(f"\t* {script_name}") + # Reset dir + os.chdir(top_level_dir) + # Change cwd + if "/" in script_name: + script_folder = "/".join(script_name.split("/")[:-1]) + if script_folder: + script_folder = os.path.join(top_level_dir, script_folder) + os.chdir(script_folder) + file_name = script_name.split("/")[-1] + t = time.time() + with open(file_name, "r", encoding="utf-8") as script: + exec(script.read()) + t = time.time() - t + times[script_name] = t + +print("Computation times:") +for script_name, t in sorted(times.items(), key=lambda x: x[1]): + print(f"* script {script_name}: {round(t, 3)} seconds ") + +total_time = time.time() - total_time +print(f"Total time for CI scripts: {total_time}") diff --git a/package_foler/scripts/script_1.py b/package_foler/scripts/script_1.py new file mode 100644 index 0000000..95093e9 --- /dev/null +++ b/package_foler/scripts/script_1.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Script_1 +""" + diff --git a/package_foler/scripts/script_2.py b/package_foler/scripts/script_2.py new file mode 100644 index 0000000..5778975 --- /dev/null +++ b/package_foler/scripts/script_2.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Script_2 +""" + diff --git a/package_foler/setup.py b/package_foler/setup.py new file mode 100644 index 0000000..2b45337 --- /dev/null +++ b/package_foler/setup.py @@ -0,0 +1,103 @@ +import re +from os.path import dirname, isdir, join +from subprocess import CalledProcessError, check_output + +from setuptools import find_packages, setup + +tag_re = re.compile(r"\btag: %s([0-9][^,]*)\b") +version_re = re.compile("^Version: (.+)$", re.M) + + +def readme(): + with open("README.md") as f: + return f.read() + + +def version_from_git_describe(version): + if version[0] == "v": + version = version[1:] + + # PEP 440 compatibility + number_commits_ahead = 0 + if "-" in version: + version, number_commits_ahead, commit_hash = version.split("-") + number_commits_ahead = int(number_commits_ahead) + + # print('number_commits_ahead', number_commits_ahead) + + split_versions = version.split(".") + if "post" in split_versions[-1]: + suffix = split_versions[-1] + split_versions = split_versions[:-1] + else: + suffix = None + + for pre_release_segment in ["a", "b", "rc"]: + if pre_release_segment in split_versions[-1]: + if number_commits_ahead > 0: + split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) + if len(split_versions) == 2: + split_versions.append("0") + if len(split_versions) == 1: + split_versions.extend(["0", "0"]) + + split_versions[-1] = str(int(split_versions[-1]) + 1) + future_version = ".".join(split_versions) + return "{}.dev{}".format(future_version, number_commits_ahead) + else: + return ".".join(split_versions) + + if number_commits_ahead > 0: + if len(split_versions) == 2: + split_versions.append("0") + if len(split_versions) == 1: + split_versions.extend(["0", "0"]) + split_versions[-1] = str(int(split_versions[-1]) + 1) + split_versions = ".".join(split_versions) + return "{}.dev{}+{}".format(split_versions, number_commits_ahead, commit_hash) + else: + if suffix is not None: + split_versions.append(suffix) + + return ".".join(split_versions) + + +def get_version(): + # Return the version if it has been injected into the file by git-archive + version = tag_re.search("$Format:%D$") + if version: + return version.group(1) + + d = dirname(__file__) + + if isdir(join(d, ".git")): + cmd = "git describe --tags" + try: + version = check_output(cmd.split()).decode().strip()[:] + + except CalledProcessError: + # raise RuntimeError("Unable to get version number from git tags") + return "0.0.1" + + return version_from_git_describe(version) + else: + # Extract the version from the PKG-INFO file. + with open(join(d, "PKG-INFO")) as f: + version = version_re.search(f.read()).group(1) + + # print('version', version) + return version + +install_requires = ["{{REQUIRED_PACKAGES}}"][0].split(',') + +setup( + version=get_version(), + name="{{PACKAGE_NAME}}", + description="{{SHORT_DESCRIPTION}}", + long_description=readme(), + author="{{AUTHOR}}", + author_email="{{CONTACT}}", + install_requires=install_requires, + python_requires="{{VERSION}}", + packages=find_packages(), +) diff --git a/package_foler/tests/__init__.py b/package_foler/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/package_foler/tests/test_exemple.py b/package_foler/tests/test_exemple.py new file mode 100644 index 0000000..9bb2355 --- /dev/null +++ b/package_foler/tests/test_exemple.py @@ -0,0 +1,12 @@ +import unittest +import numpy as npy + + +class TestClassName(unittest.TestCase): + + def test_method_name(self): + results = [0, 3, 0] + self.assertTrue(npy.all(results == npy.array([0, 3, 0]))) + +if __name__ == "__main__": + unittest.main() \ No newline at end of file diff --git a/python.gitignore b/python.gitignore deleted file mode 100644 index 73358ad..0000000 --- a/python.gitignore +++ /dev/null @@ -1,139 +0,0 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class - -# C extensions -*.so - -# Distribution / packaging -.Python -build/ -develop-eggs/ -dist/ -downloads/ -eggs/ -.eggs/ -lib/ -lib64/ -parts/ -sdist/ -var/ -wheels/ -share/python-wheels/ -*.egg-info/ -.installed.cfg -*.egg -MANIFEST - -# PyInstaller -# Usually these files are written by a python script from a template -# before PyInstaller builds the exe, so as to inject date/other infos into it. -*.manifest -*.spec - -# Installer logs -pip-log.txt -pip-delete-this-directory.txt - -# Unit test / coverage reports -htmlcov/ -.tox/ -.nox/ -.coverage -.coverage.* -.cache -nosetests.xml -coverage.xml -*.cover -*.py,cover -.hypothesis/ -.pytest_cache/ -cover/ - -# Translations -*.mo -*.pot - -# Django stuff: -*.log -local_settings.py -db.sqlite3 -db.sqlite3-journal - -# Flask stuff: -instance/ -.webassets-cache - -# Scrapy stuff: -.scrapy - -# Sphinx documentation -docs/_build/ - -# PyBuilder -.pybuilder/ -target/ - -# Jupyter Notebook -.ipynb_checkpoints - -# IPython -profile_default/ -ipython_config.py - -# pyenv -# For a library or package, you might want to ignore these files since the code is -# intended to run in multiple environments; otherwise, check them in: -# .python-version - -# pipenv -# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. -# However, in case of collaboration, if having platform-specific dependencies or dependencies -# having no cross-platform support, pipenv may install dependencies that don't work, or not -# install all needed dependencies. -#Pipfile.lock - -# PEP 582; used by e.g. github.com/David-OConnor/pyflow -__pypackages__/ - -# Celery stuff -celerybeat-schedule -celerybeat.pid - -# SageMath parsed files -*.sage.py - -# Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Spyder project settings -.spyderproject -.spyproject - -# Rope project settings -.ropeproject - -# mkdocs documentation -/site - -# mypy -.mypy_cache/ -.dmypy.json -dmypy.json - -# Pyre type checker -.pyre/ - -# pytype static type analyzer -.pytype/ - -# Cython debug symbols -cython_debug/ - diff --git a/quickstart.py b/quickstart.py deleted file mode 100644 index b90b8ae..0000000 --- a/quickstart.py +++ /dev/null @@ -1,263 +0,0 @@ -import os -from typing import Tuple -import shutil - -from pathlib import Path - -from templates import manifest_template, readme_template, default_module_content, drone_template, test_template,\ - code_quality_template, code_pep8_template, code_pylint_template, setup_template - -parent_folder = Path(os.getcwd()).parent - - -print('=======================') -print(' DessiA Bot quickstart') -print('=======================\n') -print('This script will generate for you the files needed to create a python package respecting DessiA guidelines.') -print("If you don't understand a question or have no preference just type enter to have the default choice selected.") -print('Most questions have to be answered with y=yes or n=no. Default value if nothing is answered is written in capital\n') -input('Type any key to begin the process...') -print('') - - -def has_special_char(string: str) -> Tuple[bool, str]: - for char in ['&', 'é', '~', '"', ',', "'", '{', '(', '£', - ',', '-', '|', 'è', "`", 'ç', '^', ';', '$', - 'à', '@', ')', ']', '°', '=', '}', ':', 'µ' - '+', '*', '/', '.', '\\', '?', '!', '%', 'ù']: - if char in string: - return True, char - return False, '' - - -def enter_valid_name(target: str, default: str = None): - valid_name = False - n_retries = 0 - while not valid_name and n_retries < 10: - if default is None: - prompt = 'Enter {} name : '.format(target) - else: - prompt = 'Enter {} name (default : {}) : '.format(target, default) - name = input(prompt) - has_special, special_char = has_special_char(name) - if not name and default is not None: - name = default - - valid_name = (len(name) > 3 and name.islower() and not has_special) - if not valid_name: - n_retries += 1 - msg = '{} name is not valid.\n'.format(target) - msg += 'It must not contain caps nor special characters apart from "_"' - msg += 'and must be longer than 3 characters.\n' - msg += 'Please retry. ({}/10)'.format(n_retries) - print(msg) - if not valid_name: - msg = 'Maximum retries exceeded, {} name is not valid'.format(target) - raise ValueError(msg) - return name - - -package_name = enter_valid_name('Package') - -git_use = input('Do you want to use git in this project (eventually through a service like Github, Gitlab, Gitea, Gogs)?: (Y/n): ') -git_use = git_use.lower() != 'n' -if git_use: - done = input('Create a repository on your service (Github, Gitlab, Gitea, Gogs) and clone it on your computer. Press enter when done') - git_detected = False - while not git_detected: - project_path = input('Where is the git repo folder? current folder: {}: '.format(parent_folder)) - if not os.path.isabs(project_path): - project_path = os.path.join(parent_folder, project_path) - git_folder = os.path.join(project_path, '.git') - if os.path.isdir(git_folder): - print('{} is a valid git repo'.format(project_path)) - git_detected = True - else: - print('No .git subfolder found in {} Please retry.'.format(project_path)) - - - -else: - base_folder = input("Select parent folder in which the project will be generated (default: {}): ".format(parent_folder)) - if not base_folder: - base_folder = parent_folder - else: - if not os.path.exists(base_folder): - print('Creating base folder as it does not exists') - os.makedirs(base_folder) - print('Project will be created in folder {}'.format(base_folder)) - project_path = os.path.join(base_folder, package_name) - - if os.path.exists(project_path): - confirm = input('the folder {} already exists. Confirm to use existing folder (y/N): '.format(project_path)) - if confirm.lower() not in ['y', 'yes']: - raise ValueError('Aborting in using existing folder') - else: - os.mkdir(project_path) - -package_path = os.path.join(project_path, package_name) - -if not os.path.exists(package_path): - os.mkdir(package_path) - -assets_path = os.path.join(package_path, 'assets') -if not os.path.exists(assets_path): - os.mkdir(assets_path) - -shutil.copyfile('logo.png', os.path.join(assets_path, '{}.png'.format(package_name))) - - -setup_path = os.path.join(project_path, 'setup.py') -scripts_path = os.path.join(project_path, 'scripts') - -module_name = enter_valid_name('Module', 'core') -if not module_name: - module_name = 'core' - - -# shutil.copyfile('setup_template.py', setup_path) - -if not os.path.exists(scripts_path): - os.mkdir(scripts_path) - -init_path = os.path.join(package_path, '__init__.py') -if not os.path.exists(init_path): - init_file = open(init_path, 'x+') - init_file.writelines(["import pkg_resources\n", - "from .{} import *\n".format(module_name), - '__version__ = pkg_resources.require("{}")[0].version\n'.format(package_name)]) -else: - print('__init__.py already exists, skipping creation') - - -module_path = os.path.join(package_path, '{}.py'.format(module_name)) -if not os.path.exists(module_path): - module_file = open(module_path, 'x+') - module_file.write(default_module_content) -else: - print('base python module already exists, skipping creation') - -short_description = input('Enter a short description : ') -author_name = input('Enter your name : ') -author_mail = input('Enter your e-mail : ') -default_requirements = ['dessia_common>=0.7.2', 'volmdlr>=0.4.0'] -requirements = input("Enter required packages, separated by a coma (default : {})".format(default_requirements)) -python_version = input('Enter Python version (default : >=3.8) : ') -if not requirements: - requirements = default_requirements -else: - requirements = requirements.split(',') - -if not python_version: - python_version = ">=3.8" - -from_git_tags = input('Do you want to enable version from git tags? (Y/n): ') - -# Gitignore -create_gitignore = input('Do you want to create a python gitignore file? (Y/n): ') -create_gitignore = create_gitignore.lower() != 'n' - -gitignore_path = os.path.join(project_path, '.gitignore') -if create_gitignore: - shutil.copyfile('python.gitignore', gitignore_path) - -# README -create_readme = input('Do you want to create a README file? It will be used as long description. (Y/n): ') -create_readme = create_readme.lower() != 'n' - -readme_path = os.path.join(project_path, 'README.md') -if create_readme: - with open(readme_path, 'w') as f: - f.write(readme_template.substitute( - package_name=package_name, - author='{} ({})'.format(author_name, author_mail), - short_description=short_description, - )) - -# Tests -tests_dir = os.path.join(project_path, 'tests') -if not os.path.exists(tests_dir): - os.mkdir(tests_dir) - -for test_filename in ['coverage.py', 'ci_tests.py']: - test_file_path = os.path.join(tests_dir, test_filename) - shutil.copyfile(test_filename, test_file_path) - -test_path = os.path.join(tests_dir, 'test.py') -with open(test_path, 'w') as f: - f.write(test_template.substitute( - package_name=package_name, - )) - - -# Code quality -code_quality = input('Do you want to have some code quality checks? (Y/n): ') -code_quality = code_quality.lower() != 'n' - -if code_quality: - for filename in ['.pep8', '.pylintrc']: - cq_path = os.path.join(project_path, filename) - shutil.copyfile(filename, cq_path) - - for code_quality_filename, template_name in [('code_pep8.sh', code_pep8_template), - ('code_quality.sh', code_quality_template), - ('code_pylint.py', code_pylint_template)]: - # cq_path = os.path.join(package_path, code_quality_filename) - # shutil.copyfile(code_quality_filename, cq_path) - with open(os.path.join(project_path, code_quality_filename), 'w') as f: - f.write(template_name.substitute( - package_name=package_name, - )) - - -# CI -drone = input('Do you want to generate a .drone.yml file for drone.io CI? (Y/n): ') -drone = drone.lower() != 'n' - -if drone: - drone_path = os.path.join(project_path, '.drone.yml') - with open(drone_path, 'w') as f: - f.write(drone_template.substitute( - package_name=package_name)) - -# Writing setup file - -if from_git_tags.lower() == 'n': - version = "'0.0.1'" -else: - version = "get_version()" - -# setup_str += "\tname='{}',\n".format(package_name) -# setup_str += "\tdescription='{}',\n".format(short_description) -# if create_readme: -# setup_str += "\tlong_description=readme(),\n" -# setup_str += "\tlong_description_content_type='text/markdown',\n" -# else: -# setup_str += "\tlong_description='',\n" - -# setup_str += "\tauthor='{}',\n".format(author_name) -# setup_str += "\tauthor_email='{}',\n".format(author_mail) -# setup_str += "\tinstall_requires={},\n".format(requirements) -# setup_str += "\tpython_requires='{}',\n".format(python_version) -# setup_str += "\tpackages=find_packages(),\n" -# setup_str += ")" - -setup_str = setup_template.substitute(package_name=package_name, - version=version, - short_description = short_description, - author_name = author_name, - author_mail = author_mail, - requirements = requirements, - python_version = python_version) - -with open(setup_path, 'w') as setup_file: - setup_file.write(setup_str) - - -manifest_path = os.path.join(project_path, 'MANIFEST.in') -if not os.path.exists(manifest_path): - with open(manifest_path, 'w') as f: - f.write(manifest_template.substitute(package_name=package_name)) - - -print('Project generated to {}'.format(project_path)) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e5a1123 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,3 @@ +pandas>=2.1.1 +requests + diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..dd993cb --- /dev/null +++ b/setup.py @@ -0,0 +1,101 @@ +import re +from os.path import dirname, isdir, join +from subprocess import CalledProcessError, check_output + +from setuptools import find_packages, setup + +tag_re = re.compile(r"\btag: %s([0-9][^,]*)\b") +version_re = re.compile("^Version: (.+)$", re.M) + + +def readme(): + with open("README.md") as f: + return f.read() + + +def version_from_git_describe(version): + if version[0] == "v": + version = version[1:] + + # PEP 440 compatibility + number_commits_ahead = 0 + if "-" in version: + version, number_commits_ahead, commit_hash = version.split("-") + number_commits_ahead = int(number_commits_ahead) + + # print('number_commits_ahead', number_commits_ahead) + + split_versions = version.split(".") + if "post" in split_versions[-1]: + suffix = split_versions[-1] + split_versions = split_versions[:-1] + else: + suffix = None + + for pre_release_segment in ["a", "b", "rc"]: + if pre_release_segment in split_versions[-1]: + if number_commits_ahead > 0: + split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) + if len(split_versions) == 2: + split_versions.append("0") + if len(split_versions) == 1: + split_versions.extend(["0", "0"]) + + split_versions[-1] = str(int(split_versions[-1]) + 1) + future_version = ".".join(split_versions) + return "{}.dev{}".format(future_version, number_commits_ahead) + else: + return ".".join(split_versions) + + if number_commits_ahead > 0: + if len(split_versions) == 2: + split_versions.append("0") + if len(split_versions) == 1: + split_versions.extend(["0", "0"]) + split_versions[-1] = str(int(split_versions[-1]) + 1) + split_versions = ".".join(split_versions) + return "{}.dev{}+{}".format(split_versions, number_commits_ahead, commit_hash) + else: + if suffix is not None: + split_versions.append(suffix) + + return ".".join(split_versions) + + +def get_version(): + # Return the version if it has been injected into the file by git-archive + version = tag_re.search("$Format:%D$") + if version: + return version.group(1) + + d = dirname(__file__) + + if isdir(join(d, ".git")): + cmd = "git describe --tags" + try: + version = check_output(cmd.split()).decode().strip()[:] + + except CalledProcessError: + raise RuntimeError("Unable to get version number from git tags") + + return version_from_git_describe(version) + else: + # Extract the version from the PKG-INFO file. + with open(join(d, "PKG-INFO")) as f: + version = version_re.search(f.read()).group(1) + + # print('version', version) + return version + + +setup( + version=get_version(), + name="package_template", + description="This repository provides a template for creating new Python packages.", + long_description=readme(), + author="Dessia-Operations-Team", + author_email="support@dessia.io", + install_requires=[], + python_requires=">=3.8", + packages=find_packages(), +) diff --git a/setup_template.py b/setup_template.py deleted file mode 100644 index d9340d8..0000000 --- a/setup_template.py +++ /dev/null @@ -1,99 +0,0 @@ -from setuptools import setup, find_packages -import re -from os.path import dirname, isdir, join, exists -from subprocess import CalledProcessError, check_output - -tag_re = re.compile(r'\btag: %s([0-9][^,]*)\b') -version_re = re.compile('^Version: (.+)$', re.M) - - -def readme(): - with open('README.md') as f: - return f.read() - -def version_from_git_describe(version): - if version[0]=='v': - version = version[1:] - - # PEP 440 compatibility - number_commits_ahead = 0 - if '-' in version: - version, number_commits_ahead, commit_hash = version.split('-') - number_commits_ahead = int(number_commits_ahead) - - # print('number_commits_ahead', number_commits_ahead) - - split_versions = version.split('.') - if 'post' in split_versions[-1]: - suffix = split_versions[-1] - split_versions = split_versions[:-1] - else: - suffix = None - - for pre_release_segment in ['a', 'b', 'rc']: - if pre_release_segment in split_versions[-1]: - if number_commits_ahead > 0: - split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) - if len(split_versions) == 2: - split_versions.append('0') - if len(split_versions) == 1: - split_versions.extend(['0', '0']) - - split_versions[-1] = str(int(split_versions[-1])+1) - future_version = '.'.join(split_versions) - return '{}.dev{}'.format(future_version, number_commits_ahead) - else: - return '.'.join(split_versions) - - if number_commits_ahead > 0: - if len(split_versions) == 2: - split_versions.append('0') - if len(split_versions) == 1: - split_versions.extend(['0', '0']) - split_versions[-1] = str(int(split_versions[-1])+1) - split_versions = '.'.join(split_versions) - return '{}.dev{}'.format(split_versions, number_commits_ahead) - else: - if suffix is not None: - split_versions.append(suffix) - - return '.'.join(split_versions) - -# Just testing if get_version works well -assert version_from_git_describe('v0.1.7.post2') == '0.1.7.post2' -assert version_from_git_describe('v0.0.1-25-gaf0bf53') == '0.0.2.dev25' -assert version_from_git_describe('v0.1-15-zsdgaz') == '0.1.1.dev15' -assert version_from_git_describe('v1') == '1' -assert version_from_git_describe('v1-3-aqsfjbo') == '1.0.1.dev3' - -def get_version(): - # Return the version if it has been injected into the file by git-archive - version = tag_re.search('$Format:%D$') - if version: - return version.group(1) - - d = dirname(__file__) - pkg_info_path = join(d, 'PKG-INFO') - - if isdir(join(d, '.git')): - cmd = 'git describe --tags' - try: - version = check_output(cmd.split()).decode().strip()[:] - - except CalledProcessError: - raise RuntimeError('Unable to get version number from git tags: create a first v0.0.1 version to start!') - - return version_from_git_describe(version) - - elif exists(pkg_info_path): - # try to extract the version from the PKG-INFO file. - with open(pkg_info_path, 'r') as f: - version = version_re.search(f.read()).group(1) - else: - print('No version found from git tags nor from PKGINFO. defaulting to 0.0.1') - version='0.0.1' - - return version - - - diff --git a/templates.py b/templates.py deleted file mode 100644 index 759ea53..0000000 --- a/templates.py +++ /dev/null @@ -1,382 +0,0 @@ -import string - -manifest_template = string.Template('''recursive-include $package_name/assets *.html *.js *ts *.jpg *.png -recursive-include scripts *.py -recursive-include $package_name/models *.py -prune .git -''') - -readme_template = string.Template('''# $package_name - -$package_name is a Python package using DessiA SDK and DessiA coding guidelines (https://documentation.dessia.tech) - -$short_description - -author: $author - -## Installation - -Move to the folder to next to setup.py and -```bash -python setup.py install -``` - -## Usage - -''') - - -default_module_content = '''#!/usr/bin/env python -# -*- coding: utf-8 -*- - -""" -Documentation of module goes here -""" - -import dessia_common as dc -import volmdlr as vm -import volmdlr.primitives3d as p3d - -''' - -test_template = string.Template('''#!/usr/bin/env python -# -*- coding: utf-8 -*- - -""" -Basic test -""" - -import $package_name - -''') - - - -drone_template = string.Template('''--- -kind: pipeline -type: docker -name: default - -steps: -- name: check code complexity, docs & code quality - image: python:3.9 - commands: - - pip install radon pydocstyle pylint - - ./code_quality.sh - - python code_pylint.py - -- name: check pep8 formatting - image: python:3.9 - when: - branch: master - commands: - - git fetch --tags - - pip3 install -U pip autopep8 - - bash code_pep8.sh - -- name: install, run scripts and build doc - image: python:3.9 - commands: - - git fetch --tags - - python setup.py install - - pip install coverage - - cd tests - - coverage run --source $package_name ci_tests.py - - coverage json - - python coverage.py - - coverage report - -- name: develop - image: python:3.9 - commands: - - python setup.py develop - -''') - -code_quality_template = string.Template(''' -#!/bin/bash - -max_pydoc_errors=10 - -cq_result=$$(radon cc --min E -e *pyx $package_name) -echo $$cq_result -if [[ "$$cq_result" ]]; - then - echo "Error in code quality check, run radon to simplify functions">&2; - exit 64; - -fi; - -nb_pydoc_errors=$$(pydocstyle --count --ignore D400,D415,D404,D212,D205,D200,D203,D401,D210 $package_name *.py | tail -1) -echo "$$nb_pydoc_errors pydoc errors, limit is $$max_pydoc_errors" -if [[ "$$nb_pydoc_errors" -gt "$$max_pydoc_errors" ]]; - then - echo "Error in doc quality check, run pydocstyle to correct docstrings">&2; - exit 64; - else - echo "You can lower number of pydoc errors to $$nb_pydoc_errors (actual $$max_pydoc_errors)" -fi; -''') - -code_pylint_template = string.Template(''' - -""" -Read pylint errors to see if number of errors does not exceed specified limits -v1.0 -""" - -from pylint.lint import Run - -MIN_NOTE = 8.85 - -UNWATCHED_ERRORS = ['fixme', - 'trailing-whitespace', - 'import-error' - ] - - -MAX_ERROR_BY_TYPE = { - # No tolerance errors - 'consider-using-f-string': 0, - 'no-else-return': 0, - 'arguments-differ': 0, - 'no-member': 0, - 'too-many-locals': 0, - 'wrong-import-order': 0, - 'too-many-branches': 0, - 'unused-import': 0, - 'unused-argument': 0, - 'cyclic-import': 0, - 'no-self-use': 0, - 'unused-variable': 0, - 'too-many-arguments': 0, - 'unnecessary-comprehension': 0, - 'no-value-for-parameter': 0, - 'too-many-return-statements': 0, - 'raise-missing-from': 0, - 'consider-merging-isinstance': 0, - 'abstract-method': 0, - 'import-outside-toplevel': 0, - 'too-many-instance-attributes': 0, - 'consider-iterating-dictionary': 0, - 'attribute-defined-outside-init': 0, - 'simplifiable-if-expression': 0, - 'redefined-builtin': 0, - 'broad-except': 0, - 'unspecified-encoding': 0, - 'consider-using-get': 0, - 'undefined-loop-variable': 0, - 'consider-using-with': 0, - 'eval-used': 0, - 'too-many-nested-blocks': 0, - 'bad-staticmethod-argument': 0, - 'too-many-public-methods': 0, - 'consider-using-generator': 0, - 'too-many-statements': 0, - 'chained-comparison': 0, - 'wildcard-import': 0, - 'use-maxsplit-arg': 0, - 'arguments-renamed': 0, - 'ungrouped-imports': 0, - 'super-init-not-called': 0, - 'superfluous-parens': 0, - 'unused-wildcard-import': 0, - 'consider-using-enumerate': 0, - 'undefined-variable': 0, - 'function-redefined': 0, - 'inconsistent-return-statements': 0, - 'unexpected-special-method-signature': 0, - 'too-many-lines': 0, - 'bare-except': 0, - } - -import os -import sys -f = open(os.devnull, 'w') - -old_stdout = sys.stdout -sys.stdout = f - -results = Run(['$package_name', '--output-format=json', '--reports=no'], do_exit=False) -# `exit` is deprecated, use `do_exit` instead -sys.stdout = old_stdout - -PYLINT_OBJECTS = True -if hasattr(results.linter.stats,'global_note'): - pylint_note = results.linter.stats.global_note - PYLINT_OBJECT_STATS = True -else: - pylint_note = results.linter.stats['global_note'] - PYLINT_OBJECT_STATS = False - -print('Pylint note: ', pylint_note) -assert pylint_note >= MIN_NOTE -print('You can increase MIN_NOTE in pylint to {} (actual: {})'.format(pylint_note, - MIN_NOTE)) - - -def extract_messages_by_type(type_): - return [m for m in results.linter.reporter.messages if m.symbol == type_] - - -# uncontrolled_errors = {} -error_detected = False - -if PYLINT_OBJECT_STATS: - stats_by_msg = results.linter.stats.by_msg -else: - stats_by_msg = results.linter.stats['by_msg'] - -for error_type, number_errors in stats_by_msg.items(): - if error_type not in UNWATCHED_ERRORS: - if error_type in MAX_ERROR_BY_TYPE: - max_errors = MAX_ERROR_BY_TYPE[error_type] - else: - max_errors = 0 - - if number_errors > max_errors: - error_detected = True - print('Fix some {} errors: {}/{}'.format(error_type, - number_errors, - max_errors)) - for message in extract_messages_by_type(error_type): - print('{} line {}: {}'.format(message.path, message.line, message.msg)) - elif number_errors < max_errors: - print('You can lower number of {} to {} (actual {})'.format( - error_type, number_errors, max_errors)) - - -if error_detected: - raise RuntimeError('Too many errors. Run pylint $package_name to get the errors') - -''') - -code_pep8_template = string.Template('''#!/bin/bash -# check pep8 formatting for all files - -PEP8_CMD_TO_RUN='python3 -m autopep8 -i $package_name *.py' - -DETECTED_CHANGES=$$(python3 -m autopep8 -d $package_name *.py) -if [[ -n "$$DETECTED_CHANGES" ]] - then - echo -e "\npep8 non conforming changes detected, please run :\n" - echo -e "\t$$PEP8_CMD_TO_RUN\n" - echo -e "& stage your changes before pushing" - exit 1 -fi - -exit 0 -''') - - -setup_template = string.Template(''' -from setuptools import setup, find_packages -import re -from os.path import dirname, isdir, join, exists -from subprocess import CalledProcessError, check_output - -tag_re = re.compile(r'\btag: %s([0-9][^,]*)\b') -version_re = re.compile('^Version: (.+)$$', re.M) - - -def readme(): - with open('README.md') as f: - return f.read() - -def version_from_git_describe(version): - if version[0]=='v': - version = version[1:] - - # PEP 440 compatibility - number_commits_ahead = 0 - if '-' in version: - version, number_commits_ahead, commit_hash = version.split('-') - number_commits_ahead = int(number_commits_ahead) - - # print('number_commits_ahead', number_commits_ahead) - - split_versions = version.split('.') - if 'post' in split_versions[-1]: - suffix = split_versions[-1] - split_versions = split_versions[:-1] - else: - suffix = None - - for pre_release_segment in ['a', 'b', 'rc']: - if pre_release_segment in split_versions[-1]: - if number_commits_ahead > 0: - split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) - if len(split_versions) == 2: - split_versions.append('0') - if len(split_versions) == 1: - split_versions.extend(['0', '0']) - - split_versions[-1] = str(int(split_versions[-1])+1) - future_version = '.'.join(split_versions) - return '{}.dev{}'.format(future_version, number_commits_ahead) - else: - return '.'.join(split_versions) - - if number_commits_ahead > 0: - if len(split_versions) == 2: - split_versions.append('0') - if len(split_versions) == 1: - split_versions.extend(['0', '0']) - split_versions[-1] = str(int(split_versions[-1])+1) - split_versions = '.'.join(split_versions) - return '{}.dev{}'.format(split_versions, number_commits_ahead) - else: - if suffix is not None: - split_versions.append(suffix) - - return '.'.join(split_versions) - -# Just testing if get_version works well -assert version_from_git_describe('v0.1.7.post2') == '0.1.7.post2' -assert version_from_git_describe('v0.0.1-25-gaf0bf53') == '0.0.2.dev25' -assert version_from_git_describe('v0.1-15-zsdgaz') == '0.1.1.dev15' -assert version_from_git_describe('v1') == '1' -assert version_from_git_describe('v1-3-aqsfjbo') == '1.0.1.dev3' - -def get_version(): - # Return the version if it has been injected into the file by git-archive - version = tag_re.search('$$Format:%D$$') - if version: - return version.group(1) - - d = dirname(__file__) - pkg_info_path = join(d, 'PKG-INFO') - - if isdir(join(d, '.git')): - cmd = 'git describe --tags' - try: - version = check_output(cmd.split()).decode().strip()[:] - - except CalledProcessError: - raise RuntimeError('Unable to get version number from git tags: create a first v0.0.1 version to start!') - - return version_from_git_describe(version) - - elif exists(pkg_info_path): - # try to extract the version from the PKG-INFO file. - with open(pkg_info_path, 'r') as f: - version = version_re.search(f.read()).group(1) - else: - print('No version found from git tags nor from PKGINFO. defaulting to 0.0.1') - version='0.0.1' - - return version - -setup(version=$version, - name='$package_name', - description='$short_description', - long_description=readme(), - long_description_content_type='text/markdown', - author='$author_name', - author_email='$author_mail', - install_requires=$requirements, - python_requires='$python_version', - packages=find_packages() -) - -''') From 9bda920950b2ce85656e503721d8360ad365fa0a Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:23:11 +0200 Subject: [PATCH 02/49] Update: PackageTemplate_Inputs.xlsx --- PackageTemplate_Inputs.xlsx | Bin 103134 -> 103135 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/PackageTemplate_Inputs.xlsx b/PackageTemplate_Inputs.xlsx index b7b4b60a4ce0c9402ede26743d51e1a8f84a1a70..98bdbe9ee6408c15425e9a3f5d26ed17d7cdeab1 100644 GIT binary patch literal 103135 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 literal 103134 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 G;r{?b$_jx1 From 993c0fdc1c193fa0dc4ce055d8a5e9c93aa4eac2 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:34:57 +0200 Subject: [PATCH 03/49] Update: validate_package_name --- PackageTemplate_Inputs.xlsx | Bin 103135 -> 103130 bytes ..._get_parameters_from_excel.cpython-310.pyc | Bin 1653 -> 1659 bytes methods/methods_check_inputs.py | 2 +- methods/methods_get_parameters_from_excel.py | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/PackageTemplate_Inputs.xlsx b/PackageTemplate_Inputs.xlsx index 98bdbe9ee6408c15425e9a3f5d26ed17d7cdeab1..709e9c03bcd4b53e221b4a7ac37b0ff0f0ec1d5d 100644 GIT binary patch literal 103130 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 literal 103135 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 diff --git a/methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc b/methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc index f8666165b8a1c5b8ce227e7e92b12c6651bc6958..aa56981da6ef765c43d37a2dfa94aacea69bbad8 100644 GIT binary patch delta 82 zcmey$^P7h^pO=@50SKHO&!>Id$a|2HpD!RWIXf{uRUt1iH&sDv@@>WlrBMBh{M=Oi k;{4Lw%*sUlfXb4L{5<`X)Z*gI#Q3EAlK7I%flMka09q3p@c;k- delta 76 zcmey(^Oc7;pO=@50SHt+oJ)JZk@p}YFHb;Xa&}^RszP33ZtCQ_j1h8y`WgATsrtqF ZrMa1viTVMRB^mj7`cP#do5Pt@SODZ)8bAO5 diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index c64e588..8b8a630 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -10,7 +10,7 @@ def validate_package_name(name): raise ValueError("\nYou need to add a 'Package name'") if not re.match(r'^[a-z_][a-z0-9_]*$', name): - raise ValueError(f"Invalid package name '{name}'. Package names must start with a letter or underscore and contain only lowercase letters, numbers, and underscores.") + raise ValueError(f"Invalid package name '{name}'. Package names must start with a letter or underscore and contain only lowercase letters, numbers, and underscores. Single and double quotes and double are not authorized.") def check_pypi_package_name(name): """ diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index c1c4ba7..edae1d9 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -12,7 +12,7 @@ def get_parameters_from_excel(excel_file): # %% Package name - package_name = df['Package name'][0] + package_name = df['Package name *'][0] validate_package_name(package_name) check_pypi_package_name(package_name) project_package_name = ''.join(x.title() for x in package_name.split('_')) From 5784aa6da1b0a95993e55bec9e535b8e739065d8 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:47:07 +0200 Subject: [PATCH 04/49] Update: Package URL Optional --- README.md | 2 +- create_package.py | 21 ++++++++++-------- .../methods_check_inputs.cpython-310.pyc | Bin 2327 -> 2387 bytes ..._get_parameters_from_excel.cpython-310.pyc | Bin 1659 -> 1635 bytes methods/methods_get_parameters_from_excel.py | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index e4b945d..ca0815e 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ Open the file PackageTemplate_Inputs.xlsx, and fill in the following fields: - **Python Version**: The minimum version of Python that your package is compatible with. Specify the version in the format >= followed by the version number. - **Author**: The name of the person or team responsible for maintaining the package. This should be the operations-team that will handle updates, support, and maintenance of the package. - **Email**: The contact email for the operations-team responsible for the package. This email should be monitored for any support requests, questions, or issues related to the package. - - **Package URL**: This URL where the package's source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub, or Bitbucket repository). Like: gitlab.com:dessia + - **Package URL**: This URL where the package's source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub, or Bitbucket repository) - Optional. Like: gitlab.com:Organisation **Example:** diff --git a/create_package.py b/create_package.py index 4c88513..8fc62cb 100644 --- a/create_package.py +++ b/create_package.py @@ -53,7 +53,7 @@ def replace_placeholders(file_path, placeholders): file_path = os.path.join(root, file_name) replace_placeholders(file_path, placeholders) -print(f"The package '{parameters['package_name']}' has been successfully generated in {new_package_dir}.") +print(f"\nThe package '{parameters['package_name']}' has been successfully generated in {new_package_dir}.\n") # %% Git Repository @@ -66,13 +66,16 @@ def replace_placeholders(file_path, placeholders): # Rename the default branch to 'master' subprocess.run(['git', 'branch', '-M', 'master']) +if parameters['remote_url']: + # Set up the upstream repository and push + push_command = ( + f"git push --set-upstream git@{parameters['remote_url']}/" + f"$(git rev-parse --show-toplevel | xargs basename).git " + f"$(git rev-parse --abbrev-ref HEAD)" + ) + subprocess.run(push_command, shell=True) -# Set up the upstream repository and push -push_command = ( - f"git push --set-upstream git@{parameters['remote_url']}/" - f"$(git rev-parse --show-toplevel | xargs basename).git " - f"$(git rev-parse --abbrev-ref HEAD)" -) -subprocess.run(push_command, shell=True) + print(f"\nA new Git repository has been initialized in {new_package_dir}.") -print(f"A new Git repository has been initialized in {new_package_dir}.") +else: + print(f"\nA new local Git repository has been initialized in {new_package_dir}.") diff --git a/methods/__pycache__/methods_check_inputs.cpython-310.pyc b/methods/__pycache__/methods_check_inputs.cpython-310.pyc index 15ad9d20ed529a9cc676cb51b5f5338e36ffcb95..a02ce537e493aafcdb77ebcddca01fb871af897d 100644 GIT binary patch delta 119 zcmbO(bXkZupO=@50SGFb&!^qr$Q#JWxOQ?pW2w19aAsb5PO3s;UW!6WerXbrSy-B1 zl3I)`l30|gke6SgkXTxhkzbTqm6|g7GNU%5$K?NvqC6?7#l@M4@k#k5@gzNZ2UM11 cpO=@50SI^1Dgfs+*&rRx(?glakRSW4JyIGPz58EQCyYK6gSMWAXqYdDLG zQbcQkG*C_qEGG_?Hy$eYRNH?cfdp@hALwV9ETp@y}FDTT|1p@uPqTaqD# zS(2fat%j}Gec~T!)zB3FTJ{=tpaKD~0zs$(jv9{QloX*_jy#qUj>$HRvW#VuqZp+* zTT>)zxqxDvlj|5I#ko?XQy3RA)pFNx7tc+RNoTC(2Fh`7UdQ;7iIHdW43;onp0dQ8 z%#_5E)cDe(oXKxlPRIlR9m>Vb#mK_M!@|MH!6?PZ!NkD`VNX8KYRRZJnUhTuNE)*l F004LjH0b~U diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index edae1d9..d4f8f7b 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -23,7 +23,7 @@ def get_parameters_from_excel(excel_file): # %% Package URL remote_url = df["Package URL"][0] - validate_url(remote_url) + # validate_url(remote_url) parameters["remote_url"] = remote_url # %% Short description From a516fddd5eda82dffa84b3fe32bf3b766b9ffd30 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:48:30 +0200 Subject: [PATCH 05/49] Update: README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ca0815e..2ae3e8d 100644 --- a/README.md +++ b/README.md @@ -73,8 +73,8 @@ Before using this template, ensure you have the following installed: Clone this template repository to your local machine: ``` - git clone - cd PackageTemplate + git clone https://github.com/Dessia-tech/dessia_bot_template.git + cd dessia_bot_template ``` From 72be65b52b5dd2e21478326bdf039b60a483a38f Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 17:52:37 +0200 Subject: [PATCH 06/49] Fix: Repository name --- PackageTemplate_Inputs.xlsx | Bin 103130 -> 0 bytes README.md | 8 ++++---- create_package.py | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 PackageTemplate_Inputs.xlsx diff --git a/PackageTemplate_Inputs.xlsx b/PackageTemplate_Inputs.xlsx deleted file mode 100644 index 709e9c03bcd4b53e221b4a7ac37b0ff0f0ec1d5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103130 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 diff --git a/README.md b/README.md index 2ae3e8d..383caf8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## PackageTemplate +## dessia_bot_template This repository provides a template for creating new Python packages. It includes all the necessary boilerplate code and directory structure to help you get started quickly and maintain consistency across your projects. @@ -16,7 +16,7 @@ This repository provides a template for creating new Python packages. It include ## Overview -PackageTemplate is a streamlined tool designed to help developers quickly generate new Python packages by providing a pre-configured project structure. By simply filling out an Excel file with essential package metadata, users can create a new package with all the necessary structure, including essential files like setup.py, README.md, and tests, initialize a Git repository, and push it to a remote Git repository. +dessia_bot_template is a streamlined tool designed to help developers quickly generate new Python packages by providing a pre-configured project structure. By simply filling out an Excel file with essential package metadata, users can create a new package with all the necessary structure, including essential files like setup.py, README.md, and tests, initialize a Git repository, and push it to a remote Git repository. This template simplifies the process of starting a new Python project, allowing you to focus more on coding and less on setup. @@ -64,7 +64,7 @@ Automatically creates a well-organized directory structure, including directorie Before using this template, ensure you have the following installed: - Python: Version 3.8 or later. -- Git: Version control system to manage your codebase. +- Git: Version control system to manage your codebase - Optional. - Excel: To edit the input data file (alternatively, use LibreOffice or any spreadsheet editor compatible with .xlsx files). @@ -88,7 +88,7 @@ This template includes some Python dependencies for the script, install them: 1. **Fill in the Excel File** -Open the file PackageTemplate_Inputs.xlsx, and fill in the following fields: +Open the file Template_Inputs.xlsx, and fill in the following fields: - **Package Name**: This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). - **Short Description**: A concise summary of what your package does. This will appear in package listings and should be clear and to the point. Aim for one sentence. diff --git a/create_package.py b/create_package.py index 8fc62cb..82e89b0 100644 --- a/create_package.py +++ b/create_package.py @@ -6,7 +6,7 @@ # %% Inputs -parameters = get_parameters_from_excel(excel_file='PackageTemplate_Inputs.xlsx') +parameters = get_parameters_from_excel(excel_file='Template_Inputs.xlsx') # %% New Directory diff --git a/setup.py b/setup.py index dd993cb..6e99c3c 100644 --- a/setup.py +++ b/setup.py @@ -90,7 +90,7 @@ def get_version(): setup( version=get_version(), - name="package_template", + name="dessia_bot_template", description="This repository provides a template for creating new Python packages.", long_description=readme(), author="Dessia-Operations-Team", From 4bbe1230dda21b7f10e9336b7292a0e5d118803d Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Wed, 28 Aug 2024 18:03:50 +0200 Subject: [PATCH 07/49] Update: validate_url --- methods/methods_check_inputs.py | 12 ++++++++---- methods/methods_get_parameters_from_excel.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 8b8a630..8dce249 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -31,12 +31,16 @@ def validate_url(url): """ Validate the URL format. """ - if not url: - raise ValueError("\nYou need to add a 'Package URL'") + # if not url: + # raise ValueError("\nYou need to add a 'Package URL'") - if not re.match(r'^gitlab\.com:', url): + # if not re.match(r'^gitlab\.com:', url): + # raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ + # "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") + + if not re.match(r'^git:', url): raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ - "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") + "If you do not need to use Git, leave an empty cell.") def validate_python_version(version): """ diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index d4f8f7b..edae1d9 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -23,7 +23,7 @@ def get_parameters_from_excel(excel_file): # %% Package URL remote_url = df["Package URL"][0] - # validate_url(remote_url) + validate_url(remote_url) parameters["remote_url"] = remote_url # %% Short description From 4005b78a678e5689dfa29251b5caf0db0452aea8 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 29 Aug 2024 10:01:48 +0200 Subject: [PATCH 08/49] Update: Template_Inputs.xlsx --- Template_Inputs.xlsx | Bin 0 -> 103130 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Template_Inputs.xlsx diff --git a/Template_Inputs.xlsx b/Template_Inputs.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..709e9c03bcd4b53e221b4a7ac37b0ff0f0ec1d5d GIT binary patch literal 103130 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 literal 0 HcmV?d00001 From 4be0aeb84ce7e47bd5a98678f610c6ac3094820d Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 29 Aug 2024 10:55:19 +0200 Subject: [PATCH 09/49] Update: validate_url --- methods/methods_get_parameters_from_excel.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index edae1d9..7dbb7bc 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -23,7 +23,8 @@ def get_parameters_from_excel(excel_file): # %% Package URL remote_url = df["Package URL"][0] - validate_url(remote_url) + if remote_url: + validate_url(remote_url) parameters["remote_url"] = remote_url # %% Short description From 1b90dddd1a3e43f5b564ae5256f1a518c157a4ed Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 29 Aug 2024 11:16:14 +0200 Subject: [PATCH 10/49] Update --- Template_Inputs.xlsx | Bin 103130 -> 103137 bytes .../methods_check_inputs.cpython-310.pyc | Bin 2387 -> 0 bytes ..._get_parameters_from_excel.cpython-310.pyc | Bin 1635 -> 0 bytes methods/methods_check_inputs.py | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 methods/__pycache__/methods_check_inputs.cpython-310.pyc delete mode 100644 methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc diff --git a/Template_Inputs.xlsx b/Template_Inputs.xlsx index 709e9c03bcd4b53e221b4a7ac37b0ff0f0ec1d5d..26900ebf5add58bb1818c23b5a802731399fdb81 100644 GIT binary patch literal 103137 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 aT0Fznx(5(jNvSXRXD~2gVhHGo(*FlppCdc~ literal 103130 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 diff --git a/methods/__pycache__/methods_check_inputs.cpython-310.pyc b/methods/__pycache__/methods_check_inputs.cpython-310.pyc deleted file mode 100644 index a02ce537e493aafcdb77ebcddca01fb871af897d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2387 zcmah~&2Jnv6d%vW?sW6f5~WRBR4}M$vNYMP1P2J+Bvo2OB@`mcN6FX9Sv%QjX2%=b z(`H9o4#0nbDkaAr_&>ODp9=?0J@>|e^6Z&Sc2fmrG`7cne)fCs_kNF0OjIm*4p;uz z{j+RYf9ap$$A+I}_~boks6|m^t>-;jN7SayFV?zEUFt#a&=M^}?^2&$fZn4OItG1- zj?)R~%M?Ads*^84leOAHx+@+%cHvurPtHNpw`57dX+NW%kU~c`wfokwEvI45>07^A z)P3&gHR^%JQu=uX!?V(6t$iHsV%282OIrJ6kKvef7~bVk#GgvM)>CaB>$x!A!z~^^ zVX+E%ENezV`d;M+p5T}$LgA;OYJ>WSDa8cl0w*zLLbkYIn8Z}yPLVLiJdS!8ZqG!E zNLI+pIUFaQ9gv?h!l!#>4L=0qqFf2($qoz;60VpulEn;xQ(~?#Nx&l_Oc|}MzHqY2 zcO**KeIdBWY{4?GLsY9>MVYJp_`(u^5$o?S>TTX(b;*-X*dz7at98nx3`ui`tEOU| zZbTHTcNnOra?m$hIz-Jd?j}msy1neO@f%1si+DBlIi7}r#-;1}XxzSp+}Gj){ElEo zBU1|+%zO+3WgQ`k3_9%R&M|t1`sgtrbl(q^vNeBm^Xzf7(m@93ix^kgj@AkT3jf*`qsHa~2vE=c~-{D&6+usurLr50zH)nAf zq>TWda{yieT!sJ%+-h?!HDC#*;qERI09u3V+G^F!e8CP923O0RJ*KiTK$l8nv&AWd zuPee>Rc%p%i)cyN1*ObHF>idmFq4Nx+b|M`i?ArQ#FSe>(>e;5;AbQX!(;VqH*2O#X9kIu z%R_>KNfHOC9ccIp%^^aALO9R>Y&|1**51hz)S2ZOkbR{+H0~OxO~de9Bjs&aJ%^sI z4AT?!W-LQd05yQw`)?Zk?blz9nvDO8en2`%C${%O6_K6IT8noU(rV={fj}ut_>s5aM2FKk_!cd2UK&1UeVD7aL2noAlOZ4VvoB^y&aNXLbc?02F=ykN{mV%y%Kf%$;$eb^!;A zjgM-d0J_AKz6#39#nM@0XHJamnj+II!s_Ms!^Sl7R6%7yxePV3)6Sy#ZK3NF9trQ9vrGR+d9fH)UKn^%M4l12T? z&|La~sc(1Z*L885-?}y1X!I8w{X32RkB#cm2F%uU$-6P|XrXSPzoWS+NN;Gj#s-v7 z&;)C#B0>sy3~0;CJlTyxb(*m-p+wlt6W7lC!8NmTF*@t;>n9E$m^R=plcELICebB$ z?bq%w20ed2Wy8r+H diff --git a/methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc b/methods/__pycache__/methods_get_parameters_from_excel.cpython-310.pyc deleted file mode 100644 index 571510901549f85a767186cb3dfbb34d4040f670..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1635 zcmZ`(&u`l{6eeX^mSyKxnrOrIw$mOZIdL#l0N*3|eedz<Kqv1p*dEsSUSwvArwbDY z#t{tp9UuzLae*%I3>SEA5o~4*&8z~l?;z6HL9>Qx6peQnBV|{f;CZt;vuMm6;#}Zk z^v*;AURb1cfC?MD3m%hpouyecVb3e~I`y7YIP!>eXW#)_DY4ZWYZWc|BUzh)2W-8> zHfqc*T=|0Bn7OH~T7_$BD_mgRELod1t6j9EAh%}V0oy9E?Hcn6PrfC$XC7p53$M)J z0c)pZ?N+RLn|uU{ShG&ik-w8WV?65s-zz#LzXSY_fp3B8pPXnkU40xzufj3)(=eg_ zJz<2uroOqwhEd*(+hE?J0{z@7wMQ4|Cxp>!iy+8{PvGvFim90PEN%7oH9q?T2^V7i zeKwfzgbpOn6LuaB9-pfTPX~lb$->|lt^!4qEDjYNBorVb7d{wM6=b1+>J$|+7zv&P z^em!rKReg$gE39%Stf=zOnEjK>(?zbz5n5;gP2EQEQkHeP>loK%_G)c<7l(eO*k!IG;pK6<6>+E`Qqzqm^mWbzC5so6 z8hg{b6*Gu+>(6!8Sx4zql#c>u4(@=6XU>^@(;y zERNGq-+B|q48rMxTwV5dG@;R}AUn_4b-;efS*n{di<#2fSHWfP1`8clF9B*^SGNR( zMvkc7y#)SWWLJA-4+l^h)fO3P@2baz`QeEbV^)n>GiKeG4P$N^vuVthG3N8COdDo; z=YyT!1X!Mc@fsest*-527w=-%axu(dZDSjDmc3J>S4g$930#PVNZS&hLdu@4oeWwq rlw#Xdu~~n`L8UEAvs}rNxm0gid0Di3kZ_X6bZGuQ(){a9ZC&d>Y@ExO diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 8dce249..eb16a23 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -39,7 +39,7 @@ def validate_url(url): # "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") if not re.match(r'^git:', url): - raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ + raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" +\ "If you do not need to use Git, leave an empty cell.") def validate_python_version(version): From ce593f4dd8571952d8f7f77eb899fc84e17fb12b Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 30 Aug 2024 09:07:41 +0200 Subject: [PATCH 11/49] Fix: validate_url --- Template_Inputs.xlsx | Bin 103137 -> 103142 bytes methods/methods_check_inputs.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Template_Inputs.xlsx b/Template_Inputs.xlsx index 26900ebf5add58bb1818c23b5a802731399fdb81..15a985fbac268a939a16c360c8ec30b50aab1501 100644 GIT binary patch delta 12495 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 delta 11228 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 diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index eb16a23..66ca240 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -38,7 +38,7 @@ def validate_url(url): # raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ # "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") - if not re.match(r'^git:', url): + if not re.match(r'^git', url): raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" +\ "If you do not need to use Git, leave an empty cell.") From 0d8bf2e28cda4509b2423be472d1c9b872cb4952 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:17:42 +0200 Subject: [PATCH 12/49] Remove useless setup.py --- setup.py | 101 ------------------------------------------------------- 1 file changed, 101 deletions(-) delete mode 100644 setup.py diff --git a/setup.py b/setup.py deleted file mode 100644 index 6e99c3c..0000000 --- a/setup.py +++ /dev/null @@ -1,101 +0,0 @@ -import re -from os.path import dirname, isdir, join -from subprocess import CalledProcessError, check_output - -from setuptools import find_packages, setup - -tag_re = re.compile(r"\btag: %s([0-9][^,]*)\b") -version_re = re.compile("^Version: (.+)$", re.M) - - -def readme(): - with open("README.md") as f: - return f.read() - - -def version_from_git_describe(version): - if version[0] == "v": - version = version[1:] - - # PEP 440 compatibility - number_commits_ahead = 0 - if "-" in version: - version, number_commits_ahead, commit_hash = version.split("-") - number_commits_ahead = int(number_commits_ahead) - - # print('number_commits_ahead', number_commits_ahead) - - split_versions = version.split(".") - if "post" in split_versions[-1]: - suffix = split_versions[-1] - split_versions = split_versions[:-1] - else: - suffix = None - - for pre_release_segment in ["a", "b", "rc"]: - if pre_release_segment in split_versions[-1]: - if number_commits_ahead > 0: - split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) - if len(split_versions) == 2: - split_versions.append("0") - if len(split_versions) == 1: - split_versions.extend(["0", "0"]) - - split_versions[-1] = str(int(split_versions[-1]) + 1) - future_version = ".".join(split_versions) - return "{}.dev{}".format(future_version, number_commits_ahead) - else: - return ".".join(split_versions) - - if number_commits_ahead > 0: - if len(split_versions) == 2: - split_versions.append("0") - if len(split_versions) == 1: - split_versions.extend(["0", "0"]) - split_versions[-1] = str(int(split_versions[-1]) + 1) - split_versions = ".".join(split_versions) - return "{}.dev{}+{}".format(split_versions, number_commits_ahead, commit_hash) - else: - if suffix is not None: - split_versions.append(suffix) - - return ".".join(split_versions) - - -def get_version(): - # Return the version if it has been injected into the file by git-archive - version = tag_re.search("$Format:%D$") - if version: - return version.group(1) - - d = dirname(__file__) - - if isdir(join(d, ".git")): - cmd = "git describe --tags" - try: - version = check_output(cmd.split()).decode().strip()[:] - - except CalledProcessError: - raise RuntimeError("Unable to get version number from git tags") - - return version_from_git_describe(version) - else: - # Extract the version from the PKG-INFO file. - with open(join(d, "PKG-INFO")) as f: - version = version_re.search(f.read()).group(1) - - # print('version', version) - return version - - -setup( - version=get_version(), - name="dessia_bot_template", - description="This repository provides a template for creating new Python packages.", - long_description=readme(), - author="Dessia-Operations-Team", - author_email="support@dessia.io", - install_requires=[], - python_requires=">=3.8", - packages=find_packages(), -) From 6be0e853157e22bda85871d4d1a68b295de68686 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:23:04 +0200 Subject: [PATCH 13/49] Add pyproject.toml --- pyproject.toml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..4be1295 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,36 @@ +[project] +name = "dessia_bot_template" +requires-python = ">= 3.9" + +[tool.ruff] +line-length = 120 +target-version = "py39" +exclude = ["package_foler"] + +[tool.ruff.lint] +preview = true +select = [ # https://docs.astral.sh/ruff/rules + "E4", "E7", "E9", # pycodestyle + "F", # Pyflakes + "B", # flake8-bugbear + "I", # isort + "N", # pep8-naming + "D", # pydocstyle documentation + "UP", # pyupgrade + "ANN001", # missing type annotation for function arguments + "ANN201", # missing type annotation for function return value + "PL", # pylint + "NPY", # NumPy-specific rules + "PERF", # Perflint + "RUF", # Ruff-specific rules +] + +[tool.ruff.lint.pydocstyle] +convention = "pep257" + +[tool.ruff.lint.per-file-ignores] +"tests/**/*.py" = ["D"] # documenting the unit tests is not necessary + +[tool.codespell] +skip = "htmlcov" +ignore-words-list = ["dessia"] # words to ignore from codespell check From fb5f841228cd9afeb57cc275999a1db56fe75ce6 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:23:13 +0200 Subject: [PATCH 14/49] Add pre-commit --- .pre-commit-config.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .pre-commit-config.yaml diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml new file mode 100644 index 0000000..3d7dfe1 --- /dev/null +++ b/.pre-commit-config.yaml @@ -0,0 +1,40 @@ +# This file configures automated checks triggered by git events. +# To install pre-commit, run: `pip install pre-commit` +# +# To run all hooks manually, use: `pre-commit run -a` +# To enable automated checks on commit, run: `pre-commit install` +# +# See https://github.com/pre-commit/pre-commit for more information + +repos: + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.6.5 + hooks: + - id: ruff # linter + args: [ --fix ] + - id: ruff-format # formatter + + - repo: https://github.com/codespell-project/codespell + rev: v2.3.0 + hooks: + - id: codespell + additional_dependencies: + - tomli + + - repo: https://github.com/pre-commit/pre-commit-hooks + rev: v4.6.0 + hooks: + - id: check-added-large-files + args: ["--maxkb=50"] + - id: check-docstring-first + - id: check-json + - id: check-yaml + - id: debug-statements + - id: requirements-txt-fixer + - id: check-case-conflict + - id: check-merge-conflict + - id: end-of-file-fixer + - id: mixed-line-ending + - id: requirements-txt-fixer + - id: trailing-whitespace + - id: check-symlinks From 4e35277bda340038192104ac831f968a30614c3c Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:26:17 +0200 Subject: [PATCH 15/49] Ruff fix --- create_package.py | 21 +++++------ methods/methods_check_inputs.py | 38 ++++++++------------ methods/methods_get_parameters_from_excel.py | 2 ++ 3 files changed, 27 insertions(+), 34 deletions(-) diff --git a/create_package.py b/create_package.py index 82e89b0..523e968 100644 --- a/create_package.py +++ b/create_package.py @@ -1,7 +1,8 @@ import os import shutil -from datetime import date import subprocess +from datetime import date + from methods.methods_get_parameters_from_excel import get_parameters_from_excel # %% Inputs @@ -25,12 +26,12 @@ # %% Updates the files # Function to replace placeholders in a file -def replace_placeholders(file_path, placeholders): - with open(file_path, 'r') as file: +def replace_placeholders(file_path, placeholders) -> None: + with open(file_path, encoding='utf-8') as file: content = file.read() for placeholder, value in placeholders.items(): content = content.replace(placeholder, value) - with open(file_path, 'w') as file: + with open(file_path, 'w', encoding='utf-8') as file: file.write(content) @@ -48,7 +49,7 @@ def replace_placeholders(file_path, placeholders): # Recursively find and update all files in the new package directory -for root, dirs, files in os.walk(new_package_dir): +for root, _dirs, files in os.walk(new_package_dir): for file_name in files: file_path = os.path.join(root, file_name) replace_placeholders(file_path, placeholders) @@ -59,12 +60,12 @@ def replace_placeholders(file_path, placeholders): # Initialize a new Git repository os.chdir(new_package_dir) # Change directory to the new package directory -subprocess.run(['git', 'init']) # Initialize a new git repository -subprocess.run(['git', 'add', '.']) # Add all files to staging -subprocess.run(['git', 'commit', '-m', 'Initial commit']) # Commit the changes +subprocess.run(['git', 'init'], check=False) # Initialize a new git repository +subprocess.run(['git', 'add', '.'], check=False) # Add all files to staging +subprocess.run(['git', 'commit', '-m', 'Initial commit'], check=False) # Commit the changes # Rename the default branch to 'master' -subprocess.run(['git', 'branch', '-M', 'master']) +subprocess.run(['git', 'branch', '-M', 'master'], check=False) if parameters['remote_url']: # Set up the upstream repository and push @@ -73,7 +74,7 @@ def replace_placeholders(file_path, placeholders): f"$(git rev-parse --show-toplevel | xargs basename).git " f"$(git rev-parse --abbrev-ref HEAD)" ) - subprocess.run(push_command, shell=True) + subprocess.run(push_command, shell=True, check=False) print(f"\nA new Git repository has been initialized in {new_package_dir}.") diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 66ca240..7d0373f 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -1,36 +1,30 @@ import re + import requests -def validate_package_name(name): - """ - Check if the package name follows Python naming conventions. - """ + +def validate_package_name(name) -> None: + """Check if the package name follows Python naming conventions.""" if not name: raise ValueError("\nYou need to add a 'Package name'") if not re.match(r'^[a-z_][a-z0-9_]*$', name): raise ValueError(f"Invalid package name '{name}'. Package names must start with a letter or underscore and contain only lowercase letters, numbers, and underscores. Single and double quotes and double are not authorized.") -def check_pypi_package_name(name): - """ - Check if the package name already exists on PyPI. - """ +def check_pypi_package_name(name) -> None: + """Check if the package name already exists on PyPI.""" response = requests.get(f"https://pypi.org/pypi/{name}/json") if response.status_code == 200: print(f"Warning: The package name '{name}' already exists on PyPI. Consider choosing a different name.") -def validate_email(email): - """ - Validate the email format. - """ +def validate_email(email) -> None: + """Validate the email format.""" if not re.match(r"[^@]+@[^@]+\.[^@]+", email): raise ValueError(f"Invalid email address '{email}'.") -def validate_url(url): - """ - Validate the URL format. - """ +def validate_url(url) -> None: + """Validate the URL format.""" # if not url: # raise ValueError("\nYou need to add a 'Package URL'") @@ -42,17 +36,13 @@ def validate_url(url): raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" +\ "If you do not need to use Git, leave an empty cell.") -def validate_python_version(version): - """ - Validate the Python version format. - """ +def validate_python_version(version) -> None: + """Validate the Python version format.""" if not re.match(r'^>=?(\d+\.\d+)$', version): raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: '>=3.8'.") -def validate_required_packages(packages): - """ - Validate the format of required packages and versions. - """ +def validate_required_packages(packages) -> None: + """Validate the format of required packages and versions.""" if packages: for package in packages.split(','): if not re.match(r'^[a-zA-Z0-9_-]+(==|>=|<=|~=)?[0-9.]*$', package.strip()): diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index 7dbb7bc..fcfd392 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -1,7 +1,9 @@ import pandas as pd + from .methods_check_inputs import * + def get_parameters_from_excel(excel_file): # Read the Excel file From 75d4521584d23f092820a482caa6d1deb9f36ca2 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:27:10 +0200 Subject: [PATCH 16/49] Add .gitignore --- .gitignore | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..efadd19 --- /dev/null +++ b/.gitignore @@ -0,0 +1,236 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ +.ruff_cache + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +.python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser From 9d29ed32ea4dbee2df776da3b7aa8ac69f5cc64b Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:32:18 +0200 Subject: [PATCH 17/49] Format --- README.md | 3 +-- create_package.py | 22 +++++++++-------- methods/methods_check_inputs.py | 26 +++++++++++++------- methods/methods_get_parameters_from_excel.py | 24 +++++++++--------- requirements.txt | 1 - 5 files changed, 42 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 383caf8..3da3bf2 100644 --- a/README.md +++ b/README.md @@ -185,10 +185,9 @@ Here's an overview of the directory structure provided by this template: If you encounter problems reading the Excel file, ensure it's properly formatted and saved as .xlsx. - Package Name Conflicts: - Be sure that the choosen package name does not already exist in your organization or on PyPI. So, consider choosing a different name to avoid conflicts. + Be sure that the chosen package name does not already exist in your organization or on PyPI. So, consider choosing a different name to avoid conflicts. ## Contact For any questions or issues, please contact the Operations-Team. - diff --git a/create_package.py b/create_package.py index 523e968..8d67cf4 100644 --- a/create_package.py +++ b/create_package.py @@ -7,12 +7,12 @@ # %% Inputs -parameters = get_parameters_from_excel(excel_file='Template_Inputs.xlsx') +parameters = get_parameters_from_excel(excel_file="Template_Inputs.xlsx") # %% New Directory # Path to the template directory -template_dir = 'package_foler' +template_dir = "package_foler" new_package_dir = f'../{parameters["project_package_name"]}' # Copy the template directory to a new location @@ -25,13 +25,14 @@ # %% Updates the files + # Function to replace placeholders in a file def replace_placeholders(file_path, placeholders) -> None: - with open(file_path, encoding='utf-8') as file: + with open(file_path, encoding="utf-8") as file: content = file.read() for placeholder, value in placeholders.items(): content = content.replace(placeholder, value) - with open(file_path, 'w', encoding='utf-8') as file: + with open(file_path, "w", encoding="utf-8") as file: file.write(content) @@ -45,7 +46,8 @@ def replace_placeholders(file_path, placeholders) -> None: "{{CONTACT}}": parameters["contact"], "{{VERSION}}": parameters["version"], "{{DATE}}": date.today().strftime("%d/%m/%Y") + " (Initialization)", - '{{REQUIRED_PACKAGES}}': parameters["required_packages"]} + "{{REQUIRED_PACKAGES}}": parameters["required_packages"], +} # Recursively find and update all files in the new package directory @@ -60,14 +62,14 @@ def replace_placeholders(file_path, placeholders) -> None: # Initialize a new Git repository os.chdir(new_package_dir) # Change directory to the new package directory -subprocess.run(['git', 'init'], check=False) # Initialize a new git repository -subprocess.run(['git', 'add', '.'], check=False) # Add all files to staging -subprocess.run(['git', 'commit', '-m', 'Initial commit'], check=False) # Commit the changes +subprocess.run(["git", "init"], check=False) # Initialize a new git repository +subprocess.run(["git", "add", "."], check=False) # Add all files to staging +subprocess.run(["git", "commit", "-m", "Initial commit"], check=False) # Commit the changes # Rename the default branch to 'master' -subprocess.run(['git', 'branch', '-M', 'master'], check=False) +subprocess.run(["git", "branch", "-M", "master"], check=False) -if parameters['remote_url']: +if parameters["remote_url"]: # Set up the upstream repository and push push_command = ( f"git push --set-upstream git@{parameters['remote_url']}/" diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 7d0373f..14437e9 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -1,4 +1,3 @@ - import re import requests @@ -9,8 +8,11 @@ def validate_package_name(name) -> None: if not name: raise ValueError("\nYou need to add a 'Package name'") - if not re.match(r'^[a-z_][a-z0-9_]*$', name): - raise ValueError(f"Invalid package name '{name}'. Package names must start with a letter or underscore and contain only lowercase letters, numbers, and underscores. Single and double quotes and double are not authorized.") + if not re.match(r"^[a-z_][a-z0-9_]*$", name): + raise ValueError( + f"Invalid package name '{name}'. Package names must start with a letter or underscore and contain only lowercase letters, numbers, and underscores. Single and double quotes and double are not authorized." + ) + def check_pypi_package_name(name) -> None: """Check if the package name already exists on PyPI.""" @@ -18,11 +20,13 @@ def check_pypi_package_name(name) -> None: if response.status_code == 200: print(f"Warning: The package name '{name}' already exists on PyPI. Consider choosing a different name.") + def validate_email(email) -> None: """Validate the email format.""" if not re.match(r"[^@]+@[^@]+\.[^@]+", email): raise ValueError(f"Invalid email address '{email}'.") + def validate_url(url) -> None: """Validate the URL format.""" # if not url: @@ -32,18 +36,22 @@ def validate_url(url) -> None: # raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ # "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") - if not re.match(r'^git', url): - raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" +\ - "If you do not need to use Git, leave an empty cell.") + if not re.match(r"^git", url): + raise ValueError( + f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" + + "If you do not need to use Git, leave an empty cell." + ) + def validate_python_version(version) -> None: """Validate the Python version format.""" - if not re.match(r'^>=?(\d+\.\d+)$', version): + if not re.match(r"^>=?(\d+\.\d+)$", version): raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: '>=3.8'.") + def validate_required_packages(packages) -> None: """Validate the format of required packages and versions.""" if packages: - for package in packages.split(','): - if not re.match(r'^[a-zA-Z0-9_-]+(==|>=|<=|~=)?[0-9.]*$', package.strip()): + for package in packages.split(","): + if not re.match(r"^[a-zA-Z0-9_-]+(==|>=|<=|~=)?[0-9.]*$", package.strip()): raise ValueError(f"Invalid package requirement '{package}'. Ensure correct formatting.") diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index fcfd392..0034934 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -1,11 +1,9 @@ - import pandas as pd from .methods_check_inputs import * def get_parameters_from_excel(excel_file): - # Read the Excel file df = pd.read_excel(excel_file) df = df.fillna("") @@ -14,10 +12,10 @@ def get_parameters_from_excel(excel_file): # %% Package name - package_name = df['Package name *'][0] + package_name = df["Package name *"][0] validate_package_name(package_name) check_pypi_package_name(package_name) - project_package_name = ''.join(x.title() for x in package_name.split('_')) + project_package_name = "".join(x.title() for x in package_name.split("_")) parameters["package_name"] = package_name parameters["project_package_name"] = project_package_name @@ -31,21 +29,23 @@ def get_parameters_from_excel(excel_file): # %% Short description - description = df['Short description'][0] + description = df["Short description"][0] if not description: description = "A Specific package for a technological issue." parameters["description"] = description # %% Long description - long_description = df['Long description'][0] + long_description = df["Long description"][0] if not long_description: - long_description = "A Python package using DessiA SDK and DessiA coding guidelines (https://documentation.dessia.io)" + long_description = ( + "A Python package using DessiA SDK and DessiA coding guidelines (https://documentation.dessia.io)" + ) parameters["long_description"] = long_description # %% Python version - version = df['Python version'][0] + version = df["Python version"][0] if not version: version = ">=3.9" else: @@ -54,14 +54,14 @@ def get_parameters_from_excel(excel_file): # %% Author - author = df['Author'][0] + author = df["Author"][0] if not author: author = "Operations-Team" parameters["author"] = author # %% E-mail - contact = df['E-mail'][0] + contact = df["E-mail"][0] if not contact: contact = "support@dessia.io" else: @@ -70,11 +70,11 @@ def get_parameters_from_excel(excel_file): # %% Required packages - required_packages = df['Required packages'][0].replace("\n", "") + required_packages = df["Required packages"][0].replace("\n", "") if not required_packages: required_packages = ["dessia_common>=0.18.0, plot_data>=0.26.0"] else: validate_required_packages(required_packages) parameters["required_packages"] = required_packages - return parameters \ No newline at end of file + return parameters diff --git a/requirements.txt b/requirements.txt index e5a1123..f3c7ddf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ pandas>=2.1.1 requests - From 94a205006bb42d7b3ed7004492ae4dd98994e45a Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 14:53:47 +0200 Subject: [PATCH 18/49] Fix ruff errors --- create_package.py | 5 ++++- methods/methods_check_inputs.py | 19 ++++++++++++------- methods/methods_get_parameters_from_excel.py | 14 ++++++++++++-- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/create_package.py b/create_package.py index 8d67cf4..5be172b 100644 --- a/create_package.py +++ b/create_package.py @@ -1,3 +1,5 @@ +"""Script to generate a new Python package from a template directory.""" + import os import shutil import subprocess @@ -27,7 +29,8 @@ # Function to replace placeholders in a file -def replace_placeholders(file_path, placeholders) -> None: +def replace_placeholders(file_path: str, placeholders: dict) -> None: + """Replace placeholders in a file with the corresponding values.""" with open(file_path, encoding="utf-8") as file: content = file.read() for placeholder, value in placeholders.items(): diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 14437e9..4dcda5c 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -1,9 +1,13 @@ +"""This module contains functions to check the validity of the inputs provided by the user.""" + import re import requests +HTTP_STATUS_OK = 200 + -def validate_package_name(name) -> None: +def validate_package_name(name: str) -> None: """Check if the package name follows Python naming conventions.""" if not name: raise ValueError("\nYou need to add a 'Package name'") @@ -14,20 +18,21 @@ def validate_package_name(name) -> None: ) -def check_pypi_package_name(name) -> None: +def check_pypi_package_name(name: str) -> None: """Check if the package name already exists on PyPI.""" response = requests.get(f"https://pypi.org/pypi/{name}/json") - if response.status_code == 200: + + if response.status_code == HTTP_STATUS_OK: print(f"Warning: The package name '{name}' already exists on PyPI. Consider choosing a different name.") -def validate_email(email) -> None: +def validate_email(email: str) -> None: """Validate the email format.""" if not re.match(r"[^@]+@[^@]+\.[^@]+", email): raise ValueError(f"Invalid email address '{email}'.") -def validate_url(url) -> None: +def validate_url(url: str) -> None: """Validate the URL format.""" # if not url: # raise ValueError("\nYou need to add a 'Package URL'") @@ -43,13 +48,13 @@ def validate_url(url) -> None: ) -def validate_python_version(version) -> None: +def validate_python_version(version: str) -> None: """Validate the Python version format.""" if not re.match(r"^>=?(\d+\.\d+)$", version): raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: '>=3.8'.") -def validate_required_packages(packages) -> None: +def validate_required_packages(packages: str) -> None: """Validate the format of required packages and versions.""" if packages: for package in packages.split(","): diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py index 0034934..3f0ee98 100644 --- a/methods/methods_get_parameters_from_excel.py +++ b/methods/methods_get_parameters_from_excel.py @@ -1,9 +1,19 @@ +"""Functions to get parameters from an Excel file.""" + import pandas as pd -from .methods_check_inputs import * +from .methods_check_inputs import ( + check_pypi_package_name, + validate_email, + validate_package_name, + validate_python_version, + validate_required_packages, + validate_url, +) -def get_parameters_from_excel(excel_file): +def get_parameters_from_excel(excel_file: str) -> dict: + """Get the parameters from an Excel file.""" # Read the Excel file df = pd.read_excel(excel_file) df = df.fillna("") From fe9546d6491699fe2017b1ac8a0fc4728cd9dbe3 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Wed, 2 Oct 2024 15:11:55 +0200 Subject: [PATCH 19/49] Use HTTP variable --- methods/methods_check_inputs.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 4dcda5c..1196395 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -1,11 +1,10 @@ """This module contains functions to check the validity of the inputs provided by the user.""" import re +from http import HTTPStatus import requests -HTTP_STATUS_OK = 200 - def validate_package_name(name: str) -> None: """Check if the package name follows Python naming conventions.""" @@ -22,7 +21,7 @@ def check_pypi_package_name(name: str) -> None: """Check if the package name already exists on PyPI.""" response = requests.get(f"https://pypi.org/pypi/{name}/json") - if response.status_code == HTTP_STATUS_OK: + if response.status_code == HTTPStatus.OK: print(f"Warning: The package name '{name}' already exists on PyPI. Consider choosing a different name.") From 8a0a143b2c205886ce1f21fc9f11e4be5670e2a8 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 09:53:45 +0200 Subject: [PATCH 20/49] Add test.py --- package_foler/test.py | 134 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) create mode 100644 package_foler/test.py diff --git a/package_foler/test.py b/package_foler/test.py new file mode 100644 index 0000000..0343829 --- /dev/null +++ b/package_foler/test.py @@ -0,0 +1,134 @@ +"""Test script for running unittests and scripts with coverage.""" + +import json +import os +import subprocess +import sys +import time +from pathlib import Path +from typing import Any, Optional + +import tomli + + +def setup_environment() -> None: + """Set up environment variables for coverage.""" + os.environ["COVERAGE_FILE"] = (Path(__file__).parent.resolve() / ".coverage").as_posix() + os.environ["COVERAGE_RCFILE"] = (Path(__file__).parent.resolve() / "pyproject.toml").as_posix() + + +def load_config() -> dict[str, Any]: + """Load configuration file.""" + with open((Path(__file__).parent.resolve() / "pyproject.toml").as_posix(), "rb") as file: + config = tomli.load(file) + + # Extract the [coverage] section + coverage_config = config.get("coverage", {}) + return coverage_config + + +def run_unittests_coverage() -> int: + """Run coverage on unittests.""" + result = subprocess.run( + ["coverage", "run", "-m", "unittest", "discover", "-v"], + check=False, + ) + return result.returncode + + +def run_scripts_coverage(untracked_scripts: Optional[list[str]] = None) -> int: + """Run all scripts with coverage.""" + returncode = 0 + scripts_dir = Path("scripts") + print(f" Untracked scripts: {untracked_scripts}") + + for script in scripts_dir.rglob("*.py"): + script_path = script.relative_to(scripts_dir) + + if script_path.as_posix() not in untracked_scripts: + print(f"\n * Running {script_path}") + start = time.perf_counter() + result = subprocess.run( + ["coverage", "run", "-a", script.name], + cwd=script.parent, + check=False, + text=True, + ) + if result.returncode != 0: + print(f"ERROR: Script {script_path} failed") + returncode = 1 + else: + print(f" OK: {script_path} ran in {time.perf_counter() - start:.2f}s") + + return returncode + + +def check_coverage_thresholds(config: dict[str, Any]) -> int: + """Check coverage thresholds using the JSON report.""" + returncode = 0 + + # Generate JSON coverage report + subprocess.run(["coverage", "json"], check=True) + + # Load JSON coverage report + with open("coverage.json", encoding="utf-8") as file: + coverage_report = json.load(file) + + # Check global coverage threshold + global_coverage = coverage_report["totals"]["percent_covered"] + threshold = config.get("min_global_coverage", 0) + if global_coverage < threshold: + print( + f"ERROR: Global coverage is below the threshold of {threshold}%. Current coverage: {global_coverage:.2f}%" + ) + returncode = 1 + + # Check per-module coverage thresholds + threshold = config.get("min_module_coverage", 0) + for module_name, data in coverage_report["files"].items(): + module_coverage = data["summary"]["percent_covered"] + + if module_coverage < threshold: + print( + f""" +ERROR: Module {module_name} coverage is below the threshold of {threshold}%. Current coverage: {module_coverage:.2f}% +""" + ) + returncode = 1 + + return returncode + + +def main() -> None: + """Run all tests and check coverage.""" + setup_environment() + config = load_config() + + print("\n> RUNNING UNITTESTS") + unittests_returncode = run_unittests_coverage() + + print("\n> RUNNING SCRIPTS") + scripts_returncode = run_scripts_coverage(untracked_scripts=config.get("untracked_scripts", [])) + + print("\n> CHECKING COVERAGE") + time.sleep(1) + subprocess.run(["coverage", "report", "-m"], check=False) + subprocess.run(["coverage", "html", "-d", "htmlcov", "-q"], check=False) + + coverage_returncode = check_coverage_thresholds(config) + + print() + if unittests_returncode + scripts_returncode + coverage_returncode == 0: + print("SUCCESS: All tests passed.") + if unittests_returncode != 0: + print("ERROR: Some unittests failed.") + if scripts_returncode != 0: + print("ERROR: Some scripts failed.") + if coverage_returncode != 0: + print("ERROR: Coverage is below the threshold.") + + sys.exit(unittests_returncode + scripts_returncode + coverage_returncode) + + +if __name__ == "__main__": + main() From 80296cf2d1eb0a95a854cdf28e279ce67dd51085 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:02:57 +0200 Subject: [PATCH 21/49] Remove deprecated files --- package_foler/.coveragerc | 2 - package_foler/.isort.cfg | 2 - package_foler/.pylintrc | 514 ------------------------------- package_foler/code_pydocstyle.py | 81 ----- package_foler/code_pylint.py | 178 ----------- package_foler/coverage.py | 41 --- package_foler/requirements.txt | 3 - 7 files changed, 821 deletions(-) delete mode 100644 package_foler/.coveragerc delete mode 100644 package_foler/.isort.cfg delete mode 100644 package_foler/.pylintrc delete mode 100644 package_foler/code_pydocstyle.py delete mode 100644 package_foler/code_pylint.py delete mode 100644 package_foler/coverage.py delete mode 100644 package_foler/requirements.txt diff --git a/package_foler/.coveragerc b/package_foler/.coveragerc deleted file mode 100644 index 434f28c..0000000 --- a/package_foler/.coveragerc +++ /dev/null @@ -1,2 +0,0 @@ -[run] -source={{PACKAGE_NAME}} diff --git a/package_foler/.isort.cfg b/package_foler/.isort.cfg deleted file mode 100644 index 5d7bf33..0000000 --- a/package_foler/.isort.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[tool.isort] -profile = "black" diff --git a/package_foler/.pylintrc b/package_foler/.pylintrc deleted file mode 100644 index 1f7127b..0000000 --- a/package_foler/.pylintrc +++ /dev/null @@ -1,514 +0,0 @@ -[MASTER] - -# A comma-separated list of package or module names from where C extensions may -# be loaded. Extensions are loading into the active Python interpreter and may -# run arbitrary code. -extension-pkg-whitelist=scipy - -# Specify a score threshold to be exceeded before program exits with error. -fail-under=10.0 - -# Add files or directories to the blacklist. They should be base names, not -# paths. -ignore=CVS - -# Add files or directories matching the regex patterns to the blacklist. The -# regex matches against base names, not paths. -ignore-patterns= - -# Python code to execute, usually for sys.path manipulation such as -# pygtk.require(). -#init-hook= - -# Use multiple processes to speed up Pylint. Specifying 0 will auto-detect the -# number of processors available to use. -jobs=1 - -# Control the amount of potential inferred values when inferring a single -# object. This can help the performance when dealing with large functions or -# complex, nested conditions. -limit-inference-results=100 - -# List of plugins (as comma separated values of python module names) to load, -# usually to register additional checkers. -load-plugins= - -# Pickle collected data for later comparisons. -persistent=yes - -# When enabled, pylint would attempt to guess common misconfiguration and emit -# user-friendly hints instead of false-positive error messages. -suggestion-mode=yes - -# Allow loading of arbitrary C extensions. Extensions are imported into the -# active Python interpreter and may run arbitrary code. -unsafe-load-any-extension=no - - -[MESSAGES CONTROL] - -# Only show warnings with the listed confidence levels. Leave empty to show -# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED. -confidence= - -# Disable the message, report, category or checker with the given id(s). You -# can either give multiple identifiers separated by comma (,) or put this -# option multiple times (only on the command line, not in the configuration -# file where it should appear only once). You can also use "--disable=all" to -# disable everything first and then reenable specific checks. For example, if -# you want to run only the similarities checker, you can use "--disable=all -# --enable=similarities". If you want to run only the classes checker, but have -# no Warning level messages displayed, use "--disable=all --enable=classes -# --disable=W". -disable=missing-function-docstring, - missing-class-docstring, - -# Enable the message, report, category or checker with the given id(s). You can -# either give multiple identifier separated by comma (,) or put this option -# multiple time (only on the command line, not in the configuration file where -# it should appear only once). See also the "--disable" option for examples. -enable=c-extension-no-member - - -[REPORTS] - -# Python expression which should return a score less than or equal to 10. You -# have access to the variables 'error', 'warning', 'refactor', and 'convention' -# which contain the number of messages in each category, as well as 'statement' -# which is the total number of statements analyzed. This score is used by the -# global evaluation report (RP0004). -evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) - -# Template used to display messages. This is a python new-style format string -# used to format the message information. See doc for all details. -#msg-template= - -# Set the output format. Available formats are text, parseable, colorized, json -# and msvs (visual studio). You can also give a reporter class, e.g. -# mypackage.mymodule.MyReporterClass. -output-format=text - -# Tells whether to display a full report or only the messages. -reports=no - -# Activate the evaluation score. -score=yes - - -[REFACTORING] - -# Maximum number of nested blocks for function / method body -max-nested-blocks=5 - -# Complete name of functions that never returns. When checking for -# inconsistent-return-statements if a never returning function is called then -# it will be considered as an explicit return statement and no message will be -# printed. -never-returning-functions=sys.exit - - -[LOGGING] - -# The type of string formatting that logging methods do. `old` means using % -# formatting, `new` is for `{}` formatting. -logging-format-style=old - -# Logging modules to check that the string format arguments are in logging -# function parameter format. -logging-modules=logging - - -[SIMILARITIES] - -# Ignore comments when computing similarities. -ignore-comments=yes - -# Ignore docstrings when computing similarities. -ignore-docstrings=yes - -# Ignore imports when computing similarities. -ignore-imports=no - -# Minimum lines number of a similarity. -min-similarity-lines=6 - - -[TYPECHECK] - -# List of decorators that produce context managers, such as -# contextlib.contextmanager. Add to this list to register other decorators that -# produce valid context managers. -contextmanager-decorators=contextlib.contextmanager - -# List of members which are set dynamically and missed by pylint inference -# system, and so shouldn't trigger E1101 when accessed. Python regular -# expressions are accepted. -generated-members= - -# Tells whether missing members accessed in mixin class should be ignored. A -# mixin class is detected if its name ends with "mixin" (case insensitive). -ignore-mixin-members=yes - -# Tells whether to warn about missing members when the owner of the attribute -# is inferred to be None. -ignore-none=yes - -# This flag controls whether pylint should warn about no-member and similar -# checks whenever an opaque object is returned when inferring. The inference -# can return multiple potential results while evaluating a Python object, but -# some branches might not be evaluated, which results in partial inference. In -# that case, it might be useful to still emit no-member and other checks for -# the rest of the inferred objects. -ignore-on-opaque-inference=yes - -# List of class names for which member attributes should not be checked (useful -# for classes with dynamically set attributes). This supports the use of -# qualified names. -ignored-classes=optparse.Values,thread._local,_thread._local - -# List of module names for which member attributes should not be checked -# (useful for modules/projects where namespaces are manipulated during runtime -# and thus existing member attributes cannot be deduced by static analysis). It -# supports qualified module names, as well as Unix pattern matching. -ignored-modules= - -# Show a hint with possible names when a member name was not found. The aspect -# of finding the hint is based on edit distance. -missing-member-hint=yes - -# The minimum edit distance a name should have in order to be considered a -# similar match for a missing member name. -missing-member-hint-distance=1 - -# The total number of similar names that should be taken in consideration when -# showing a hint for a missing member. -missing-member-max-choices=1 - -# List of decorators that change the signature of a decorated function. -signature-mutators= - - -[MISCELLANEOUS] - -# List of note tags to take in consideration, separated by a comma. -notes=FIXME, - XXX, - TODO - -# Regular expression of note tags to take in consideration. -#notes-rgx= - - -[STRING] - -# This flag controls whether inconsistent-quotes generates a warning when the -# character used as a quote delimiter is used inconsistently within a module. -check-quote-consistency=no - -# This flag controls whether the implicit-str-concat should generate a warning -# on implicit string concatenation in sequences defined over several lines. -check-str-concat-over-line-jumps=no - - -[FORMAT] - -# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. -expected-line-ending-format= - -# Regexp for a line that is allowed to be longer than the limit. -ignore-long-lines=^\s*(# )??$ - -# Number of spaces of indent required inside a hanging or continued line. -indent-after-paren=4 - -# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 -# tab). -indent-string=' ' - -# Maximum number of characters on a single line. -max-line-length=120 - -# Maximum number of lines in a module. -max-module-lines=2450 - -# Allow the body of a class to be on the same line as the declaration if body -# contains single statement. -single-line-class-stmt=no - -# Allow the body of an if to be on the same line as the test if there is no -# else. -single-line-if-stmt=no - - -[SPELLING] - -# Limits count of emitted suggestions for spelling mistakes. -max-spelling-suggestions=4 - -# Spelling dictionary name. Available dictionaries: none. To make it work, -# install the python-enchant package. -spelling-dict= - -# List of comma separated words that should not be checked. -spelling-ignore-words= - -# A path to a file that contains the private dictionary; one word per line. -spelling-private-dict-file= - -# Tells whether to store unknown words to the private dictionary (see the -# --spelling-private-dict-file option) instead of raising a message. -spelling-store-unknown-words=no - - -[VARIABLES] - -# List of additional names supposed to be defined in builtins. Remember that -# you should avoid defining new builtins when possible. -additional-builtins= - -# Tells whether unused global variables should be treated as a violation. -allow-global-unused-variables=yes - -# List of strings which can identify a callback function by name. A callback -# name must start or end with one of those strings. -callbacks=cb_, - _cb - -# A regular expression matching the name of dummy variables (i.e. expected to -# not be used). -dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_ - -# Argument names that match this expression will be ignored. Default to name -# with leading underscore. -ignored-argument-names=_.*|^ignored_|^unused_ - -# Tells whether we should check for unused import in __init__ files. -init-import=no - -# List of qualified module names which can have objects that can redefine -# builtins. -redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io - - -[BASIC] - -# Naming style matching correct argument names. -argument-naming-style=snake_case - -# Regular expression matching correct argument names. Overrides argument- -# naming-style. -#argument-rgx= - -# Naming style matching correct attribute names. -attr-naming-style=snake_case - -# Regular expression matching correct attribute names. Overrides attr-naming- -# style. -#attr-rgx= - -# Bad variable names which should always be refused, separated by a comma. -bad-names=foo, - bar, - baz, - toto, - tutu, - tata - -# Bad variable names regexes, separated by a comma. If names match any regex, -# they will always be refused -bad-names-rgxs= - -# Naming style matching correct class attribute names. -class-attribute-naming-style=any - -# Regular expression matching correct class attribute names. Overrides class- -# attribute-naming-style. -#class-attribute-rgx= - -# Naming style matching correct class names. -class-naming-style=PascalCase - -# Regular expression matching correct class names. Overrides class-naming- -# style. -#class-rgx= - -# Naming style matching correct constant names. -const-naming-style=UPPER_CASE - -# Regular expression matching correct constant names. Overrides const-naming- -# style. -#const-rgx= - -# Minimum line length for functions/classes that require docstrings, shorter -# ones are exempt. -docstring-min-length=-1 - -# Naming style matching correct function names. -function-naming-style=snake_case - -# Regular expression matching correct function names. Overrides function- -# naming-style. -#function-rgx= - -# Good variable names which should always be accepted, separated by a comma. -good-names=i, - j, - k, - x, - y, - z, - ex, - Run, - _ - -# Good variable names regexes, separated by a comma. If names match any regex, -# they will always be accepted -good-names-rgxs= - -# Include a hint for the correct naming format with invalid-name. -include-naming-hint=no - -# Naming style matching correct inline iteration names. -inlinevar-naming-style=any - -# Regular expression matching correct inline iteration names. Overrides -# inlinevar-naming-style. -#inlinevar-rgx= - -# Naming style matching correct method names. -method-naming-style=snake_case - -# Regular expression matching correct method names. Overrides method-naming- -# style. -#method-rgx= - -# Naming style matching correct module names. -module-naming-style=snake_case - -# Regular expression matching correct module names. Overrides module-naming- -# style. -#module-rgx= - -# Colon-delimited sets of names that determine each other's naming style when -# the name regexes allow several styles. -name-group= - -# Regular expression which should only match function or class names that do -# not require a docstring. -no-docstring-rgx=^_ - -# List of decorators that produce properties, such as abc.abstractproperty. Add -# to this list to register other decorators that produce valid properties. -# These decorators are taken in consideration only for invalid-name. -property-classes=abc.abstractproperty - -# Naming style matching correct variable names. -variable-naming-style=snake_case - -# Regular expression matching correct variable names. Overrides variable- -# naming-style. -#variable-rgx= - - -[DESIGN] - -# Maximum number of arguments for function / method. -max-args=5 - -# Maximum number of attributes for a class (see R0902). -max-attributes=7 - -# Maximum number of boolean expressions in an if statement (see R0916). -max-bool-expr=5 - -# Maximum number of branch for function / method body. -max-branches=12 - -# Maximum number of locals for function / method body. -max-locals=15 - -# Maximum number of parents for a class (see R0901). -max-parents=7 - -# Maximum number of public methods for a class (see R0904). -max-public-methods=20 - -# Maximum number of return / yield for function / method body. -max-returns=6 - -# Maximum number of statements in function / method body. -max-statements=50 - -# Minimum number of public methods for a class (see R0903). -min-public-methods=2 - - -[IMPORTS] - -# List of modules that can be imported at any level, not just the top level -# one. -allow-any-import-level= - -# Allow wildcard imports from modules that define __all__. -allow-wildcard-with-all=no - -# Analyse import fallback blocks. This can be used to support both Python 2 and -# 3 compatible code, which means that the block might have code that exists -# only in one or another interpreter, leading to false positives when analysed. -analyse-fallback-blocks=no - -# Deprecated modules which should not be used, separated by a comma. -deprecated-modules=optparse,tkinter.tix - -# Create a graph of external dependencies in the given file (report RP0402 must -# not be disabled). -ext-import-graph= - -# Create a graph of every (i.e. internal and external) dependencies in the -# given file (report RP0402 must not be disabled). -import-graph= - -# Create a graph of internal dependencies in the given file (report RP0402 must -# not be disabled). -int-import-graph= - -# Force import order to recognize a module as part of the standard -# compatibility libraries. -known-standard-library= - -# Force import order to recognize a module as part of a third party library. -known-third-party=enchant - -# Couples of modules and preferred modules, separated by a comma. -preferred-modules= - - -[CLASSES] - -# List of method names used to declare (i.e. assign) instance attributes. -defining-attr-methods=__init__, - __new__, - setUp, - __post_init__ - -# List of member names, which should be excluded from the protected access -# warning. -exclude-protected=_asdict, - _fields, - _replace, - _source, - _make - -# List of valid names for the first argument in a class method. -valid-classmethod-first-arg=cls - -# List of valid names for the first argument in a metaclass class method. -valid-metaclass-classmethod-first-arg=cls - - -[EXCEPTIONS] - -# Exceptions that will emit a warning when being caught. Defaults to -# "BaseException, Exception". -overgeneral-exceptions=builtins.BaseException, - builtins.Exception diff --git a/package_foler/code_pydocstyle.py b/package_foler/code_pydocstyle.py deleted file mode 100644 index 56c5a24..0000000 --- a/package_foler/code_pydocstyle.py +++ /dev/null @@ -1,81 +0,0 @@ -""" -PyDocStrings Analysis. -""" - -import os -import random -from glob import glob - -import pydocstyle - -exclude_folders = {""} - - -def should_exclude_folder(path): - # Vérifie si le chemin contient un des dossiers à exclure - return any(ex in path for ex in exclude_folders) - - -file_list = filter( - lambda z: not z.endswith("__init__.py") and not should_exclude_folder(z), - [y for x in os.walk("./{{PACKAGE_NAME}}") for y in glob(os.path.join(x[0], "*.py"))], -) - - -UNWATCHED_ERRORS = [ - # Do not watch these errors - # General Format and Content Issues - 'D100', 'D104', 'D105', 'D107', - # Docstring Formatting - 'D200', 'D202', 'D203', 'D204', 'D206', 'D210', 'D212', - # Docstring Content and Structure - 'D301', 'D302', - 'D401', 'D402', 'D407', 'D408', 'D409', - 'D412', 'D415', 'D418' -] - -MAX_ERROR_BY_TYPE = { - # If the error code is not in this dict, then there is no tolerance on the error. - # http://www.pydocstyle.org/en/stable/error_codes.html - } - -error_detected = False -error_over_ratchet_limit = False -ratchet_limit = 9 - -code_to_errors = {} -for error in pydocstyle.check(file_list, ignore=UNWATCHED_ERRORS): - code_to_errors.setdefault(error.code, []) - code_to_errors[error.code].append(error) - -code_to_number = {code: len(errors) for code, errors in code_to_errors.items()} - -for error_code, number_errors in code_to_number.items(): - if error_code not in UNWATCHED_ERRORS: - max_errors = max(MAX_ERROR_BY_TYPE.get(error_code, 0), 0) - - if number_errors > max_errors: - error_detected = True - print(f"\nFix some {error_code} errors: {number_errors}/{max_errors}") - - errors = code_to_errors[error_code] - errors_to_show = sorted(random.sample(errors, min(30, len(errors))), key=lambda m: (m.filename, m.line)) - for error in errors_to_show: - print(f"{error.filename} line {error.line}: {error.message}") - elif max_errors - ratchet_limit <= number_errors < max_errors: - print( - f"\nYou can lower number of {error_code} to {number_errors} (actual {max_errors})" - ) - elif number_errors < max_errors - ratchet_limit: - error_over_ratchet_limit = True - print( - f"\nYou MUST lower number of {error_code} to {number_errors} (actual {max_errors})" - ) - -if error_detected: - raise RuntimeError("Too many errors\nRun pydocstyle {{PACKAGE_NAME}} to get the errors") - -if error_over_ratchet_limit: - raise RuntimeError( - "Please lower the error limits in code_pydocstyle.py MAX_ERROR_BY_TYPE according to warnings above" - ) diff --git a/package_foler/code_pylint.py b/package_foler/code_pylint.py deleted file mode 100644 index fd1880c..0000000 --- a/package_foler/code_pylint.py +++ /dev/null @@ -1,178 +0,0 @@ -""" -Pylint Analysis. -""" - -from pylint.lint import Run - -MIN_NOTE = 8 - -UNWATCHED_ERRORS = [] - -MAX_ERROR_BY_TYPE = { - "line-too-long": 0, - "consider-using-f-string": 0, - "no-else-return": 0, - "implicit-str-concat": 0, - "consider-using-in": 0, - "used-before-assignment": 0, - "missing-docstring": 0, - "too-many-arguments": 0, - "too-many-locals": 0, - "too-many-return-statements": 0, - "invalid-name": 0, - "redefined-outer-name": 0, - "unused-variable": 0, - "import-error": 0, - "duplicate-code": 0, - "bad-continuation": 0, - "no-member": 0, - "logging-format-interpolation": 0, - "too-many-nested-blocks": 0, - "abstract-method": 0, - "access-member-before-definition": 0, - "arguments-differ": 0, - "bare-except": 0, - "blacklisted-name": 0, - "breaking-import": 0, - "const-righteous": 0, - "deprecated-module": 0, - "duplicate-argument-name": 0, - "duplicate-key": 0, - "eval-used": 0, - "fixme": 0, - "global-statement": 0, - "import-outside-toplevel": 0, - "invalid-unary-operand-type": 0, - "length-of-docstring": 0, - "no-attribute": 0, - "no-else-continue": 0, - "no-self-use": 0, - "not-callable": 0, - "not-supported-yet": 0, - "redundant-unittest-assert": 0, - "reimported": 0, - "too-many-branches": 0, - "too-many-function-args": 0, - "too-many-function-attributes": 0, - "too-many-instance-attributes": 0, - "too-many-public-methods": 0, - "unexpected-keyword-arg": 0, - "unidiomatic-typecheck": 0, - "unnecessary-comprehension": 0, - "unused-import": 0, - "wrong-import-position": 0, - "abstract-method": 0, - "access-member-before-definition": 0, - "arguments-differ": 0, - "bare-except": 0, - "blacklisted-name": 0, - "breaking-import": 0, - "const-righteous": 0, - "deprecated-module": 0, - "duplicate-argument-name": 0, - "duplicate-key": 0, - "eval-used": 0, - "fixme": 0, - "global-statement": 0, - "import-outside-toplevel": 0, - "invalid-unary-operand-type": 0, - "length-of-docstring": 0, - "no-attribute": 0, - "no-else-continue": 0, - "no-self-use": 0, - "not-callable": 0, - "not-supported-yet": 0, - "redundant-unittest-assert": 0, - "reimported": 0, - "too-many-branches": 0, - "too-many-function-args": 0, - "too-many-function-attributes": 0, - "too-many-instance-attributes": 0, - "too-many-public-methods": 0, - "unexpected-keyword-arg": 0, - "unidiomatic-typecheck": 0, - "unnecessary-comprehension": 0, - "unused-import": 0, - "wrong-import-position": 0, - "invalid-name": 0, - "missing-module-docstring": 0, - "missing-class-docstring": 0, - "missing-function-docstring": 0, - "no-qa": 0, - "no-else-continue": 0, - "not-context-manager": 0, - "too-few-public-methods": 0, - "unnecessary-pass": 0, - "invalid-sequence-index": 0, - "logging-format-interpolation": 0, - "no-method-argument": 0, - "too-many-nested-blocks": 0, - "no-else-return": 0, - "redefined-builtin": 0, - "superfluous-parens": 0, - "useless-object-inheritance": 0, - "no-member": 0, - "not-callable": 0, - "trailing-whitespace": 0, - "invalid-name": 0, - "duplicate-code": 0, - "bad-continuation": 0, - "fixme": 0, - "redefined-outer-name": 0, -} - -import os -import sys - -f = open(os.devnull, "w") - -old_stdout = sys.stdout -sys.stdout = f - -results = Run(["{{PACKAGE_NAME}}", "--output-format=json", "--reports=no"], do_exit=False) -# `exit` is deprecated, use `do_exit` instead -sys.stdout = old_stdout - -PYLINT_OBJECTS = True -if hasattr(results.linter.stats, "global_note"): - pylint_note = results.linter.stats.global_note - PYLINT_OBJECT_STATS = True -else: - pylint_note = results.linter.stats["global_note"] - PYLINT_OBJECT_STATS = False - -print("Pylint note: ", pylint_note) -assert pylint_note >= MIN_NOTE -print("You can increase MIN_NOTE in pylint to {} (actual: {})".format(pylint_note, MIN_NOTE)) - - -def extract_messages_by_type(type_): - return [m for m in results.linter.reporter.messages if m.symbol == type_] - - -# uncontrolled_errors = {} -error_detected = False - -if PYLINT_OBJECT_STATS: - stats_by_msg = results.linter.stats.by_msg -else: - stats_by_msg = results.linter.stats["by_msg"] - -for error_type, number_errors in stats_by_msg.items(): - if error_type not in UNWATCHED_ERRORS: - if error_type in MAX_ERROR_BY_TYPE: - max_errors = MAX_ERROR_BY_TYPE[error_type] - else: - max_errors = 0 - - if number_errors > max_errors: - error_detected = True - print("Fix some {} errors: {}/{}".format(error_type, number_errors, max_errors)) - for message in extract_messages_by_type(error_type): - print("{} line {}: {}".format(message.path, message.line, message.msg)) - elif number_errors < max_errors: - print("You can lower number of {} to {} (actual {})".format(error_type, number_errors, max_errors)) - - -if error_detected: - raise RuntimeError("Too many errors. Run pylint {{PACKAGE_NAME}} to get the errors") diff --git a/package_foler/coverage.py b/package_foler/coverage.py deleted file mode 100644 index 1d16def..0000000 --- a/package_foler/coverage.py +++ /dev/null @@ -1,41 +0,0 @@ -""" -Coverage Analysis. -""" - -import json - -MIN_FILE_COVERAGE = 60 -MIN_PROJECT_COVERAGE = 74 - -untracked_modules = [] - -print("untracked modules:", untracked_modules) - -with open("coverage.json", "r") as file: - d = json.load(file) - -project_coverage = d["totals"]["percent_covered"] - -print(f"total covered: {project_coverage} %") -assert project_coverage > MIN_PROJECT_COVERAGE -print( - f"[Coverage] You can increase MIN_PROJECT_COVERAGE to maximum {project_coverage}%" - f" (actual {MIN_PROJECT_COVERAGE}%)" -) - -min_actual_coverage = 100 -for file_name, data in d["files"].items(): - print(file_name, data["summary"]["percent_covered"], "%") - if "/".join(file_name.split("/")[-2:]) in untracked_modules: - print(file_name, "-> in untrack list") - else: - file_coverage = data["summary"]["percent_covered"] - if file_coverage < MIN_FILE_COVERAGE: - raise RuntimeError(f"File {file_name} is not covered enough: {file_coverage} % / {MIN_FILE_COVERAGE} %") - min_actual_coverage = min(min_actual_coverage, data["summary"]["percent_covered"]) - -print( - "[Coverage] You can increase MIN_FILE_COVERAGE to maximum {}% (actual:{})%".format( - min_actual_coverage, MIN_FILE_COVERAGE - ) -) diff --git a/package_foler/requirements.txt b/package_foler/requirements.txt deleted file mode 100644 index 74fa65e..0000000 --- a/package_foler/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -matplotlib -numpy -scipy From 5064f4dd305cfbd9ece932b3c525d4ae7c0c0351 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:04:21 +0200 Subject: [PATCH 22/49] Update pyproject.toml --- package_foler/pyproject.toml | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 package_foler/pyproject.toml diff --git a/package_foler/pyproject.toml b/package_foler/pyproject.toml new file mode 100644 index 0000000..5cbaf52 --- /dev/null +++ b/package_foler/pyproject.toml @@ -0,0 +1,46 @@ +[build-system] +requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=6.0"] +build-backend = "setuptools.build_meta" + +[tool.ruff] +line-length = 120 +target-version = "py39" + +[tool.ruff.lint] +preview = true +select = [ # https://docs.astral.sh/ruff/rules + "E4", "E7", "E9", # pycodestyle coding rules + "F", # Pyflakes + "B", # flake8-bugbear + "I", # isort + "N", # pep8-naming + "D", # pydocstyle documentation + "UP", # pyupgrade + "ANN001", # missing type annotation for function arguments + "ANN201", # missing type annotation for function return value + "PL", # pylint + "NPY", # NumPy-specific rules + "PERF", # Perflint + "RUF", # Ruff-specific rules +] + +[tool.ruff.lint.pydocstyle] +convention = "pep257" + +[tool.ruff.lint.per-file-ignores] +"tests/**/*.py" = ["D"] # documenting the unit tests is not necessary + +[tool.codespell] +skip = ["*.json", "*.html", "*.js", "*.css", ".c", ".h", ".cpp", ".hpp", "*.xml"] +ignore-words-list = ["dessia"] # words to ignore from codespell check + +[tool.coverage.run] +source = ["{{PROJECT_NAME}}"] # source code directories + +[tool.coverage.report] +omit = [] # modules to omit from coverage analysis + +[coverage] +min_global_coverage = 90 # minimum global coverage percentage +min_module_coverage = 80 # minimum coverage percentage for each module +untracked_scripts = [] # not tested scripts (relative path to scripts directory) From 65331107345b33b870bfb27c6de973f1519ee9c9 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:04:31 +0200 Subject: [PATCH 23/49] Update README.md --- package_foler/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_foler/README.md b/package_foler/README.md index 8edc34e..c178290 100644 --- a/package_foler/README.md +++ b/package_foler/README.md @@ -4,14 +4,14 @@ ## Installation -To install the package, move to the folder next to setup.py and run: -```bash -python setup.py install -``` -or +The package can be installed using pip, from the root directory of the package: + ```bash -python3 setup.py install +pip install -e . ``` +> Note: The `-e` flag is optional and used to install the package in editable mode. +> This allows to modify the package and see the changes without reinstalling it. + ## Usage See the scripts folder for examples. From 93980df80fe5f35eb4cf77f65bb6b018630ddc70 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:06:23 +0200 Subject: [PATCH 24/49] Update pre-commit --- package_foler/.pre-commit-config.yaml | 42 ++++++++++++++++----------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/package_foler/.pre-commit-config.yaml b/package_foler/.pre-commit-config.yaml index 3099cf7..8f8c1c0 100644 --- a/package_foler/.pre-commit-config.yaml +++ b/package_foler/.pre-commit-config.yaml @@ -1,35 +1,43 @@ -# File introduces automated checks triggered on git events -# to enable run `pip install pre-commit && pre-commit install` +# This file configures automated checks triggered by git events. +# To install pre-commit, run: `pip install pre-commit` +# +# To run all hooks manually, use: `pre-commit run -a` +# To enable automated checks on commit, run: `pre-commit install` +# +# See https://github.com/pre-commit/pre-commit for more information repos: - - repo: https://github.com/pycqa/isort - rev: 5.12.0 + - repo: https://github.com/astral-sh/ruff-pre-commit + rev: v0.6.5 hooks: - - id: isort - args: ["--profile", "black"] + - id: ruff # linter + args: [ --fix ] + - id: ruff-format # formatter - - repo: https://github.com/psf/black - rev: 22.10.0 + - repo: https://github.com/codespell-project/codespell + rev: v2.3.0 hooks: - - id: black - args: [-l, "120"] - # It is recommended to specify the latest version of Python - # supported by your project here, or alternatively use - language_version: python3.9 + - id: codespell + additional_dependencies: + - tomli - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.2.0 + rev: v4.6.0 hooks: - id: check-added-large-files - args: ['--maxkb=50'] + args: ["--maxkb=50"] - id: check-docstring-first - id: check-json - - id: check-added-large-files - id: check-yaml - id: debug-statements - id: requirements-txt-fixer + - id: check-case-conflict - id: check-merge-conflict - #- id: end-of-file-fixer + - id: end-of-file-fixer + - id: mixed-line-ending + - id: requirements-txt-fixer + - id: trailing-whitespace + - id: check-symlinks - repo: local hooks: From df2ddd6d20930b5dea53b4cea6ae185a3a862ab5 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:11:20 +0200 Subject: [PATCH 25/49] Use str for path --- package_foler/test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_foler/test.py b/package_foler/test.py index 0343829..4f254ba 100644 --- a/package_foler/test.py +++ b/package_foler/test.py @@ -13,13 +13,13 @@ def setup_environment() -> None: """Set up environment variables for coverage.""" - os.environ["COVERAGE_FILE"] = (Path(__file__).parent.resolve() / ".coverage").as_posix() - os.environ["COVERAGE_RCFILE"] = (Path(__file__).parent.resolve() / "pyproject.toml").as_posix() + os.environ["COVERAGE_FILE"] = str(Path(__file__).parent.resolve() / ".coverage") + os.environ["COVERAGE_RCFILE"] = str(Path(__file__).parent.resolve() / "pyproject.toml") def load_config() -> dict[str, Any]: """Load configuration file.""" - with open((Path(__file__).parent.resolve() / "pyproject.toml").as_posix(), "rb") as file: + with open(str(Path(__file__).parent.resolve() / "pyproject.toml"), "rb") as file: config = tomli.load(file) # Extract the [coverage] section @@ -45,7 +45,7 @@ def run_scripts_coverage(untracked_scripts: Optional[list[str]] = None) -> int: for script in scripts_dir.rglob("*.py"): script_path = script.relative_to(scripts_dir) - if script_path.as_posix() not in untracked_scripts: + if str(script_path) not in untracked_scripts: print(f"\n * Running {script_path}") start = time.perf_counter() result = subprocess.run( From 1b9d9503d92616e0ad9797fe6a0381aa1fad7370 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:18:14 +0200 Subject: [PATCH 26/49] Update .gitignore --- package_foler/.gitignore | 109 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/package_foler/.gitignore b/package_foler/.gitignore index b6e4761..efadd19 100644 --- a/package_foler/.gitignore +++ b/package_foler/.gitignore @@ -50,6 +50,8 @@ coverage.xml *.py,cover .hypothesis/ .pytest_cache/ +cover/ +.ruff_cache # Translations *.mo @@ -72,6 +74,7 @@ instance/ docs/_build/ # PyBuilder +.pybuilder/ target/ # Jupyter Notebook @@ -82,6 +85,8 @@ profile_default/ ipython_config.py # pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: .python-version # pipenv @@ -91,7 +96,24 @@ ipython_config.py # install all needed dependencies. #Pipfile.lock -# PEP 582; used by e.g. github.com/David-OConnor/pyflow +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm __pypackages__/ # Celery stuff @@ -127,3 +149,88 @@ dmypy.json # Pyre type checker .pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser From a1a242d6e5e870c69d729c176ea23d4f5d9389b8 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:19:27 +0200 Subject: [PATCH 27/49] Update CI --- package_foler/.gitlab-ci.yml | 69 +++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/package_foler/.gitlab-ci.yml b/package_foler/.gitlab-ci.yml index b6fe5b4..65060dd 100644 --- a/package_foler/.gitlab-ci.yml +++ b/package_foler/.gitlab-ci.yml @@ -1,59 +1,72 @@ +# Gitlab CI configuration file for the package. +# You can use your own specific runner tags and images by changing the values in the tags and image fields + stages: + - verify - check - test -check_changelog_update: - stage: check +# Verify that the changelog has been updated +verify_changelog_update: + stage: verify tags: - - dessia_ubuntu + - dessia_ubuntu image: python:3.9 script: - - git fetch --depth=1000 origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME - - if git diff --name-only origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME...HEAD | grep -q 'CHANGELOG.md'; then echo "Changelog has been updated"; else echo "CHANGELOG.md has not been updated. Update it for the PR to be accepted in CI."; exit 1; fi + - git remote set-url origin $CI_REPOSITORY_URL + - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME --unshallow + - git fetch origin $CI_COMMIT_REF_NAME + - if git diff --name-only origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME...origin/$CI_COMMIT_REF_NAME | grep -q 'CHANGELOG.md'; then echo "Changelog has been updated"; else echo "CHANGELOG.md has not been updated. Update it for the PR to be accepted in CI."; exit 1; fi rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' -check_code_complexity: +# Check pre-commit hooks +check_pre_commit: stage: check tags: - dessia_ubuntu - image: dessia/python-ci:3.9 + image: python:3.9 script: - - pip install numpy Cython>3 - - pip install pylint==3.2.6 pydocstyle==6.3.0 pre-commit shellcheck-py cython-lint pyenchant==3.2.2 - - python code_pylint.py - - python code_pydocstyle.py + - pip install pre-commit shellcheck-py - pre-commit run -a rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' +# Test the package with unittests and run scripts, and generate coverage report install_run_scripts_and_unittests: stage: test tags: - dessia_ubuntu image: python:3.9 script: - - cd .. - - git clone https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.com/dessia/sdk/volmdlr.git - - cd volmdlr - - git checkout master - - pip install . - - cd ../{{PROJECT_NAME}} - - pip install coverage - git fetch --tags - - pip install . - - cd tests - - coverage run --rcfile=../.coveragerc --data-file=../.coverage --source {{PACKAGE_NAME}} -m unittest discover -v - - cd ../scripts - - coverage run --rcfile=../.coveragerc --data-file=../.coverage --source {{PACKAGE_NAME}} -a ci_scripts.py - - cd .. - - coverage json - - coverage report - - coverage html - - python coverage.py + - apt-get update && apt-get install -y libgl1 + - python3 -m pip install --upgrade pip + - pip install git+https://github.com/Dessia-tech/dessia_common.git +# - pip install git+https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.com/dessia/sdk/volmdlr.git + - pip install -e .[doc,test] + - pip install coverage tomli + - python3 test.py rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + +# Generate dist wheel and source distribution on master branch +generate_dist_wheel: + stage: test + tags: + - dessia_ubuntu + image: python:3.9 + script: + - pip install setuptools wheel + - python setup.py sdist bdist_wheel + rules: + - if: '$CI_COMMIT_BRANCH == "master"' + - if: '$CI_COMMIT_BRANCH == "testing"' + artifacts: + paths: + - dist/*.whl + - dist/*.tar.gz From a10560be0a86f3c0275915a20912ba70f212ec0d Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:21:03 +0200 Subject: [PATCH 28/49] Remove useless encoding --- package_foler/folder/__init__.py | 8 +----- package_foler/folder/module_1.py | 2 -- package_foler/folder/module_2.py | 2 -- package_foler/scripts/ci_scripts.py | 44 ----------------------------- package_foler/scripts/script_1.py | 2 -- package_foler/scripts/script_2.py | 2 -- package_foler/tests/test_exemple.py | 7 +++-- 7 files changed, 5 insertions(+), 62 deletions(-) delete mode 100644 package_foler/scripts/ci_scripts.py diff --git a/package_foler/folder/__init__.py b/package_foler/folder/__init__.py index cd98dcd..427f8de 100644 --- a/package_foler/folder/__init__.py +++ b/package_foler/folder/__init__.py @@ -1,9 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- """ {{PROJECT_NAME}} Package -""" - -import pkg_resources - -__version__ = pkg_resources.require("{{PACKAGE_NAME}}")[0].version +""" \ No newline at end of file diff --git a/package_foler/folder/module_1.py b/package_foler/folder/module_1.py index 5f5ba6f..7b0b3fc 100644 --- a/package_foler/folder/module_1.py +++ b/package_foler/folder/module_1.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- """ Module Documentation """ diff --git a/package_foler/folder/module_2.py b/package_foler/folder/module_2.py index 5f5ba6f..7b0b3fc 100644 --- a/package_foler/folder/module_2.py +++ b/package_foler/folder/module_2.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- """ Module Documentation """ diff --git a/package_foler/scripts/ci_scripts.py b/package_foler/scripts/ci_scripts.py deleted file mode 100644 index a452749..0000000 --- a/package_foler/scripts/ci_scripts.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -""" -Excute Scripts. -""" - -import os -import time - -scripts = ["script_1.py"] - -# Testing if all scripts exists before launching them -for script_name in scripts: - if not os.path.isfile(script_name): - raise FileNotFoundError(f"Script {script_name} does not exists in CI scripts") - -# Executing scripts -print("Executing scripts for CI:") -total_time = time.time() -top_level_dir = os.getcwd() -times = {} -for script_name in scripts: - print(f"\t* {script_name}") - # Reset dir - os.chdir(top_level_dir) - # Change cwd - if "/" in script_name: - script_folder = "/".join(script_name.split("/")[:-1]) - if script_folder: - script_folder = os.path.join(top_level_dir, script_folder) - os.chdir(script_folder) - file_name = script_name.split("/")[-1] - t = time.time() - with open(file_name, "r", encoding="utf-8") as script: - exec(script.read()) - t = time.time() - t - times[script_name] = t - -print("Computation times:") -for script_name, t in sorted(times.items(), key=lambda x: x[1]): - print(f"* script {script_name}: {round(t, 3)} seconds ") - -total_time = time.time() - total_time -print(f"Total time for CI scripts: {total_time}") diff --git a/package_foler/scripts/script_1.py b/package_foler/scripts/script_1.py index 95093e9..29fcfbe 100644 --- a/package_foler/scripts/script_1.py +++ b/package_foler/scripts/script_1.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- """ Script_1 """ diff --git a/package_foler/scripts/script_2.py b/package_foler/scripts/script_2.py index 5778975..f6fbe63 100644 --- a/package_foler/scripts/script_2.py +++ b/package_foler/scripts/script_2.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- """ Script_2 """ diff --git a/package_foler/tests/test_exemple.py b/package_foler/tests/test_exemple.py index 9bb2355..d9daf2d 100644 --- a/package_foler/tests/test_exemple.py +++ b/package_foler/tests/test_exemple.py @@ -1,12 +1,13 @@ import unittest -import numpy as npy +import numpy as np class TestClassName(unittest.TestCase): def test_method_name(self): results = [0, 3, 0] - self.assertTrue(npy.all(results == npy.array([0, 3, 0]))) + self.assertTrue(np.all(results == np.array([0, 3, 0]))) + if __name__ == "__main__": - unittest.main() \ No newline at end of file + unittest.main() From 9987307125c3e3b87b716acc6c3818ccc46a60a3 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:28:47 +0200 Subject: [PATCH 29/49] Not exclude package_folder from linting --- pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 4be1295..7182914 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires-python = ">= 3.9" [tool.ruff] line-length = 120 target-version = "py39" -exclude = ["package_foler"] +exclude = [] [tool.ruff.lint] preview = true @@ -32,5 +32,5 @@ convention = "pep257" "tests/**/*.py" = ["D"] # documenting the unit tests is not necessary [tool.codespell] -skip = "htmlcov" +skip = ["*.json", "*.html", "*.js", "*.css", ".c", ".h", ".cpp", ".hpp", "*.xml"] ignore-words-list = ["dessia"] # words to ignore from codespell check From afa5c1ffdfd028a66d6efc70a4793bb445a0be2c Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:31:13 +0200 Subject: [PATCH 30/49] Update setup.py --- package_foler/setup.py | 86 +++--------------------------------------- 1 file changed, 6 insertions(+), 80 deletions(-) diff --git a/package_foler/setup.py b/package_foler/setup.py index 2b45337..a945a8e 100644 --- a/package_foler/setup.py +++ b/package_foler/setup.py @@ -4,97 +4,23 @@ from setuptools import find_packages, setup -tag_re = re.compile(r"\btag: %s([0-9][^,]*)\b") -version_re = re.compile("^Version: (.+)$", re.M) -def readme(): - with open("README.md") as f: +def readme() -> str: + """Read the README file.""" + with open("README.md", encoding="utf-8") as f: return f.read() -def version_from_git_describe(version): - if version[0] == "v": - version = version[1:] - - # PEP 440 compatibility - number_commits_ahead = 0 - if "-" in version: - version, number_commits_ahead, commit_hash = version.split("-") - number_commits_ahead = int(number_commits_ahead) - - # print('number_commits_ahead', number_commits_ahead) - - split_versions = version.split(".") - if "post" in split_versions[-1]: - suffix = split_versions[-1] - split_versions = split_versions[:-1] - else: - suffix = None - - for pre_release_segment in ["a", "b", "rc"]: - if pre_release_segment in split_versions[-1]: - if number_commits_ahead > 0: - split_versions[-1] = str(split_versions[-1].split(pre_release_segment)[0]) - if len(split_versions) == 2: - split_versions.append("0") - if len(split_versions) == 1: - split_versions.extend(["0", "0"]) - - split_versions[-1] = str(int(split_versions[-1]) + 1) - future_version = ".".join(split_versions) - return "{}.dev{}".format(future_version, number_commits_ahead) - else: - return ".".join(split_versions) - - if number_commits_ahead > 0: - if len(split_versions) == 2: - split_versions.append("0") - if len(split_versions) == 1: - split_versions.extend(["0", "0"]) - split_versions[-1] = str(int(split_versions[-1]) + 1) - split_versions = ".".join(split_versions) - return "{}.dev{}+{}".format(split_versions, number_commits_ahead, commit_hash) - else: - if suffix is not None: - split_versions.append(suffix) - - return ".".join(split_versions) - - -def get_version(): - # Return the version if it has been injected into the file by git-archive - version = tag_re.search("$Format:%D$") - if version: - return version.group(1) - - d = dirname(__file__) - - if isdir(join(d, ".git")): - cmd = "git describe --tags" - try: - version = check_output(cmd.split()).decode().strip()[:] - - except CalledProcessError: - # raise RuntimeError("Unable to get version number from git tags") - return "0.0.1" - - return version_from_git_describe(version) - else: - # Extract the version from the PKG-INFO file. - with open(join(d, "PKG-INFO")) as f: - version = version_re.search(f.read()).group(1) - - # print('version', version) - return version - install_requires = ["{{REQUIRED_PACKAGES}}"][0].split(',') setup( - version=get_version(), name="{{PACKAGE_NAME}}", + use_scm_version=True, + setup_requires=["setuptools_scm"], description="{{SHORT_DESCRIPTION}}", long_description=readme(), + long_description_content_type="text/markdown", author="{{AUTHOR}}", author_email="{{CONTACT}}", install_requires=install_requires, From 87065cbf8b05f34a5d6e4a41375364e13df23237 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:31:52 +0200 Subject: [PATCH 31/49] Ruff fix --- package_foler/folder/__init__.py | 4 +--- package_foler/folder/module_1.py | 6 +----- package_foler/folder/module_2.py | 6 +----- package_foler/scripts/script_1.py | 5 +---- package_foler/scripts/script_2.py | 5 +---- package_foler/setup.py | 7 ++----- package_foler/tests/test_exemple.py | 4 ++-- 7 files changed, 9 insertions(+), 28 deletions(-) diff --git a/package_foler/folder/__init__.py b/package_foler/folder/__init__.py index 427f8de..e762c58 100644 --- a/package_foler/folder/__init__.py +++ b/package_foler/folder/__init__.py @@ -1,3 +1 @@ -""" -{{PROJECT_NAME}} Package -""" \ No newline at end of file +"""{{PROJECT_NAME}} Package.""" diff --git a/package_foler/folder/module_1.py b/package_foler/folder/module_1.py index 7b0b3fc..13df3b7 100644 --- a/package_foler/folder/module_1.py +++ b/package_foler/folder/module_1.py @@ -1,5 +1 @@ -""" -Module Documentation -""" - - +"""Module Documentation.""" diff --git a/package_foler/folder/module_2.py b/package_foler/folder/module_2.py index 7b0b3fc..13df3b7 100644 --- a/package_foler/folder/module_2.py +++ b/package_foler/folder/module_2.py @@ -1,5 +1 @@ -""" -Module Documentation -""" - - +"""Module Documentation.""" diff --git a/package_foler/scripts/script_1.py b/package_foler/scripts/script_1.py index 29fcfbe..a6d540d 100644 --- a/package_foler/scripts/script_1.py +++ b/package_foler/scripts/script_1.py @@ -1,4 +1 @@ -""" -Script_1 -""" - +"""Script_1.""" diff --git a/package_foler/scripts/script_2.py b/package_foler/scripts/script_2.py index f6fbe63..13d29c9 100644 --- a/package_foler/scripts/script_2.py +++ b/package_foler/scripts/script_2.py @@ -1,4 +1 @@ -""" -Script_2 -""" - +"""Script_2.""" diff --git a/package_foler/setup.py b/package_foler/setup.py index a945a8e..7290627 100644 --- a/package_foler/setup.py +++ b/package_foler/setup.py @@ -1,18 +1,15 @@ -import re -from os.path import dirname, isdir, join -from subprocess import CalledProcessError, check_output +"""Setup file.""" from setuptools import find_packages, setup - def readme() -> str: """Read the README file.""" with open("README.md", encoding="utf-8") as f: return f.read() -install_requires = ["{{REQUIRED_PACKAGES}}"][0].split(',') +install_requires = ["{{REQUIRED_PACKAGES}}"][0].split(",") setup( name="{{PACKAGE_NAME}}", diff --git a/package_foler/tests/test_exemple.py b/package_foler/tests/test_exemple.py index d9daf2d..67bf23c 100644 --- a/package_foler/tests/test_exemple.py +++ b/package_foler/tests/test_exemple.py @@ -1,10 +1,10 @@ import unittest + import numpy as np class TestClassName(unittest.TestCase): - - def test_method_name(self): + def test_method_name(self) -> None: results = [0, 3, 0] self.assertTrue(np.all(results == np.array([0, 3, 0]))) From 0c3b94b4eec65c119911a8607a55a585d404e381 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:32:24 +0200 Subject: [PATCH 32/49] Pre-commit --- package_foler/.gitlab/issue_templates/issue_template.md | 1 - .../.gitlab/merge_request_templates/merge_request_template.md | 2 -- package_foler/README.md | 1 - 3 files changed, 4 deletions(-) diff --git a/package_foler/.gitlab/issue_templates/issue_template.md b/package_foler/.gitlab/issue_templates/issue_template.md index 94feecc..f1a38d6 100644 --- a/package_foler/.gitlab/issue_templates/issue_template.md +++ b/package_foler/.gitlab/issue_templates/issue_template.md @@ -43,4 +43,3 @@ ### Related Issues - If this issue is related to or duplicates another issue, please provide links to those issues. - diff --git a/package_foler/.gitlab/merge_request_templates/merge_request_template.md b/package_foler/.gitlab/merge_request_templates/merge_request_template.md index 8962805..4a2e3c4 100644 --- a/package_foler/.gitlab/merge_request_templates/merge_request_template.md +++ b/package_foler/.gitlab/merge_request_templates/merge_request_template.md @@ -35,5 +35,3 @@ ### Additional Information - Provide any additional information that may be useful for reviewers, such as potential impacts on other parts of the project, specific areas to review, or known issues. - - diff --git a/package_foler/README.md b/package_foler/README.md index c178290..1be4b16 100644 --- a/package_foler/README.md +++ b/package_foler/README.md @@ -28,4 +28,3 @@ See the scripts folder for examples. ## Contact For any questions or issues, please contact the {{AUTHOR}} at {{CONTACT}}. - From a6ed5c31274ee3310a0d9167bb5b6d9148b64ef3 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:39:37 +0200 Subject: [PATCH 33/49] Update replace_placeholders method --- create_package.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/create_package.py b/create_package.py index 5be172b..a2589b9 100644 --- a/create_package.py +++ b/create_package.py @@ -29,13 +29,13 @@ # Function to replace placeholders in a file -def replace_placeholders(file_path: str, placeholders: dict) -> None: +def replace_placeholders(_file_path: str, _placeholders: dict) -> None: """Replace placeholders in a file with the corresponding values.""" - with open(file_path, encoding="utf-8") as file: + with open(_file_path, encoding="utf-8") as file: content = file.read() - for placeholder, value in placeholders.items(): + for placeholder, value in _placeholders.items(): content = content.replace(placeholder, value) - with open(file_path, "w", encoding="utf-8") as file: + with open(_file_path, "w", encoding="utf-8") as file: file.write(content) From e9297012a6d8d13c4da7a4d25495846e162da4be Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:41:35 +0200 Subject: [PATCH 34/49] Update PACKAGE_NAME in pyproject.toml --- package_foler/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_foler/pyproject.toml b/package_foler/pyproject.toml index 5cbaf52..aa6a540 100644 --- a/package_foler/pyproject.toml +++ b/package_foler/pyproject.toml @@ -35,7 +35,7 @@ skip = ["*.json", "*.html", "*.js", "*.css", ".c", ".h", ".cpp", ".hpp", "*.xml" ignore-words-list = ["dessia"] # words to ignore from codespell check [tool.coverage.run] -source = ["{{PROJECT_NAME}}"] # source code directories +source = ["{{PACKAGE_NAME}}"] # source code directories [tool.coverage.report] omit = [] # modules to omit from coverage analysis From 4281b5045c007f32fd952046db70a4008e326b9a Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 10:44:07 +0200 Subject: [PATCH 35/49] Add docstring --- package_foler/tests/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/package_foler/tests/__init__.py b/package_foler/tests/__init__.py index e69de29..afa08e6 100644 --- a/package_foler/tests/__init__.py +++ b/package_foler/tests/__init__.py @@ -0,0 +1 @@ +"""Unit testing package.""" From 7a8ae64fa9604a66301d9eddfc8fd40a7773e7d4 Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 15:04:51 +0200 Subject: [PATCH 36/49] Debug verify_changelog_update --- package_foler/.gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package_foler/.gitlab-ci.yml b/package_foler/.gitlab-ci.yml index 65060dd..79746f0 100644 --- a/package_foler/.gitlab-ci.yml +++ b/package_foler/.gitlab-ci.yml @@ -15,7 +15,11 @@ verify_changelog_update: image: python:3.9 script: - git remote set-url origin $CI_REPOSITORY_URL - - git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME --unshallow + - if [ "$(git rev-parse --is-shallow-repository)" = "true" ]; then + git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME --unshallow; + else + git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_NAME; + fi - git fetch origin $CI_COMMIT_REF_NAME - if git diff --name-only origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME...origin/$CI_COMMIT_REF_NAME | grep -q 'CHANGELOG.md'; then echo "Changelog has been updated"; else echo "CHANGELOG.md has not been updated. Update it for the PR to be accepted in CI."; exit 1; fi rules: From 6053869c846173ed13fcdcb39d5be668c6af1d1a Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Tue, 8 Oct 2024 17:46:02 +0200 Subject: [PATCH 37/49] Uncomment volmdlr install in CI --- package_foler/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_foler/.gitlab-ci.yml b/package_foler/.gitlab-ci.yml index 79746f0..3071479 100644 --- a/package_foler/.gitlab-ci.yml +++ b/package_foler/.gitlab-ci.yml @@ -50,7 +50,7 @@ install_run_scripts_and_unittests: - apt-get update && apt-get install -y libgl1 - python3 -m pip install --upgrade pip - pip install git+https://github.com/Dessia-tech/dessia_common.git -# - pip install git+https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.com/dessia/sdk/volmdlr.git + - pip install git+https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.com/dessia/sdk/volmdlr.git - pip install -e .[doc,test] - pip install coverage tomli - python3 test.py From 32a7a107fbe6200e2b32fb3312b3317334d04ffe Mon Sep 17 00:00:00 2001 From: Pierre Gibertini Date: Thu, 10 Oct 2024 17:01:22 +0200 Subject: [PATCH 38/49] Fix typo --- create_package.py | 2 +- {package_foler => package_folder}/.gitignore | 0 {package_foler => package_folder}/.gitlab-ci.yml | 0 .../.gitlab/issue_templates/issue_template.md | 0 .../.gitlab/merge_request_templates/merge_request_template.md | 0 {package_foler => package_folder}/.pre-commit-config.yaml | 0 {package_foler => package_folder}/CHANGELOG.md | 0 {package_foler => package_folder}/README.md | 0 {package_foler => package_folder}/folder/__init__.py | 0 {package_foler => package_folder}/folder/module_1.py | 0 {package_foler => package_folder}/folder/module_2.py | 0 {package_foler => package_folder}/pyproject.toml | 0 {package_foler => package_folder}/scripts/script_1.py | 0 {package_foler => package_folder}/scripts/script_2.py | 0 {package_foler => package_folder}/setup.py | 0 {package_foler => package_folder}/test.py | 0 {package_foler => package_folder}/tests/__init__.py | 0 {package_foler => package_folder}/tests/test_exemple.py | 0 18 files changed, 1 insertion(+), 1 deletion(-) rename {package_foler => package_folder}/.gitignore (100%) rename {package_foler => package_folder}/.gitlab-ci.yml (100%) rename {package_foler => package_folder}/.gitlab/issue_templates/issue_template.md (100%) rename {package_foler => package_folder}/.gitlab/merge_request_templates/merge_request_template.md (100%) rename {package_foler => package_folder}/.pre-commit-config.yaml (100%) rename {package_foler => package_folder}/CHANGELOG.md (100%) rename {package_foler => package_folder}/README.md (100%) rename {package_foler => package_folder}/folder/__init__.py (100%) rename {package_foler => package_folder}/folder/module_1.py (100%) rename {package_foler => package_folder}/folder/module_2.py (100%) rename {package_foler => package_folder}/pyproject.toml (100%) rename {package_foler => package_folder}/scripts/script_1.py (100%) rename {package_foler => package_folder}/scripts/script_2.py (100%) rename {package_foler => package_folder}/setup.py (100%) rename {package_foler => package_folder}/test.py (100%) rename {package_foler => package_folder}/tests/__init__.py (100%) rename {package_foler => package_folder}/tests/test_exemple.py (100%) diff --git a/create_package.py b/create_package.py index a2589b9..573e09e 100644 --- a/create_package.py +++ b/create_package.py @@ -14,7 +14,7 @@ # %% New Directory # Path to the template directory -template_dir = "package_foler" +template_dir = "package_folder" new_package_dir = f'../{parameters["project_package_name"]}' # Copy the template directory to a new location diff --git a/package_foler/.gitignore b/package_folder/.gitignore similarity index 100% rename from package_foler/.gitignore rename to package_folder/.gitignore diff --git a/package_foler/.gitlab-ci.yml b/package_folder/.gitlab-ci.yml similarity index 100% rename from package_foler/.gitlab-ci.yml rename to package_folder/.gitlab-ci.yml diff --git a/package_foler/.gitlab/issue_templates/issue_template.md b/package_folder/.gitlab/issue_templates/issue_template.md similarity index 100% rename from package_foler/.gitlab/issue_templates/issue_template.md rename to package_folder/.gitlab/issue_templates/issue_template.md diff --git a/package_foler/.gitlab/merge_request_templates/merge_request_template.md b/package_folder/.gitlab/merge_request_templates/merge_request_template.md similarity index 100% rename from package_foler/.gitlab/merge_request_templates/merge_request_template.md rename to package_folder/.gitlab/merge_request_templates/merge_request_template.md diff --git a/package_foler/.pre-commit-config.yaml b/package_folder/.pre-commit-config.yaml similarity index 100% rename from package_foler/.pre-commit-config.yaml rename to package_folder/.pre-commit-config.yaml diff --git a/package_foler/CHANGELOG.md b/package_folder/CHANGELOG.md similarity index 100% rename from package_foler/CHANGELOG.md rename to package_folder/CHANGELOG.md diff --git a/package_foler/README.md b/package_folder/README.md similarity index 100% rename from package_foler/README.md rename to package_folder/README.md diff --git a/package_foler/folder/__init__.py b/package_folder/folder/__init__.py similarity index 100% rename from package_foler/folder/__init__.py rename to package_folder/folder/__init__.py diff --git a/package_foler/folder/module_1.py b/package_folder/folder/module_1.py similarity index 100% rename from package_foler/folder/module_1.py rename to package_folder/folder/module_1.py diff --git a/package_foler/folder/module_2.py b/package_folder/folder/module_2.py similarity index 100% rename from package_foler/folder/module_2.py rename to package_folder/folder/module_2.py diff --git a/package_foler/pyproject.toml b/package_folder/pyproject.toml similarity index 100% rename from package_foler/pyproject.toml rename to package_folder/pyproject.toml diff --git a/package_foler/scripts/script_1.py b/package_folder/scripts/script_1.py similarity index 100% rename from package_foler/scripts/script_1.py rename to package_folder/scripts/script_1.py diff --git a/package_foler/scripts/script_2.py b/package_folder/scripts/script_2.py similarity index 100% rename from package_foler/scripts/script_2.py rename to package_folder/scripts/script_2.py diff --git a/package_foler/setup.py b/package_folder/setup.py similarity index 100% rename from package_foler/setup.py rename to package_folder/setup.py diff --git a/package_foler/test.py b/package_folder/test.py similarity index 100% rename from package_foler/test.py rename to package_folder/test.py diff --git a/package_foler/tests/__init__.py b/package_folder/tests/__init__.py similarity index 100% rename from package_foler/tests/__init__.py rename to package_folder/tests/__init__.py diff --git a/package_foler/tests/test_exemple.py b/package_folder/tests/test_exemple.py similarity index 100% rename from package_foler/tests/test_exemple.py rename to package_folder/tests/test_exemple.py From 48d0f3f7f6b35b04784aabdb7d5ab990245cdccc Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 10 Oct 2024 17:28:21 +0200 Subject: [PATCH 39/49] Add: methods_get_parameters_from_ini_file --- .../methods_get_parameters_from_ini_file.py | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 methods/methods_get_parameters_from_ini_file.py diff --git a/methods/methods_get_parameters_from_ini_file.py b/methods/methods_get_parameters_from_ini_file.py new file mode 100644 index 0000000..dcf197a --- /dev/null +++ b/methods/methods_get_parameters_from_ini_file.py @@ -0,0 +1,89 @@ +"""Functions to get parameters from an ini file.""" + +import configparser + +from .methods_check_inputs import ( + check_pypi_package_name, + validate_email, + validate_package_name, + validate_python_version, + validate_required_packages, + validate_url, +) + +def read_config_to_dict(file_path: str) -> dict: + config = configparser.ConfigParser() + config.read(file_path) + + config_dict = {} + + for section in config.sections(): + if section !="DOCUMENTATION": + for key, value in config[section].items(): + config_dict[key] = value.strip() + + return config_dict + + +def get_parameters_from_ini_file(ini_file: str) -> dict: + """Get the parameters from an ini file.""" + + parameters = read_config_to_dict(ini_file) + + # %% Package name + + package_name = parameters["package_name"] + validate_package_name(package_name) + check_pypi_package_name(package_name) + + project_package_name = "".join(x.title() for x in package_name.split("_")) + parameters["project_package_name"] = project_package_name + + # %% Package URL + + package_url = parameters["package_url"] + if package_url: + validate_url(package_url) + + # %% Short description + + if not parameters["short_description"]: + parameters["short_description"] = "A Specific python package for a technological issue." + + # %% Long description + + if not parameters["long_description"]: + parameters["long_description"] = ( + "A Python package using DessiA SDK tools and coding guidelines (https://documentation.dessia.io)" + ) + + # %% Python version + + version = parameters["python_version"] + if not version: + parameters["python_version"] = ">=3.9" + else: + validate_python_version(version) + + # %% Author + + if not parameters["author"]: + parameters["author"] = "Operations-Team" + + # %% E-mail + + contact = parameters["email"] + if not contact: + parameters["email"] = "support@dessia.io" + else: + validate_email(contact) + + # %% Required packages + + required_packages = parameters["required_packages"] + if not required_packages: + required_packages = ["dessia_common>=0.18.0, plot_data>=0.26.0"] + else: + validate_required_packages(required_packages) + + return parameters From 5cd392462f99a3a5b3aeb7826c2cf23bbcab0f7e Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 10 Oct 2024 17:28:39 +0200 Subject: [PATCH 40/49] Add: template_inputs.ini (Replace: excel_file) --- template_inputs.ini | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 template_inputs.ini diff --git a/template_inputs.ini b/template_inputs.ini new file mode 100644 index 0000000..9ce86e2 --- /dev/null +++ b/template_inputs.ini @@ -0,0 +1,23 @@ +[GENERAL] +package_name = example_package +short_description = A Specific python package for a technological issue. +long_description = A Python package using DessiA SDK tools and coding guidelines (https://documentation.dessia.io) + +[PYTHON_REQUIREMENTS] +required_packages = dessia_common>=0.18.0, volmdlr>=0.18.0, plot_data>=0.26.0 +python_version = >=3.9 + +[METADATA] +author = Operations-Team +email = support@dessia.io +package_url = + +[DOCUMENTATION] +GENERAL.package_name = This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). (*) +GENERAL.short_description = A concise summary of what your package does. This will appear in package listings and should be clear and to the point. Aim for one sentence. +GENERAL.long_description = A more detailed description of your package. This can be a few paragraphs long and should explain the package’s features, use cases, and any important details. This will typically be included in the README.md file which can be updated after. +PYTHON_REQUIREMENTS.required_packages = A list of other Python packages that your package depends on. These dependencies will be automatically installed when your package is installed. List each package separated by a comma. +PYTHON_REQUIREMENTS.python_version = The minimum version of Python that your package is compatible with. Specify the version in the format >= followed by the version number. +METADATA.author = The name of the person or team responsible for maintaining the package. This should be the operations-team that will handle updates, support, and maintenance of the package. +METADATA.email = The contact email for the operations-team responsible for the package. This email should be monitored for any support requests, questions, or issues related to the package. +METADATA.package_url = This URL where the package source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub, or Bitbucket repository), like: www.gitlab.com/dessia From 02c4f91f7098c4478406e46064905016df801ba2 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 10 Oct 2024 17:29:28 +0200 Subject: [PATCH 41/49] Update: create_package (use .ini file) --- Template_Inputs.xlsx | Bin 103142 -> 0 bytes create_package.py | 14 +++++++------- methods/methods_check_inputs.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 Template_Inputs.xlsx diff --git a/Template_Inputs.xlsx b/Template_Inputs.xlsx deleted file mode 100644 index 15a985fbac268a939a16c360c8ec30b50aab1501..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103142 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%0DFs4!SRH%a&`Dpe3N%l{c~LO5`9mq)#!G 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 diff --git a/create_package.py b/create_package.py index a2589b9..4f201dd 100644 --- a/create_package.py +++ b/create_package.py @@ -5,11 +5,11 @@ import subprocess from datetime import date -from methods.methods_get_parameters_from_excel import get_parameters_from_excel +from methods.methods_get_parameters_from_ini_file import get_parameters_from_ini_file # %% Inputs -parameters = get_parameters_from_excel(excel_file="Template_Inputs.xlsx") +parameters = get_parameters_from_ini_file(ini_file="template_inputs.ini") # %% New Directory @@ -44,10 +44,10 @@ def replace_placeholders(_file_path: str, _placeholders: dict) -> None: "{{PACKAGE_NAME}}": parameters["package_name"], "{{PROJECT_NAME}}": parameters["project_package_name"], "{{LONG_DESCRIPTION}}": parameters["long_description"], - "{{SHORT_DESCRIPTION}}": parameters["description"], + "{{SHORT_DESCRIPTION}}": parameters["short_description"], "{{AUTHOR}}": parameters["author"], - "{{CONTACT}}": parameters["contact"], - "{{VERSION}}": parameters["version"], + "{{CONTACT}}": parameters["email"], + "{{VERSION}}": parameters["python_version"], "{{DATE}}": date.today().strftime("%d/%m/%Y") + " (Initialization)", "{{REQUIRED_PACKAGES}}": parameters["required_packages"], } @@ -72,10 +72,10 @@ def replace_placeholders(_file_path: str, _placeholders: dict) -> None: # Rename the default branch to 'master' subprocess.run(["git", "branch", "-M", "master"], check=False) -if parameters["remote_url"]: +if parameters["package_url"]: # Set up the upstream repository and push push_command = ( - f"git push --set-upstream git@{parameters['remote_url']}/" + f"git push --set-upstream git@{parameters['package_url']}/" f"$(git rev-parse --show-toplevel | xargs basename).git " f"$(git rev-parse --abbrev-ref HEAD)" ) diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 1196395..6bdcd73 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -50,7 +50,7 @@ def validate_url(url: str) -> None: def validate_python_version(version: str) -> None: """Validate the Python version format.""" if not re.match(r"^>=?(\d+\.\d+)$", version): - raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: '>=3.8'.") + raise ValueError(f"Invalid Python version '{version}'. Example of a valid version: >=3.8.") def validate_required_packages(packages: str) -> None: From a9d14abfb7f9b208ee9ee11473850636dcbe857a Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 10 Oct 2024 17:36:44 +0200 Subject: [PATCH 42/49] Update --- template_inputs.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template_inputs.ini b/template_inputs.ini index 9ce86e2..4c95f28 100644 --- a/template_inputs.ini +++ b/template_inputs.ini @@ -1,5 +1,5 @@ [GENERAL] -package_name = example_package +package_name = short_description = A Specific python package for a technological issue. long_description = A Python package using DessiA SDK tools and coding guidelines (https://documentation.dessia.io) @@ -10,7 +10,7 @@ python_version = >=3.9 [METADATA] author = Operations-Team email = support@dessia.io -package_url = +package_url = [DOCUMENTATION] GENERAL.package_name = This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). (*) From 55f67e25c312907c22c1bc80895c9338b3081768 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Thu, 10 Oct 2024 18:12:37 +0200 Subject: [PATCH 43/49] Fix Git URL interpreting --- methods/methods_check_inputs.py | 12 ++++++++++-- methods/methods_get_parameters_from_ini_file.py | 2 ++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 6bdcd73..4586bad 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -38,14 +38,22 @@ def validate_url(url: str) -> None: # if not re.match(r'^gitlab\.com:', url): # raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ - # "The package must be sorted in Dessia Organization (as: git@gitlab.com:dessia/XX)") + # "The package must be sorted in Dessia Organization (as: gitlab.com/dessia/XX)") - if not re.match(r"^git", url): + if not ('gitlab' in url.lower() or 'github' in url.lower()): raise ValueError( f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" + "If you do not need to use Git, leave an empty cell." ) +def transform_url(url: str) -> str: + """Transform the given URL to be used for Gitlab pusing.""" + # Remove 'www.' if present + url = url.replace('www.', '', 1) + + # Replace the first '/' with ':' + return url.replace('/', ':', 1) + def validate_python_version(version: str) -> None: """Validate the Python version format.""" diff --git a/methods/methods_get_parameters_from_ini_file.py b/methods/methods_get_parameters_from_ini_file.py index dcf197a..bc49474 100644 --- a/methods/methods_get_parameters_from_ini_file.py +++ b/methods/methods_get_parameters_from_ini_file.py @@ -9,6 +9,7 @@ validate_python_version, validate_required_packages, validate_url, + transform_url ) def read_config_to_dict(file_path: str) -> dict: @@ -44,6 +45,7 @@ def get_parameters_from_ini_file(ini_file: str) -> dict: package_url = parameters["package_url"] if package_url: validate_url(package_url) + parameters["package_url"] = transform_url(package_url) # %% Short description From 22ac8eba9f52126fdf00f05f8b42cd96b693976f Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 11:04:00 +0200 Subject: [PATCH 44/49] Update: README.md --- README.md | 136 +++++++++---------- methods/methods_get_parameters_from_excel.py | 90 ------------ requirements.txt | 2 +- 3 files changed, 69 insertions(+), 159 deletions(-) delete mode 100644 methods/methods_get_parameters_from_excel.py diff --git a/README.md b/README.md index 3da3bf2..da60c7c 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ This repository provides a template for creating new Python packages. It include ## Overview -dessia_bot_template is a streamlined tool designed to help developers quickly generate new Python packages by providing a pre-configured project structure. By simply filling out an Excel file with essential package metadata, users can create a new package with all the necessary structure, including essential files like setup.py, README.md, and tests, initialize a Git repository, and push it to a remote Git repository. +**dessia_bot_template** is a streamlined tool designed to help developers quickly generate new Python packages by providing a pre-configured project structure. By simply filling out a configuration .ini file with essential package metadata, users can create a new package with all the necessary structure, including essential files like setup.py, README.md, and tests, initialize a Git repository, and push it to a remote Git repository. This template simplifies the process of starting a new Python project, allowing you to focus more on coding and less on setup. @@ -26,8 +26,8 @@ This template simplifies the process of starting a new Python project, allowing - **Standardized Directory Structure for Python Packages:** Automatically creates a well-organized directory structure, including directories for your package's modules, tests, and additional resources. This ensures your project is easy to navigate and adheres to Python best practices. - - **Pre-configured setup.py for Easy Package Installation and Distribution:** - Provides a ready-to-use setup.py file tailored to your package's metadata. This file simplifies the installation process and makes your package easily distributable via PyPI or other distribution platforms. + - **Pre-configured setup.py and pyproject.toml for Easy Package Installation and Distribution:** + Provides a ready-to-use setup.py and pyproject.toml files tailored to your package's metadata. These files simplifie the installation process and make your package easily distributable via PyPI or other distribution platforms. - **Example Test Cases Using pytest:** Includes a set of example test cases to get you started with testing your package using pytest. This helps ensure your package is robust and reliable, encouraging best practices in test-driven development. @@ -36,25 +36,25 @@ Automatically creates a well-organized directory structure, including directorie Automatically initializes a Git repository for your package, commits the initial setup, and pushes it to a remote repository specified by you. This feature helps you manage your code from the very beginning with version control. - **Customizable Package Metadata:** - Easily customize your package's name, version, author information, dependencies, and more through an Excel input file. This flexibility allows you to tailor the package to your specific project requirements. + Easily customize your package's name, version, author information, descriptions, and more through a configuration .ini inputs file. This flexibility allows you to tailor the package to your specific project requirements. - **Python Version and Dependency Management:** - Specify the required Python version and manage package dependencies directly from the Excel input file. This ensures your package is compatible with the intended Python environment and has all necessary dependencies. + Specify the required Python version and manage package dependencies directly from the configuration .ini inputs file. This ensures your package is compatible with the intended Python environment and has all necessary dependencies. - **Cross-Platform Compatibility:** Designed to work seamlessly on Windows, macOS, and Linux, making it accessible to developers across different platforms. - **Error Handling and Validation:** - Built-in checks validate your input data, such as checking for valid package names, correctly formatted email addresses, and non-conflicting dependencies. This reduces the likelihood of common errors and saves you time. + Built-in checks validate your inputs data, such as checking for valid package names, correctly formatted email addresses, and non-conflicting dependencies. This reduces the likelihood of common errors and saves you time. - **Expandable and Customizable:** The template can be easily modified to include additional files, directories, or configurations. You can extend the template to suit more complex project requirements or specific use cases. - **Built-in Documentation Support:** - Automatically generates a basic README.md file based on your input, providing a starting point for your project documentation. This ensures your package is well-documented from the outset. + Automatically generates a basic README.md file based on your inputs, providing a starting point for your project documentation. This ensures your package is well-documented from the outset. - **Continuous integration (CI) configuration examples:** - The template is pre-configured for easy integration with CI/CD tools such as GitHub Actions, Travis CI, or Jenkins. This feature allows you to automate testing, deployment, and other processes, streamlining your development workflow. + The template is pre-configured for easy integration with CI/CD Gitlab tools. This feature allows you to automate testing, deployment, and other processes, streamlining your development workflow. ## Getting Started @@ -63,9 +63,8 @@ Automatically creates a well-organized directory structure, including directorie Before using this template, ensure you have the following installed: -- Python: Version 3.8 or later. +- Python: Version 3.9 or later. - Git: Version control system to manage your codebase - Optional. -- Excel: To edit the input data file (alternatively, use LibreOffice or any spreadsheet editor compatible with .xlsx files). 2. **Installation** @@ -73,54 +72,64 @@ Before using this template, ensure you have the following installed: Clone this template repository to your local machine: ``` - git clone https://github.com/Dessia-tech/dessia_bot_template.git - cd dessia_bot_template +git clone https://github.com/Dessia-tech/dessia_bot_template.git +cd dessia_bot_template ``` This template includes some Python dependencies for the script, install them: ``` - pip install -r requirements.txt +pip install -r requirements.txt ``` ## Usage -1. **Fill in the Excel File** +1. **Fill in the .ini Inputs File** -Open the file Template_Inputs.xlsx, and fill in the following fields: +Open the file template_inputs.ini, and fill in the following fields: - - **Package Name**: This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). - - **Short Description**: A concise summary of what your package does. This will appear in package listings and should be clear and to the point. Aim for one sentence. - - **Long Description**: A more detailed description of your package. This can be a few paragraphs long and should explain the package’s features, use cases, and any important details. This will typically be included in the README.md file which can be updated after. - - **Required Packages**: A list of other Python packages that your package depends on. These dependencies will be automatically installed when your package is installed. List each package separated by a comma. - - **Python Version**: The minimum version of Python that your package is compatible with. Specify the version in the format >= followed by the version number. - - **Author**: The name of the person or team responsible for maintaining the package. This should be the operations-team that will handle updates, support, and maintenance of the package. - - **Email**: The contact email for the operations-team responsible for the package. This email should be monitored for any support requests, questions, or issues related to the package. - - **Package URL**: This URL where the package's source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub, or Bitbucket repository) - Optional. Like: gitlab.com:Organisation + - **package_name**: This is the unique name of your Python package. It should be all lowercase and use underscores to separate words (e.g., my_package). + - **short_description**: A concise summary of what your package does. This will appear in package listings and should be clear and to the point. Aim for one sentence. + - **long_description**: A more detailed description of your package. This can be a few paragraphs long and should explain the package’s features, use cases, and any important details. This will typically be included in the README.md file which can be updated after. + - **required_packages**: A list of other Python packages that your package depends on. These dependencies will be automatically installed when your package is installed. List each package separated by a comma. + - **python_version**: The minimum version of Python that your package is compatible with. Specify the version in the format >= followed by the version number. + - **author**: The name of the person or team responsible for maintaining the package. This should be the operations-team that will handle updates, support, and maintenance of the package. + - **email**: The contact email of the person or team responsible of the package. This email should be monitored for any support requests, questions, or issues related to the package. + - **package_url**: This URL where the package's source code will be created. Typically, this will be the URL of the repository hosting the package (e.g., a GitLab, GitHub repository) - Optional. Like: gitlab.com/Organisation **Example:** ``` - | Item | Example | - ├──────────────────├────────────────────────────────────────────────────────────| - | Package Name | my_package | - | Short Description| A package that does awesome things | - | Long Description | This package provides awesome features for awesome people. | - | Required Packages| dessia_common>=0.18.0, plot_data>=0.26.0 | - | Python Version | >=3.9 | - | Author | Operations-Team | - | Email | support@dessia.io | - | Package URL | gitlab.com:Organisation/ClientFolder | +| Item | Example | +├──────────────────├────────────────────────────────────────────────────────────| +| package_name | my_package | +| short_description| A package that does awesome things | +| long_description | This package provides awesome features for awesome people. | +| required_packages| dessia_common>=0.18.0, plot_data>=0.26.0 | +| python_version | >=3.9 | +| author | Operations-Team | +| email | support@dessia.io | +| package_url | gitlab.com/Organisation/ClientFolder | ``` 2. **Run the Script** -After filling in the Excel file, run the create_package.py script to generate your new package: +After filling in the .ini inputs file, run the create_package.py script to generate your new package. However, if you want to push your new package to GitHub instead of GitLab, you will need to create an empty repository on GitHub before running the script. + + - Log in to your GitHub account + - Click the "+" icon in the top-right corner and select "New repository" + - Choose a project name for your repository (the directory containing your package): The project name is the CamelCase version of the package name choosen in the .ini inputs file + - Do not initialize the repository with a README, .gitignore, or license + - Click "Create repository" + +Then, + + - Run the create_package.py script ``` - python3 create_package.py +python3 create_package.py ``` The script will: @@ -129,14 +138,14 @@ The script will: - Populate it with the necessary files (e.g., setup.py, README.md, gitlab-ci.yml, etc.). - Initialize a local Git repository. - Add and commit all the files. - - Push the initial commit to the remote repository specified in the Excel file. + - Push the initial commit to the remote repository specified in the inputs file. 3. **Push to Git** If the script hasn't automatically pushed to the remote repository, you can manually push your changes: ``` - git push -u origin master +git push -u origin master ``` @@ -145,34 +154,28 @@ If the script hasn't automatically pushed to the remote repository, you can manu Here's an overview of the directory structure provided by this template: ``` - MyPackage/ - ├── my_package/ # Main source code directory - │ ├── __init__.py # Initialize your package - │ ├── module_1.py # Example module 1 - │ └── module_2.py # Example module 2 - ├── scripts/ # Directory for utility scripts related to the package - │ ├── script_1.py # Utility script 1 - │ ├── script_2.py # Utility script 2 - │ └── ci_scripts.py # Script to run all utility scripts - ├── tests/ # Directory for unit tests - │ ├── __init__.py # Initialize test package - │ └── test_example.py # Example test file - ├── CHANGELOG.md # Changelog for tracking changes - ├── README.md # Main documentation file - ├── setup.py # Installation and package metadata - ├── code_pydocstyle.py # Configuration script for Pydocstyle - ├── code_pylint.py # Configuration script for Pylint - ├── coverage.py # Coverage configuration script - ├── requirements.txt # Python dependencies for the package - ├── .gitlab/ # GitLab configuration files and templates - │ ├── issue_template.md # Template for submitting issues - │ └── merge_request_template.md # Template for merge requests - ├── .gitlab-ci.yml # GitLab CI/CD pipeline configuration - ├── .coveragerc # Coverage configuration file - ├── .gitignore # Git ignore rules - ├── .isort.cfg # Configuration for isort - ├── .pre-commit-config.yaml # Pre-commit hooks configuration - └── .pylintrc # Pylint configuration file +MyPackage/ +├── my_package/ # Main source code directory +│ ├── __init__.py # Initialize your package +│ ├── module_1.py # Example module 1 +│ └── module_2.py # Example module 2 +├── scripts/ # Directory for utility scripts related to the package +│ ├── script_1.py # Utility script 1 +│ ├── script_2.py # Utility script 2 +├── tests/ # Directory for unit tests +│ ├── __init__.py # Initialize test package +│ └── test_example.py # Example test file +├── CHANGELOG.md # Changelog for tracking changes +├── README.md # Main documentation file +├── setup.py # Installation and package metadata +├── pyproject.toml # Configuration file defining project metadata, dependencies, and tool-specific settings +├── test.py # Test script for running unittests and scripts with coverage +├── .gitlab/ # GitLab configuration files and templates +│ ├── issue_template.md # Template for submitting issues +│ └── merge_request_template.md # Template for merge requests +├── .gitlab-ci.yml # GitLab CI/CD pipeline configuration +├── .gitignore # Git ignore rules +└── .pre-commit-config.yaml # Pre-commit hooks configuration ``` @@ -181,9 +184,6 @@ Here's an overview of the directory structure provided by this template: - Git Push Failures: Ensure you have push access to the remote repository. If you encounter authentication issues, check your Git credentials and SSH keys. - - Excel File Issues: - If you encounter problems reading the Excel file, ensure it's properly formatted and saved as .xlsx. - - Package Name Conflicts: Be sure that the chosen package name does not already exist in your organization or on PyPI. So, consider choosing a different name to avoid conflicts. diff --git a/methods/methods_get_parameters_from_excel.py b/methods/methods_get_parameters_from_excel.py deleted file mode 100644 index 3f0ee98..0000000 --- a/methods/methods_get_parameters_from_excel.py +++ /dev/null @@ -1,90 +0,0 @@ -"""Functions to get parameters from an Excel file.""" - -import pandas as pd - -from .methods_check_inputs import ( - check_pypi_package_name, - validate_email, - validate_package_name, - validate_python_version, - validate_required_packages, - validate_url, -) - - -def get_parameters_from_excel(excel_file: str) -> dict: - """Get the parameters from an Excel file.""" - # Read the Excel file - df = pd.read_excel(excel_file) - df = df.fillna("") - - parameters = {} - - # %% Package name - - package_name = df["Package name *"][0] - validate_package_name(package_name) - check_pypi_package_name(package_name) - project_package_name = "".join(x.title() for x in package_name.split("_")) - - parameters["package_name"] = package_name - parameters["project_package_name"] = project_package_name - - # %% Package URL - - remote_url = df["Package URL"][0] - if remote_url: - validate_url(remote_url) - parameters["remote_url"] = remote_url - - # %% Short description - - description = df["Short description"][0] - if not description: - description = "A Specific package for a technological issue." - parameters["description"] = description - - # %% Long description - - long_description = df["Long description"][0] - if not long_description: - long_description = ( - "A Python package using DessiA SDK and DessiA coding guidelines (https://documentation.dessia.io)" - ) - parameters["long_description"] = long_description - - # %% Python version - - version = df["Python version"][0] - if not version: - version = ">=3.9" - else: - validate_python_version(version) - parameters["version"] = version - - # %% Author - - author = df["Author"][0] - if not author: - author = "Operations-Team" - parameters["author"] = author - - # %% E-mail - - contact = df["E-mail"][0] - if not contact: - contact = "support@dessia.io" - else: - validate_email(contact) - parameters["contact"] = contact - - # %% Required packages - - required_packages = df["Required packages"][0].replace("\n", "") - if not required_packages: - required_packages = ["dessia_common>=0.18.0, plot_data>=0.26.0"] - else: - validate_required_packages(required_packages) - parameters["required_packages"] = required_packages - - return parameters diff --git a/requirements.txt b/requirements.txt index f3c7ddf..c2c9ca4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -pandas>=2.1.1 +configparser requests From 4217047445d5941a4a2f32cb852a348bcd13af00 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 11:21:01 +0200 Subject: [PATCH 45/49] Add: CHANGELOG.md --- CHANGELOG.md | 40 ++++++++++++++++++++++++++++++++++++++++ README.md | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..0ea7dc8 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,40 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [v2.0.0-rc.1] - Unreleased + +### New Features + +### Fixes + +### Updates + +### Refactorings + +### Performance improvements & Optimization + +### Untittests + +### CI + + +## [v1.0.0] - 02/10/2023 + +### Updates + +- ‎Update README.md + +## [v0.1.0] - 07/01/2021 + +### New Features + +- Add quickstart.py + + +## [v0.0.1] - 22/10/2020 (Initialization) + + diff --git a/README.md b/README.md index da60c7c..275c9c7 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,7 @@ MyPackage/ ├── CHANGELOG.md # Changelog for tracking changes ├── README.md # Main documentation file ├── setup.py # Installation and package metadata -├── pyproject.toml # Configuration file defining project metadata, dependencies, and tool-specific settings +├── pyproject.toml # Configuration file defining project metadata, dependencies, and tool-specific settings ├── test.py # Test script for running unittests and scripts with coverage ├── .gitlab/ # GitLab configuration files and templates │ ├── issue_template.md # Template for submitting issues From 2129f4ae872e6dfd956c8ceb0440fc81bcf5f696 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 15:32:23 +0200 Subject: [PATCH 46/49] Update: CHANGELOG.md Template --- package_folder/CHANGELOG.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/package_folder/CHANGELOG.md b/package_folder/CHANGELOG.md index 8c8e677..6249e21 100644 --- a/package_folder/CHANGELOG.md +++ b/package_folder/CHANGELOG.md @@ -8,19 +8,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [v0.1.0] - Unreleased -### New Features +### Added -### Fixes +- For new features or enhancements introduced in the release. -### Updates +### Changed -### Refactorings +- For modifications to existing functionality. -### Performance improvements & Optimization +### Deprecated -### Untittests +- To indicate features that are being phased out and may be removed in future releases. -### CI +### Removed + +- For features or files that have been eliminated from the project. + +### Fixed + +- To document bug fixes and corrections made in the release. + +### Security + +- For updates that address security vulnerabilities. + +### Performance + +- To highlight improvements in performance metrics or efficiency. + +### Other + + - For miscellaneous changes that don’t fit into the above categories, such as documentation updates or minor tweaks. ## [v0.0.1] - {{DATE}} From a8d7f8a0ae3c4394f42c6a617444a0ab2a17b6a1 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 15:34:42 +0200 Subject: [PATCH 47/49] Update: Changelog --- CHANGELOG.md | 37 +++++++++++++++++++++++++++---------- package_folder/CHANGELOG.md | 2 +- 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ea7dc8..ca961a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,32 +5,49 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [v2.0.0-rc.1] - Unreleased -### New Features +## [v2.0.0-rc.1] - 11/10/2024 -### Fixes +### Added -### Updates +- `template_inputs.ini` file for configuring new package inputs +- `create_package.py` script to generate new Python packages from a template directory +- `pyproject.toml` file for project metadata, dependencies, and tool-specific settings +- New directory structure: + - `my_package/`: Main source code directory + - `scripts/`: Directory for utility scripts + - `tests/`: Directory for unit tests + - `CHANGELOG.md` File for tracking changes + - `README.md`: Main documentation file + - `setup.py`: Installation and package metadata + - `pyproject.toml`: Configuration file defining project metadata, dependencies, and tool-specific settings + - `test.py`: Script for running unittests and scripts with coverage + - `.gitlab/`: GitLab configuration files and templates + - `.gitlab-ci.yml`: File for GitLab CI/CD pipeline configuration + - `.gitignore`: File for Git ignore rules + - `.pre-commit-config.yaml`: File for pre-commit hooks configuration +- New tools for code quality checking and improving -### Refactorings +### Changed -### Performance improvements & Optimization +- Updated `README.md` with new project information and structure +- Reorganized project structure for better maintainability -### Untittests +### Removed -### CI +- Delete unused files that are no longer needed for the project: + - pep8, .pylintrc, ci_tests.py, coverage.py, python.gitignore, quickstart.py, setup_template.py, templates.py ## [v1.0.0] - 02/10/2023 -### Updates +### Changed - ‎Update README.md ## [v0.1.0] - 07/01/2021 -### New Features +### Added - Add quickstart.py diff --git a/package_folder/CHANGELOG.md b/package_folder/CHANGELOG.md index 6249e21..3071e24 100644 --- a/package_folder/CHANGELOG.md +++ b/package_folder/CHANGELOG.md @@ -38,7 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Other - - For miscellaneous changes that don’t fit into the above categories, such as documentation updates or minor tweaks. +- For miscellaneous changes that don’t fit into the above categories, such as documentation updates or minor tweaks. ## [v0.0.1] - {{DATE}} From 8dd8ba0ba0bb398c8f1d93e01209b38e74fd2a89 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 15:39:20 +0200 Subject: [PATCH 48/49] Ruff: Format --- methods/methods_check_inputs.py | 7 ++++--- methods/methods_get_parameters_from_ini_file.py | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/methods/methods_check_inputs.py b/methods/methods_check_inputs.py index 4586bad..e8a15c1 100644 --- a/methods/methods_check_inputs.py +++ b/methods/methods_check_inputs.py @@ -40,19 +40,20 @@ def validate_url(url: str) -> None: # raise ValueError(f"\nAre you sure about your 'Package URL' = {url} ? " +\ # "The package must be sorted in Dessia Organization (as: gitlab.com/dessia/XX)") - if not ('gitlab' in url.lower() or 'github' in url.lower()): + if not ("gitlab" in url.lower() or "github" in url.lower()): raise ValueError( f"\nAre you sure about your 'Package URL' = {url} ? It is not a Git URL\n" + "If you do not need to use Git, leave an empty cell." ) + def transform_url(url: str) -> str: """Transform the given URL to be used for Gitlab pusing.""" # Remove 'www.' if present - url = url.replace('www.', '', 1) + url = url.replace("www.", "", 1) # Replace the first '/' with ':' - return url.replace('/', ':', 1) + return url.replace("/", ":", 1) def validate_python_version(version: str) -> None: diff --git a/methods/methods_get_parameters_from_ini_file.py b/methods/methods_get_parameters_from_ini_file.py index bc49474..16ef571 100644 --- a/methods/methods_get_parameters_from_ini_file.py +++ b/methods/methods_get_parameters_from_ini_file.py @@ -9,9 +9,10 @@ validate_python_version, validate_required_packages, validate_url, - transform_url + transform_url, ) + def read_config_to_dict(file_path: str) -> dict: config = configparser.ConfigParser() config.read(file_path) @@ -19,7 +20,7 @@ def read_config_to_dict(file_path: str) -> dict: config_dict = {} for section in config.sections(): - if section !="DOCUMENTATION": + if section != "DOCUMENTATION": for key, value in config[section].items(): config_dict[key] = value.strip() From 5e0e74ffb40a261c4aba4e3f08ab9aae967d8428 Mon Sep 17 00:00:00 2001 From: Soumiya Bendjebla Date: Fri, 11 Oct 2024 15:44:18 +0200 Subject: [PATCH 49/49] Ruff: Lint --- methods/methods_get_parameters_from_ini_file.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/methods/methods_get_parameters_from_ini_file.py b/methods/methods_get_parameters_from_ini_file.py index 16ef571..770eeb5 100644 --- a/methods/methods_get_parameters_from_ini_file.py +++ b/methods/methods_get_parameters_from_ini_file.py @@ -4,16 +4,17 @@ from .methods_check_inputs import ( check_pypi_package_name, + transform_url, validate_email, validate_package_name, validate_python_version, validate_required_packages, validate_url, - transform_url, ) def read_config_to_dict(file_path: str) -> dict: + """"Read a configuration file and returns its contents as a dictionary, excluding the 'DOCUMENTATION' section.""" config = configparser.ConfigParser() config.read(file_path) @@ -29,7 +30,6 @@ def read_config_to_dict(file_path: str) -> dict: def get_parameters_from_ini_file(ini_file: str) -> dict: """Get the parameters from an ini file.""" - parameters = read_config_to_dict(ini_file) # %% Package name