From 7882fe6a19bae7bde7485182df0f6f69b52dceb2 Mon Sep 17 00:00:00 2001 From: Siddartha Reddy Date: Sun, 18 Feb 2024 16:30:39 -0800 Subject: [PATCH] * --- Makefile | 22 +++++++--- ci_requirements.txt | 2 +- reports/ENTITY_1_REPORT.xlsx | Bin 6806 -> 6806 bytes reports/ENTITY_2_REPORT.xlsx | Bin 7661 -> 7658 bytes reports/NEW_TABLE_REPORT.xlsx | Bin 6729 -> 6729 bytes requirements.txt | 79 ++++++++++++++++------------------ setup.cfg | 2 +- 7 files changed, 54 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 4fa3d2e..b55fc7c 100644 --- a/Makefile +++ b/Makefile @@ -44,13 +44,16 @@ reinstall: upgrade: { . venv/bin/activate || venv/Scripts/activate.bat ; } && \ daves-dev-tools requirements freeze\ - -nv '*' . pyproject.toml tox.ini ci_requirements.txt\ + -nv '*' . pyproject.toml tox.ini ci_requirements.txt dev_requirements.txt test_requirements.txt daves-dev-tools \ > .requirements.txt && \ - pip3 install --upgrade --upgrade-strategy eager\ - -r .requirements.txt -e . && \ + pip install --upgrade --upgrade-strategy eager\ + -r .requirements.txt && \ rm .requirements.txt && \ - make requirements && \ - echo "Upgrade completed successfully!" + make requirements + +distribute: + { . venv/bin/activate || venv/Scripts/activate.bat ; } && \ + daves-dev-tools distribute --skip-existing clean: { . venv/bin/activate || venv/Scripts/activate.bat ; } && \ @@ -65,8 +68,13 @@ clean: requirements: { . venv/bin/activate || venv/Scripts/activate.bat ; } && \ - daves-dev-tools requirements update -nv flake8 && \ - echo "Requirements updated successfully!" + daves-dev-tools requirements update\ + -i more-itertools -aen all\ + setup.cfg pyproject.toml tox.ini && \ + daves-dev-tools requirements freeze\ + -nv setuptools -nv filelock -nv platformdirs\ + . pyproject.toml tox.ini daves-dev-tools\ + > requirements.txt test: { . venv/bin/activate || venv/Scripts/activate.bat ; } && \ diff --git a/ci_requirements.txt b/ci_requirements.txt index 82a46f5..d6960f2 100644 --- a/ci_requirements.txt +++ b/ci_requirements.txt @@ -1 +1 @@ -daves-dev-tools~=2.21 +daves-dev-tools diff --git a/reports/ENTITY_1_REPORT.xlsx b/reports/ENTITY_1_REPORT.xlsx index 7e226d29f5781c4faea8e549e205308d67d58645..58e678ba7dcd2913decee46d88856ba645f4de08 100644 GIT binary patch delta 423 zcmbPcI?a?jz?+#xgn@y9gW=Rf?)4m}nu8(=c~)$kcu1>$l9I|I9r0yz9h{PcI-;jk zM7vye>kQnzeYtKldz19>AOHW{44cw>sf=@ekhtN*<9no>E~jNa-en==$~ob!VDrhV z9$S)kybm%kvAfK;Xyf~54GI#wTN_g5C^App(9^xqLVIrPl#j}$n-4@DU}N4kr7>J) zolYXx&+~1TktY;?x7NSILN+!h|7lQ|^JfkF-v n4nVR|!WBp!2a~*#Aa<~%6_D(cv;c`q+5kxwDR&_0Bjp7EovyKy delta 423 zcmbPcI?a?jz?+#xgn@y9gJIf4?)4ngnu8)VVpU&EJfu}WE0kl=8gT*j2@__pJQB0K z7j|(=VA7R$Z#_?6YkY9b@SlDCHqqX=MEMt*U*<8Hi-a%E-o4^N{wC(l;S7TOPkeNQ zE-o#&&Yo^zdsuGI!Sc=O6P#iimCdegX!M-%`{<0hQ^drV{^xkBvw`Evq{V&8Q(QU4 zr)lo^k$!lN&J&5*ty1-E3ni`@PdC$g`1Rw%$~e3HT_=_~pUTP&OjI~ryJC6wpTZo| z8tqq?->hf489Hmhj~AJf=T4sf_3hnncB_|82-Qo8yO+}%@F^g^}LF4ha~x@Wfg znf$TM3$A^5egBm|lE;C5o*6SoS%8g!VU9WjgD@~SDsuEUzhcy4W1Kd*Q9^jL21h9i z diff --git a/reports/ENTITY_2_REPORT.xlsx b/reports/ENTITY_2_REPORT.xlsx index bc5ab40774ac497de47149aa620463763f0a2067..6babc19a207f933fb8042a4c56e276e891deb187 100644 GIT binary patch delta 614 zcmaEB{mPmWH3F5$$r>tut`<_T{?K>`l_g zfBgS*Gi*xlr83U>LE?rJkMEIkx}28zc$bBcE9Zo_g3TwddTdGF@jl4F#O^ZVqWX>R zpEW2*>~3vHnWM-&c|%Y4Mhoq^u~R-On{GZ3d4P?1+myy|nRPmeTtCmZSw@~v{N4KM z_r6!JXG)tt`ta+=2OItPUuKgtb;Y7AwR4@EV=rBH{b*vswNLbF<+pIgyIFG-UWydP z#!Q<2t8Vjcu_%MWV57iKyJeF%r3HQ1e)8*Lng3cmb3a%A=YQ3l;z&u` za>7G*a)PuOP;9!iEaS<^TcwqN>>EHf*W_=~>Oi(2zc4p2;K87wk$JL>jJiBXZ}q>p zX@`KZ@{O5+K?0@#NH;WYo7^M=(z!}TmT}$W6EZSZAobhbUw0h<%8M~EFu)B2sb{nm zV_=9cO3f+O*8`CO-i%Bl%+Pc&Sx#1#QEjq~tQ^q5XjxgNgA$V;NXTfTC<2;(`}eti c6`*TgvM?|R15Jg22F9(E56Y^saY=(j0Lh2meE*b^00)6HBBfTH|@V*TX& zqEx+#+?=TsefeeUf9~70ZCWh-M>6-t#lLj z@gKE+ZiFr2bNbz(f04cCN>UW>wqnm08`7#5DKJdBw>VT&p3}T7T7K=KkCNpAQ|j$j z$U2?;$s3`PDxx`~B{HJt%@UKUz_#-@&N3}#wBGVU!*QZ`K_cg3-+Hq%C!P3K#;(}+ z{`0^B$4Z;YgLpGz<|qrWF)++gXJ8Np1~&{eFrJybNm@w(q~>_d?kR_XYBm}( zFi5}@0O^KCUXIBPGNO|?Wdwm1NXy7FvGIci{J{c=GO~<2C)dlU10|Qs$l7cKT2PUr zUtCg|lUfXl$^dUhCJ|<60svaH-Tigf0ieNRObiU%$QCg=Op=uXnqnv}JXueci&1m3 qrK}u~A0aEtbVOqET?rXp6tgBT07~qToP1GIbn+Eh0XAM~kZAzQn%m$2 diff --git a/reports/NEW_TABLE_REPORT.xlsx b/reports/NEW_TABLE_REPORT.xlsx index 8934123df4e6d72b6649b4c6fe93f7c223575839..4193d3a6dad9aa9a2e23e230acfcb716cbae2485 100644 GIT binary patch delta 422 zcmX?Ua?*r5z?+#xgn@y9gW=Rf?)4m}nu8(=c~)$kcu1>$l9I|I9r0yz9h{PcI-;jk zM7vye>kQnzeYtKldz19>AOHW{44cw>sf=@ekhtN*<9no>E~jNa-en==$~ob!VDrhV z9$S)kybm%kvAfK;Xyf~54GI#wTN_g5C^App(9^xqLVIrPl#j}$n-4@DU}N4kr7>J) zolYXx&+~1TktY;?x7NSH9QZVM03$-BkPfkL0f m9e|{Xge#D&0+R>8B%7oaP{dKv0wgYJ10=Ugx&z7ol3oD71F)(9 delta 422 zcmX?Ua?*r5z?+#xgn@y9gJIf4?)4ngnu8)VVpU&EJfu}WE0kl=8gT*j2@__pJQB0K z7j|(=VA7R$Z#_?6YkY9b@SlDCHqqX=MEMt*U*<8Hi-a%E-o4^N{wC(l;S7TOPkeNQ zE-o#&&Yo^zdsuGI!Sc=O6P#iimCdegX!M-%`{<0hQ^drV{^xkBvw`Evq{V&8Q(QU4 zr)lo^k$!lN&J&5*ty1-E3ni`@PdC$g`1Rw%$~e3HT_=_~pUTP&OjI~ryJC6wpTZo| z8tqq?->hf489Hmhj~AJf=T4sf_3hnncB_|82-Qo8yO+}%@F^g^}LF4ha~x@Wfg znf$TM3$A^5egBm|lE;C5o*6SoS%8g!VU9WjgD@~SDsuEUzhcy4W1O~Gl;agM0p!j5M(a%7RyjU2BQzmW;56{WF#m#|2 opT!-3q=|$pkgNie2f!qoq!m!aQPKh=E@=ZKw@bPM$^VjG00VZiSpWb4 diff --git a/requirements.txt b/requirements.txt index 6d12d9e..83cc3b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,67 +1,62 @@ -black==23.9.1 -boto3==1.28.55 -botocore==1.31.55 -cachetools==5.3.1 -certifi==2023.7.22 +black==24.2.0 +cachetools==5.3.2 +certifi==2024.2.2 chardet==5.2.0 -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 click==8.1.7 colorama==0.4.6 -Cython==3.0.2 -daves-dev-tools==2.0.9 -distlib==0.3.7 +Cython==3.0.8 +daves-dev-tools==2.1.0 +distlib==0.3.8 docutils==0.20.1 et-xmlfile==1.1.0 -exceptiongroup==1.1.3 -filelock==3.12.4 -flake8==6.1.0 -idna==3.4 +exceptiongroup==1.2.0 +filelock +flake8==7.0.0 +idna==3.6 importlib-metadata importlib-resources iniconfig==2.0.0 -iso8601==2.0.0 -jaraco.classes==3.3.0 -jmespath==1.0.1 +iso8601==2.1.0 +isort==5.13.2 +jaraco.classes==3.3.1 jsonpointer==2.4 -keyring==24.2.0 +keyring==24.3.0 markdown-it-py==3.0.0 -marko==2.0.0 +marko==2.0.2 mccabe==0.7.0 mdurl==0.1.2 -more-itertools==9.1.0 +more-itertools==10.2.0 mypy-extensions==1.0.0 -mypy==1.5.1 -nh3==0.2.14 -oapi==1.61.0 +mypy==1.8.0 +nh3==0.2.15 +oapi==1.62.3 openpyxl==3.1.2 -packaging==23.1 -pathspec==0.11.2 -pip==23.2.1 +packaging==23.2 +pathspec==0.12.1 +pip==24.0 pkginfo==1.9.6 -platformdirs==3.10.0 -pluggy==1.3.0 -pycodestyle==2.11.0 -pyflakes==3.1.0 -Pygments==2.16.1 +platformdirs +pluggy==1.4.0 +pycodestyle==2.11.1 +pyflakes==3.2.0 +pygments==2.17.2 pyproject-api==1.6.1 -pytest==7.4.2 -python-dateutil==2.8.2 +pytest==8.0.1 PyYAML==6.0.1 readme-renderer==42.0 requests-toolbelt==1.0.0 requests==2.31.0 rfc3986==2.0.0 -rich==13.5.3 -s3transfer==0.7.0 -setuptools==68.2.2 -six==1.16.0 +rich==13.7.0 +setuptools sob==1.50.7 tomli-w==1.0.0 tomli==2.0.1 -tox==4.11.3 -twine==4.0.2 -typing-extensions==4.8.0 -urllib3==1.26.16 -virtualenv==20.24.5 -wheel==0.41.2 +tox==4.13.0 +twine==5.0.0 +typing-extensions==4.9.0 +urllib3==2.2.0 +virtualenv==20.25.0 +wheel==0.42.0 zipp==3.17.0 diff --git a/setup.cfg b/setup.cfg index 8295901..a6e1ea8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -14,7 +14,7 @@ packages = attribute_name_validator install_requires = dataclasses~=0.8; python_version <= "3.6" - oapi~=1.61 + oapi~=1.62 openpyxl~=3.1 [options.entry_points]