New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add pre-commit and edits made by pre-commit #66

Closed

cadenmyers13 wants to merge 22 commits into diffpy:main from cadenmyers13:precommit

Contributor

cadenmyers13 commented May 24, 2024 •

edited

Loading

Addition of necessary pre-commit files + edits made by running pre-commit locally.

sbillinge and others added 10 commits

May 24, 2024 08:17


          global config file present passing tests


          local config file present passing tests

4530a2a


          empty flow working and no config working

cacac4d


          news

5617af0


          add pre-commit.yml to workflows

5635fea


          add file .pre-commit-config.yaml

26a4699


          add prevent_commit_to_main.sh

7a9b974


          edits made by running pre-commit

c04f38d


          remove argparse from requirements and fix config_bool not found bug

87d8810


          Merge pull request diffpy#65 from sbillinge/users

e07d698

users

Contributor

sbillinge commented May 24, 2024 via email

Please see comments in the same PR in pdfmorph.

On Fri, May 24, 2024 at 2:11 PM Caden Myers ***@***.***> wrote: Addition of necessary pre-commit files + edits made by running pre-commit locally. flake8 still failing. ------------------------------ You can view, comment on, or merge this pull request online at: #66 Commit Summary - 5635fea <5635fea> add pre-commit.yml to workflows - 26a4699 <26a4699> add file .pre-commit-config.yaml - 7a9b974 <7a9b974> add prevent_commit_to_main.sh - c04f38d <c04f38d> edits made by running pre-commit File Changes (42 files <https://github.com/diffpy/diffpy.utils/pull/66/files>) - *M* .coveragerc <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-834e9b406d74791ffbafaeec9cc894082cea9739bc347b6ff9f72312c92ebc79> (1) - *M* .github/workflows/docs.yml <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-9cf2000c53760d837a449f874e53f792819108d3a4bf346336d0f7d082deae2c> (2) - *M* .github/workflows/main.yml <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-7829468e86c1cc5d5133195b5cb48e1ff6c75e3e9203777f6b2e379d9e4882b3> (1) - *A* .github/workflows/pre-commit.yml <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-ac5eead3f3ce4863c524fff031a87b7aecccb4a0493df087a4e1c704a1505036> (21) - *A* .pre-commit-config.yaml <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-63a9c44a44acf85fea213a857769990937107cf072831e1a26808cfde9d096b9> (33) - *M* AUTHORS.txt <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-b897336dda0579c40f3623b68eb6652ded79e206f4cf1af7ceb24b683fd46ff1> (1) - *M* conda-recipe/run_test.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-dffc62c59f2c466d7cf6d44bcaf0c088ed7232bb957d7c08334cd94ed91e228d> (4) - *M* devutils/makesdist <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-d8609f949cbaf823001857edfebddbc8eb52decce42bb91a746ee4c6e3c93a78> (38) - *M* doc/manual/source/conf.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-1678d34d5b209d435ef1cfbabc6f9f7ad01377a0bdb22edbf0f7bca868c009a4> (161) - *A* prevent_commit_to_main.sh <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-3800c4a125606bd760dbffeb70355406a35ce6d1f8cee4ecbb56ccfcd0273755> (9) - *M* pytest.ini <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-fb6a686182f16eb54af3c628f38593f347f68aba31de903983023c560288d7a1> (2) - *M* requirements/build.txt <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-847e6ac28941c0ea6185ce0fc0edf1d760bbb32511d029667c85f55f671299f5> (2) - *M* run_tests.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-5d20bf301d1d889d7ec73948673520e35c59a2f06b78ea646f0d7f0348ff6669> (7) - *M* src/diffpy/__init__.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-e549b663fbc85333d3a5dca7e97f6a8afdea1e6ffd31724d37775e9f40509a54> (1) - *M* src/diffpy/utils/parsers/__init__.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-d2754c530070a1f60d671d9ce1ed3d5e111c737aa347fc365d0360d99cc32390> (4) - *M* src/diffpy/utils/parsers/custom_exceptions.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-6fab3347e7b40d9f1e800b6c3ff15926bfe6f1a7c2d9c118a9d824d03961b5b7> (1) - *M* src/diffpy/utils/parsers/loaddata.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-da29364e6e9b0d40e401d8d7c1f3bd5762b395e7fb4f459772a3091c36c6cc4b> (63) - *M* src/diffpy/utils/parsers/resample.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-53462c253fcc4b9a006291e19f85d7930fbbec9e7ba53911b2e342ad6f7e3351> (26) - *M* src/diffpy/utils/parsers/serialization.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-6b2a698ca6ea650c9efb51002ebd4df47a3aa01b69daaa375a2411610f34540c> (63) - *M* src/diffpy/utils/scattering_objects/diffraction_objects.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-b1f5ffc83a489c8c3babacdc2bfb98f8650ff9753c7f2e3260e16370231ad146> (212) - *M* src/diffpy/utils/scattering_objects/tools.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-2b1786e2158c65cd32a58aba08712f3fcc4bc18c37b43e1481027c747428751c> (7) - *M* src/diffpy/utils/scattering_objects/user_config.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-2da744072cdb20f00c873eb4f276bb369d72fc84f4b12e7ce6735fa12d52a089> (12) - *M* src/diffpy/utils/tests/__init__.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-61a58ad884ef27d8d39bcf10513df09a480ef653caed14e0a04ac67916d823a8> (23) - *M* src/diffpy/utils/tests/debug.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-0c6c56f9913642da5d780aa22de7917bc8d16419c7752335dc44a2b0cd2d26c5> (6) - *M* src/diffpy/utils/tests/run.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-585eed4da736d1cad44b5b59d65439e0abd9a5a24d35a1bb7d103ab09ebed0ee> (8) - *M* src/diffpy/utils/tests/test_diffraction_objects.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-28ad84d86ea782984eaed736452328e0ec6605604be53ba94951b80e3e1a8b4e> (261) - *M* src/diffpy/utils/tests/test_loaddata.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-5c980860c7c443ee2a745a11bde2cc61c98156dd87edf134643849cfc4701c34> (33) - *M* src/diffpy/utils/tests/test_resample.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-a007bdbb169a11830aedd4c9f2b058844918d5fa996c8515d118f5ae639ca83b> (12) - *M* src/diffpy/utils/tests/test_serialization.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-c6cac047c9c4ce9eedf1e9007295e1ee5e7546bbd7427b6bfec83f9ac18e876a> (110) - *M* src/diffpy/utils/tests/test_tools.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-bd1c4a2978caeb9f8e4ac0fbe48bf729269f39563509a96d9f91690d12687064> (102) - *M* src/diffpy/utils/tests/testdata/dbload/e1.gr <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-aa34e6196b03b58201bca7240c00028877da6c9d9b0fa37147445ed998eb3575> (2) - *M* src/diffpy/utils/tests/testdata/dbload/e2.gr <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-68642e3776ee99c15080ef13265eec1504a4335c3932a39fac3e317c227f0a37> (2) - *M* src/diffpy/utils/tests/testdata/dbload/e3.gr <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-950658e7c23d0ee787dcd324047e4814c53cb7a037e2438be63a254936da4b2a> (2) - *M* src/diffpy/utils/tests/testdata/generated_db.json <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-c7f6d763c847fc7961b2b9d1ce39beb7edda4a2eac8dbc8c32dfd5fb0a026740> (2) - *M* src/diffpy/utils/tests/testdata/loaddatawithheaders.txt <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-6ab73046087e774c2ce1d8dddf7bd64ae02e9528c829bd22acb15a44cd7ab6b7> (2) - *M* src/diffpy/utils/tests/testdata/loadfile.txt <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-65d2acaccc2f5c7566858f87b985e80124ed9450c63ddaaa28d7613af9d6c459> (2) - *M* src/diffpy/utils/tests/testdata/strumining.json <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-961acd2489e6413cdedfb4187bf53197abb44489334dfb0ee8eaffe149c1eb09> (2) - *M* src/diffpy/utils/tests/testdata/targetjson.json <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-7433a6d1ecad1b280e4b75862387c67a5d510a37aecc2da346a8326204fb66da> (2) - *M* src/diffpy/utils/tests/testdata/wrong.type <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-abc23bb89be1f0bb781d8e456ed35987b3881aa8577d70746572c1449e6f1253> (2) - *M* src/diffpy/utils/tests/testhelpers.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-1717868745d774398ab3fcdcc507d53c3292bd54575e54a1c1ee5ce7a3637bc5> (5) - *M* src/diffpy/utils/version.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-405bf71c083fd76d525afff869869264b93287ec461e0056eea17a3a805759c6> (30) - *M* src/diffpy/utils/wx/gridutils.py <https://github.com/diffpy/diffpy.utils/pull/66/files#diff-22e010610871d2089c6c8a2f651cf9da6cd33de8cb3fa219029b618aa3d2fc25> (29) Patch Links: - https://github.com/diffpy/diffpy.utils/pull/66.patch - https://github.com/diffpy/diffpy.utils/pull/66.diff — Reply to this email directly, view it on GitHub <#66>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABAOWUKYZ7WD4WNSMTMO7QDZD57BPAVCNFSM6AAAAABIIAOXKGVHI2DSMVQWIX3LMV43ASLTON2WKOZSGMYTKOJXGEZTCNA> . You are receiving this because you are subscribed to this thread.Message ID: ***@***.***>

-- Simon Billinge Professor, Department of Applied Physics and Applied Mathematics Columbia University

yucongalicechen and others added 12 commits

May 24, 2024 18:52


          added docstrings

97a3cfe


          Merge pull request diffpy#67 from yucongalicechen/user2

67196a5

added docstrings for user config


          black

f07ef30


          black on tests

7961c6c


          pyproject.toml black config

a04e744


          Merge pull request diffpy#72 from sbillinge/black

0e61164

black


          add .flake8 file

90681da


          add pre-commit.yml file

ac57b67


          add .pre-commit-config.yaml file

80680ae


          add .isort.cfg file

d36f050


          add prevent_commit_to_main.sh file

e59d0e9


          Merge remote-tracking branch 'origin/precommit' into precommit

29c569e

cadenmyers13 closed this

cadenmyers13 deleted the precommit branch

May 31, 2024 14:57

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet