From 2966a4748f3e79f7c6d045b0ef9de485fd64d3bc Mon Sep 17 00:00:00 2001 From: "Alan D. Tse" Date: Wed, 25 Mar 2020 23:16:33 -0700 Subject: [PATCH] build: streamline tox --- Makefile | 4 +- Pipfile | 1 + Pipfile.lock | 117 +++++++++++++++++++++++++++++++++++---------------- tox.ini | 9 ++-- 4 files changed, 88 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index 5ea994c6..d68ac9cc 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ black: pipenv run black teslajsonpy coverage: - pipenv run pytest -s --verbose --cov-report term-missing --cov-report xml --cov=teslajsonpy tests + pipenv run pytest -s --verbose --cov-report term-missing --cov-report xml --cov=teslajsonpy tests -Wi -Wd:::teslajsonpy clean: rm -rf dist/ build/ .egg teslajsonpy.egg-info/ init: @@ -22,6 +22,6 @@ publish: pipenv run twine upload dist/* rm -rf dist/ build/ .egg teslajsonpy.egg-info/ test: - pipenv run pytest + pipenv run pytest -s --verbose tests -Wi -Wd:::teslajsonpy typing: pipenv run mypy --ignore-missing-imports teslajsonpy diff --git a/Pipfile b/Pipfile index 1e25035d..91aebdd8 100644 --- a/Pipfile +++ b/Pipfile @@ -12,6 +12,7 @@ pytest = "*" pytest-asyncio = "*" pytest-cov = "*" tox = "*" +tox-pipenv = "*" twine = "*" python-semantic-release = "*" black = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 3c80057c..9a51a3c1 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "56fd0cfd6dd3899803ad48904a136010a6bdde1495c8b2cbee1e70f4d8ac06bc" + "sha256": "e022edf852b990e165cc4ca688dbf2f2cafc8a7e29890f69bd7d7b7ee45a1a9a" }, "pipfile-spec": 6, "requires": {}, @@ -94,9 +94,9 @@ }, "wrapt": { "hashes": [ - "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" + "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" ], - "version": "==1.11.2" + "version": "==1.12.1" }, "yarl": { "hashes": [ @@ -152,10 +152,10 @@ }, "bleach": { "hashes": [ - "sha256:2ffa40dfa80b141ff58eee538bce0d2a09c7d456018d00f7a2cb0ebf967c524d", - "sha256:f0b1ee0315062e60afa6b7cc39b1c3718b591e1d552a8841044dc49a68465659" + "sha256:53165a6596e7899c4338d847315fec508110a53bd6fd15c127c2e0d0860264e3", + "sha256:f8dfd8a7e26443e986c4e44df31870da8e906ea61096af06ba5d5cc2d519842a" ], - "version": "==3.1.2" + "version": "==3.1.3" }, "certifi": { "hashes": [ @@ -180,10 +180,10 @@ }, "colorama": { "hashes": [ - "sha256:05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d", - "sha256:f8ac84de7840f5b9c4e3347b3c1eaa50f7e49c2b07596221daec5edaabbd7c48" + "sha256:7d73d2a99753107a36ac6b455ee49046802e59d9d076ef8e47b61499fa29afff", + "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1" ], - "version": "==0.4.1" + "version": "==0.4.3" }, "coverage": { "hashes": [ @@ -324,6 +324,14 @@ ], "version": "==2.9" }, + "importlib-metadata": { + "hashes": [ + "sha256:298a914c82144c6b3b06c568a8973b89ad2176685f43cd1ea9ba968307300fa9", + "sha256:dfc83688553a91a786c6c91eeb5f3b1d31f24d71877bbd94ecbf5484e57690a2" + ], + "markers": "python_version < '3.8'", + "version": "==1.5.2" + }, "invoke": { "hashes": [ "sha256:11c0f24253932839307c26c196312238627479e07d4561f773261a445dd650b9", @@ -387,22 +395,22 @@ }, "mypy": { "hashes": [ - "sha256:0a9a45157e532da06fe56adcfef8a74629566b607fa2c1ac0122d1ff995c748a", - "sha256:2c35cae79ceb20d47facfad51f952df16c2ae9f45db6cb38405a3da1cf8fc0a7", - "sha256:4b9365ade157794cef9685791032521233729cb00ce76b0ddc78749abea463d2", - "sha256:53ea810ae3f83f9c9b452582261ea859828a9ed666f2e1ca840300b69322c474", - "sha256:634aef60b4ff0f650d3e59d4374626ca6153fcaff96ec075b215b568e6ee3cb0", - "sha256:7e396ce53cacd5596ff6d191b47ab0ea18f8e0ec04e15d69728d530e86d4c217", - "sha256:7eadc91af8270455e0d73565b8964da1642fe226665dd5c9560067cd64d56749", - "sha256:7f672d02fffcbace4db2b05369142e0506cdcde20cea0e07c7c2171c4fd11dd6", - "sha256:85baab8d74ec601e86134afe2bcccd87820f79d2f8d5798c889507d1088287bf", - "sha256:87c556fb85d709dacd4b4cb6167eecc5bbb4f0a9864b69136a0d4640fdc76a36", - "sha256:a6bd44efee4dc8c3324c13785a9dc3519b3ee3a92cada42d2b57762b7053b49b", - "sha256:c6d27bd20c3ba60d5b02f20bd28e20091d6286a699174dfad515636cb09b5a72", - "sha256:e2bb577d10d09a2d8822a042a23b8d62bc3b269667c9eb8e60a6edfa000211b1", - "sha256:f97a605d7c8bc2c6d1172c2f0d5a65b24142e11a58de689046e62c2d632ca8c1" - ], - "version": "==0.761" + "sha256:15b948e1302682e3682f11f50208b726a246ab4e6c1b39f9264a8796bb416aa2", + "sha256:219a3116ecd015f8dca7b5d2c366c973509dfb9a8fc97ef044a36e3da66144a1", + "sha256:3b1fc683fb204c6b4403a1ef23f0b1fac8e4477091585e0c8c54cbdf7d7bb164", + "sha256:3beff56b453b6ef94ecb2996bea101a08f1f8a9771d3cbf4988a61e4d9973761", + "sha256:7687f6455ec3ed7649d1ae574136835a4272b65b3ddcf01ab8704ac65616c5ce", + "sha256:7ec45a70d40ede1ec7ad7f95b3c94c9cf4c186a32f6bacb1795b60abd2f9ef27", + "sha256:86c857510a9b7c3104cf4cde1568f4921762c8f9842e987bc03ed4f160925754", + "sha256:8a627507ef9b307b46a1fea9513d5c98680ba09591253082b4c48697ba05a4ae", + "sha256:8dfb69fbf9f3aeed18afffb15e319ca7f8da9642336348ddd6cab2713ddcf8f9", + "sha256:a34b577cdf6313bf24755f7a0e3f3c326d5c1f4fe7422d1d06498eb25ad0c600", + "sha256:a8ffcd53cb5dfc131850851cc09f1c44689c2812d0beb954d8138d4f5fc17f65", + "sha256:b90928f2d9eb2f33162405f32dde9f6dcead63a0971ca8a1b50eb4ca3e35ceb8", + "sha256:c56ffe22faa2e51054c5f7a3bc70a370939c2ed4de308c690e7949230c995913", + "sha256:f91c7ae919bbc3f96cd5e5b2e786b2b108343d1d7972ea130f7de27fdd547cf3" + ], + "version": "==0.770" }, "mypy-extensions": { "hashes": [ @@ -413,10 +421,10 @@ }, "ndebug": { "hashes": [ - "sha256:7d7a9ead463cc9be2fdf3f2da95d51bf17d1db578fb9cc26cd16af5976351c71", - "sha256:ac5b75810b80f9504f30068523533e35a99b004ec02ad209e8ef3a3088601471" + "sha256:6bbaa5f88216959eb4fcb75ec4344ff3d01e13c73f771258ee283a07c9864013", + "sha256:cc286b22d983e4e05dab3485852c5d0bc642689d246591be4284b3cd5ef2896e" ], - "version": "==0.1.0" + "version": "==0.1.1" }, "packaging": { "hashes": [ @@ -432,6 +440,14 @@ ], "version": "==0.7.0" }, + "pipenv": { + "hashes": [ + "sha256:56ad5f5cb48f1e58878e14525a6e3129d4306049cb76d2f6a3e95df0d5fc6330", + "sha256:7df8e33a2387de6f537836f48ac6fcd94eda6ed9ba3d5e3fd52e35b5bc7ff49e", + "sha256:a673e606e8452185e9817a987572b55360f4d28b50831ef3b42ac3cab3fee846" + ], + "version": "==2018.11.26" + }, "pkginfo": { "hashes": [ "sha256:7424f2c8511c186cd5424bbf31045b77435b37a8d604990b79d4e70d741148bb", @@ -502,6 +518,13 @@ ], "version": "==5.4.1" }, + "pytest-asyncio": { + "hashes": [ + "sha256:9fac5100fd716cbecf6ef89233e8590a4ad61d729d1732e0a96b84182df1daaf", + "sha256:d734718e25cfc32d2bf78d346e99d33724deeba774cc4afdf491530c6184b63b" + ], + "version": "==0.10.0" + }, "pytest-cov": { "hashes": [ "sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b", @@ -518,10 +541,10 @@ }, "python-semantic-release": { "hashes": [ - "sha256:71a0dfb59ab159f5a356cf06719be75c4457816ea2d090c9b3ffb2ce15f30618", - "sha256:98f8a4b21831c0aeae4331a4805b9c33d4945c6f2842bffac93b25972e40c303" + "sha256:0efe611f5a6ef727e0482913bce8400250c914b9eef170f9af166f02d1a9d277", + "sha256:3f3d11f7ab47a1ceaccbeeac1f5d63390649de867ab5f5ec90993a9b749107e5" ], - "version": "==4.5.0" + "version": "==5.0.2" }, "readme-renderer": { "hashes": [ @@ -619,6 +642,13 @@ ], "version": "==3.6.1" }, + "tox-pipenv": { + "hashes": [ + "sha256:11342d2953d5be105b9530389191002fc7f9b5a78150d94b19acf87b3ad668dc", + "sha256:8c82aea4a64db248246d171bffc0e831773432e76e47c25c2fb9a37354e71501" + ], + "version": "==1.9.0" + }, "tqdm": { "hashes": [ "sha256:0d8b5afb66e23d80433102e9bd8b5c8b65d34c2a2255b2de58d97bd2ea8170fd", @@ -657,6 +687,7 @@ "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4", "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7" ], + "markers": "implementation_name == 'cpython' and python_version < '3.8'", "version": "==1.4.1" }, "typing-extensions": { @@ -676,10 +707,17 @@ }, "virtualenv": { "hashes": [ - "sha256:87831f1070534b636fea2241dd66f3afe37ac9041bcca6d0af3215cdcfbf7d82", - "sha256:f3128d882383c503003130389bf892856341c1da12c881ae24d6358c82561b55" + "sha256:6f4c2882a943d20714076679f8dcc5675e953d6c29bfea3bc5d08bb6cdea5d36", + "sha256:cb1dab893f9e39b3e68d9118c555dcd86526d531c128c3f72e1551939723b72f" + ], + "version": "==20.0.14" + }, + "virtualenv-clone": { + "hashes": [ + "sha256:532f789a5c88adf339506e3ca03326f20ee82fd08ee5586b44dc859b5b4468c5", + "sha256:c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557" ], - "version": "==20.0.13" + "version": "==0.5.3" }, "wcwidth": { "hashes": [ @@ -704,9 +742,16 @@ }, "wrapt": { "hashes": [ - "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" + "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" + ], + "version": "==1.12.1" + }, + "zipp": { + "hashes": [ + "sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b", + "sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96" ], - "version": "==1.11.2" + "version": "==3.1.0" } } } diff --git a/tox.ini b/tox.ini index 63d0b363..3d0d0235 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py36, py37, py38, cov, lint, typing +envlist = py37, py38, cov, lint, typing skip_missing_interpreters = True [testenv] @@ -7,28 +7,27 @@ whitelist_externals = make deps = pipenv commands= make init - make test [testenv:cov] whitelist_externals = make deps = pipenv commands= - make init make coverage [testenv:lint] whitelist_externals = make deps = pipenv commands= - make init make lint [testenv:typing] whitelist_externals = make deps = pipenv commands= - make init make typing [pytest] junit_family=xunit1 +filterwarnings = + ignore + default:::teslajsonpy \ No newline at end of file