From dcc4c3331b1192cefc69d4c6fc5129ff97af3154 Mon Sep 17 00:00:00 2001 From: Peter Bukva Date: Fri, 27 Aug 2021 09:41:54 +0100 Subject: [PATCH] Makefile: fix for requirements generation --- Makefile | 13 +++-- Pipfile.lock | 118 ++++++++++++++++++++++++------------------- requirements-dev.txt | 14 ++--- requirements.txt | 6 +-- setup.py | 1 + 5 files changed, 88 insertions(+), 64 deletions(-) diff --git a/Makefile b/Makefile index 22729753..e0e862d8 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ PYCOSM_SRC_DIR := cosmpy PYCOSM_TESTS_DIR := tests PYCOSM_EXAMPLES_DIR := examples -REQUIREMENTS_FILES := requirements.txt requirements-dev.txt Pipfile.lock +REQUIREMENTS_FILES := requirements.txt requirements-dev.txt ifeq ($(OS),Windows_NT) @@ -164,9 +164,14 @@ check: make copyright-check make test -$(REQUIREMENTS_FILES): Pipfile setup.py - pipenv lock -r > requirements.txt - pipenv lock -r --dev > requirements-dev.txt +Pipfile.lock: Pipfile setup.py + pipenv lock --dev + +requirements.txt: Pipfile.lock + pipenv lock -r > $@ + +requirements-dev.txt: Pipfile.lock + pipenv lock -r --dev > $@ .PHONY: requirements requirements: $(REQUIREMENTS_FILES) diff --git a/Pipfile.lock b/Pipfile.lock index 70a3e339..c7df067b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -57,7 +57,7 @@ "sha256:5cf31d5b33743abe0dfc28999036c849a69d548f994b535e527ee3cb7f3ef676", "sha256:b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.17.0" }, "google-api-core": { @@ -243,7 +243,7 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "requests": { @@ -267,7 +267,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "uritemplate": { @@ -475,6 +475,14 @@ ], "version": "==0.3.2" }, + "docker": { + "hashes": [ + "sha256:3e8bc47534e0ca9331d72c32f2881bb13b93ded0bcdeab3c833fb7cf61c0a9a5", + "sha256:fc961d622160e8021c10d1bcabc388c57d55fb1f917175afbe24af442e6879bd" + ], + "markers": "python_version >= '3.6'", + "version": "==5.0.0" + }, "dparse": { "hashes": [ "sha256:a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367", @@ -488,7 +496,7 @@ "sha256:5cf31d5b33743abe0dfc28999036c849a69d548f994b535e527ee3cb7f3ef676", "sha256:b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.17.0" }, "filelock": { @@ -696,7 +704,7 @@ "sha256:9c2ea1e62d871267b78307fe511c0838ba0da28698c5732d54e2790bf3ba9899", "sha256:e17d6e2b81095c9db0a03a8025a957f334d6ea30b26f9ec70805411e5c7c81f2" ], - "markers": "python_full_version >= '3.6.1' and python_version < '4.0'", + "markers": "python_version < '4.0' and python_full_version >= '3.6.1'", "version": "==5.9.3" }, "lazy-object-proxy": { @@ -929,7 +937,7 @@ "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.4.7" }, "pytest": { @@ -977,49 +985,49 @@ }, "regex": { "hashes": [ - "sha256:03840a07a402576b8e3a6261f17eb88abd653ad4e18ec46ef10c9a63f8c99ebd", - "sha256:06ba444bbf7ede3890a912bd4904bb65bf0da8f0d8808b90545481362c978642", - "sha256:1f9974826aeeda32a76648fc677e3125ade379869a84aa964b683984a2dea9f1", - "sha256:330836ad89ff0be756b58758878409f591d4737b6a8cef26a162e2a4961c3321", - "sha256:38600fd58c2996829480de7d034fb2d3a0307110e44dae80b6b4f9b3d2eea529", - "sha256:3a195e26df1fbb40ebee75865f9b64ba692a5824ecb91c078cc665b01f7a9a36", - "sha256:41acdd6d64cd56f857e271009966c2ffcbd07ec9149ca91f71088574eaa4278a", - "sha256:45f97ade892ace20252e5ccecdd7515c7df5feeb42c3d2a8b8c55920c3551c30", - "sha256:4b0c211c55d4aac4309c3209833c803fada3fc21cdf7b74abedda42a0c9dc3ce", - "sha256:5d5209c3ba25864b1a57461526ebde31483db295fc6195fdfc4f8355e10f7376", - "sha256:615fb5a524cffc91ab4490b69e10ae76c1ccbfa3383ea2fad72e54a85c7d47dd", - "sha256:61e734c2bcb3742c3f454dfa930ea60ea08f56fd1a0eb52d8cb189a2f6be9586", - "sha256:640ccca4d0a6fcc6590f005ecd7b16c3d8f5d52174e4854f96b16f34c39d6cb7", - "sha256:6dbd51c3db300ce9d3171f4106da18fe49e7045232630fe3d4c6e37cb2b39ab9", - "sha256:71a904da8c9c02aee581f4452a5a988c3003207cb8033db426f29e5b2c0b7aea", - "sha256:8021dee64899f993f4b5cca323aae65aabc01a546ed44356a0965e29d7893c94", - "sha256:8b8d551f1bd60b3e1c59ff55b9e8d74607a5308f66e2916948cafd13480b44a3", - "sha256:93f9f720081d97acee38a411e861d4ce84cbc8ea5319bc1f8e38c972c47af49f", - "sha256:96f0c79a70642dfdf7e6a018ebcbea7ea5205e27d8e019cad442d2acfc9af267", - "sha256:9966337353e436e6ba652814b0a957a517feb492a98b8f9d3b6ba76d22301dcc", - "sha256:a34ba9e39f8269fd66ab4f7a802794ffea6d6ac500568ec05b327a862c21ce23", - "sha256:a49f85f0a099a5755d0a2cc6fc337e3cb945ad6390ec892332c691ab0a045882", - "sha256:a795829dc522227265d72b25d6ee6f6d41eb2105c15912c230097c8f5bfdbcdc", - "sha256:a89ca4105f8099de349d139d1090bad387fe2b208b717b288699ca26f179acbe", - "sha256:ac95101736239260189f426b1e361dc1b704513963357dc474beb0f39f5b7759", - "sha256:ae87ab669431f611c56e581679db33b9a467f87d7bf197ac384e71e4956b4456", - "sha256:b091dcfee169ad8de21b61eb2c3a75f9f0f859f851f64fdaf9320759a3244239", - "sha256:b511c6009d50d5c0dd0bab85ed25bc8ad6b6f5611de3a63a59786207e82824bb", - "sha256:b79dc2b2e313565416c1e62807c7c25c67a6ff0a0f8d83a318df464555b65948", - "sha256:bca14dfcfd9aae06d7d8d7e105539bd77d39d06caaae57a1ce945670bae744e0", - "sha256:c835c30f3af5c63a80917b72115e1defb83de99c73bc727bddd979a3b449e183", - "sha256:ccd721f1d4fc42b541b633d6e339018a08dd0290dc67269df79552843a06ca92", - "sha256:d6c2b1d78ceceb6741d703508cd0e9197b34f6bf6864dab30f940f8886e04ade", - "sha256:d6ec4ae13760ceda023b2e5ef1f9bc0b21e4b0830458db143794a117fdbdc044", - "sha256:d8b623fc429a38a881ab2d9a56ef30e8ea20c72a891c193f5ebbddc016e083ee", - "sha256:ea9753d64cba6f226947c318a923dadaf1e21cd8db02f71652405263daa1f033", - "sha256:ebbceefbffae118ab954d3cd6bf718f5790db66152f95202ebc231d58ad4e2c2", - "sha256:ecb6e7c45f9cd199c10ec35262b53b2247fb9a408803ed00ee5bb2b54aa626f5", - "sha256:ef9326c64349e2d718373415814e754183057ebc092261387a2c2f732d9172b2", - "sha256:f93a9d8804f4cec9da6c26c8cfae2c777028b4fdd9f49de0302e26e00bb86504", - "sha256:faf08b0341828f6a29b8f7dd94d5cf8cc7c39bfc3e67b78514c54b494b66915a" - ], - "version": "==2021.8.21" + "sha256:0696eb934dee723e3292056a2c046ddb1e4dd3887685783a9f4af638e85dee76", + "sha256:105122fa63da98d8456d5026bc6ac5a1399fd82fa6bad22c6ea641b1572c9142", + "sha256:116c277774f84266044e889501fe79cfd293a8b4336b7a5e89b9f20f1e5a9f21", + "sha256:12eaf0bbe568bd62e6cade7937e0bf01a2a4cef49a82f4fd204401e78409e158", + "sha256:1401cfa4320691cbd91191ec678735c727dee674d0997b0902a5a38ad482faf5", + "sha256:19acdb8831a4e3b03b23369db43178d8fee1f17b99c83af6cd907886f76bd9d4", + "sha256:208851a2f8dd31e468f0b5aa6c94433975bd67a107a4e7da3bdda947c9f85e25", + "sha256:24d68499a27b2d93831fde4a9b84ea5b19e0ab141425fbc9ab1e5b4dad179df7", + "sha256:2778c6cb379d804e429cc8e627392909e60db5152b42c695c37ae5757aae50ae", + "sha256:2a0a5e323cf86760784ce2b91d8ab5ea09d0865d6ef4da0151e03d15d097b24e", + "sha256:2d9cbe0c755ab8b6f583169c0783f7278fc6b195e423b09c5a8da6f858025e96", + "sha256:2de1429e4eeab799c168a4f6e6eecdf30fcaa389bba4039cc8a065d6b7aad647", + "sha256:32753eda8d413ce4f208cfe01dd61171a78068a6f5d5f38ccd751e00585cdf1d", + "sha256:3ee8ad16a35c45a5bab098e39020ecb6fec3b0e700a9d88983d35cbabcee79c8", + "sha256:4f03fc0a25122cdcbf39136510d4ea7627f732206892db522adf510bc03b8c67", + "sha256:4f3e36086d6631ceaf468503f96a3be0d247caef0660c9452fb1b0c055783851", + "sha256:503c1ba0920a46a1844363725215ef44d59fcac2bd2c03ae3c59aa9d08d29bd6", + "sha256:507861cf3d97a86fbe26ea6cc04660ae028b9e4080b8290e28b99547b4e15d89", + "sha256:56ae6e3cf0506ec0c40b466e31f41ee7a7149a2b505ae0ee50edd9043b423d27", + "sha256:6530b7b9505123cdea40a2301225183ca65f389bc6129f0c225b9b41680268d8", + "sha256:6729914dd73483cd1c8aaace3ac082436fc98b0072743ac136eaea0b3811d42f", + "sha256:7406dd2e44c7cfb4680c0a45a03264381802c67890cf506c147288f04c67177d", + "sha256:7684016b73938ca12d160d2907d141f06b7597bd17d854e32bb7588be01afa1d", + "sha256:7db58ad61f3f6ea393aaf124d774ee0c58806320bc85c06dc9480f5c7219c250", + "sha256:83946ca9278b304728b637bc8d8200ab1663a79de85e47724594917aeed0e892", + "sha256:84057cfae5676f456b03970eb78b7e182fddc80c2daafd83465a3d6ca9ff8dbf", + "sha256:862b6164e9a38b5c495be2c2854e75fd8af12c5be4c61dc9b42d255980d7e907", + "sha256:8ddb4f9ce6bb388ecc97b4b3eb37e786f05d7d5815e8822e0d87a3dbd7100649", + "sha256:92eb03f47427fea452ff6956d11f5d5a3f22a048c90a0f34fa223e6badab6c85", + "sha256:a5f3bc727fea58f21d99c22e6d4fca652dc11dbc2a1e7cfc4838cd53b2e3691f", + "sha256:a6180dbf5945b27e9420e1b58c3cacfc79ad5278bdad3ea35109f5680fbe16d1", + "sha256:b158f673ae6a6523f13704f70aa7e4ce875f91e379bece4362c89db18db189d5", + "sha256:cd45b4542134de63e7b9dd653e0a2d7d47ffed9615e3637c27ca5f6b78ea68bb", + "sha256:d2404336fd16788ea757d4218a2580de60adb052d9888031e765320be8884309", + "sha256:db888d4fb33a2fd54b57ac55d5015e51fa849f0d8592bd799b4e47f83bd04e00", + "sha256:dde0ac721c7c5bfa5f9fc285e811274dec3c392f2c1225f7d07ca98a8187ca84", + "sha256:de0d06ccbc06af5bf93bddec10f4f80275c5d74ea6d28b456931f3955f58bc8c", + "sha256:e02dad60e3e8442eefd28095e99b2ac98f2b8667167493ac6a2f3aadb5d84a17", + "sha256:e960fe211496333b2f7e36badf4c22a919d740386681f79139ee346b403d1ca1", + "sha256:e9700c52749cb3e90c98efd72b730c97b7e4962992fca5fbcaf1363be8e3b849", + "sha256:ee318974a1fdacba1701bc9e552e9015788d6345416364af6fa987424ff8df53" + ], + "version": "==2021.8.27" }, "requests": { "hashes": [ @@ -1058,7 +1066,7 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "smmap": { @@ -1082,7 +1090,7 @@ "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.10.2" }, "tomli": { @@ -1141,6 +1149,14 @@ "markers": "python_version >= '3.6'", "version": "==2.3" }, + "websocket-client": { + "hashes": [ + "sha256:0133d2f784858e59959ce82ddac316634229da55b498aac311f1620567a710ec", + "sha256:8dfb715d8a992f5712fff8c843adae94e22b22a99b2c5e6b0ec4a1a981cc4e0d" + ], + "markers": "python_version >= '3.6'", + "version": "==1.2.1" + }, "wrapt": { "hashes": [ "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7" diff --git a/requirements-dev.txt b/requirements-dev.txt index 04d652e9..5b8c00cb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -17,8 +17,9 @@ configparser==5.0.2; python_version >= '3.4' coverage==5.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' darglint==1.8.0; python_version >= '3.6' and python_version < '4.0' distlib==0.3.2 +docker==5.0.0; python_version >= '3.6' dparse==0.5.1; python_version >= '3.5' -ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2' +ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' filelock==3.0.12 flake8-copyright==0.2.2 flake8==3.9.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' @@ -34,7 +35,7 @@ grpcio==1.39.0 httplib2==0.19.1 idna==3.2; python_version >= '3' iniconfig==1.1.1 -isort==5.9.3; python_full_version >= '3.6.1' and python_version < '4.0' +isort==5.9.3; python_version < '4.0' and python_full_version >= '3.6.1' lazy-object-proxy==1.6.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' liccheck==0.6.2; python_version >= '2.7' mccabe==0.6.1 @@ -53,18 +54,18 @@ pyasn1==0.4.8 pycodestyle==2.7.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' pyflakes==2.3.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' pylint==2.9.6; python_version ~= '3.6' -pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2' +pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' pytest==6.2.4; python_version >= '3.6' pyyaml==5.4.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' -regex==2021.8.21 +regex==2021.8.27 requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' rsa==4.7.2; python_version >= '3.5' and python_version < '4' safety==1.10.3; python_version >= '3.5' semantic-version==2.8.5; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' -six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2' +six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' smmap==4.0.0; python_version >= '3.5' stevedore==3.4.0; python_version >= '3.6' -toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2' +toml==0.10.2; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' tomli==1.2.1; python_version >= '3.6' tox==3.24.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' typing-extensions==3.10.0.0 @@ -72,4 +73,5 @@ uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, urllib3==1.26.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' virtualenv==20.7.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' vulture==2.3; python_version >= '3.6' +websocket-client==1.2.1; python_version >= '3.6' wrapt==1.12.1 diff --git a/requirements.txt b/requirements.txt index ac03d6b6..5bb5a19f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ bech32==1.2.0; python_version >= '3.5' cachetools==4.2.2; python_version ~= '3.5' certifi==2021.5.30 charset-normalizer==2.0.4; python_version >= '3' -ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2' +ecdsa==0.17.0; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' google-api-core==2.0.0; python_version >= '3.6' google-api-python-client==2.18.0; python_version >= '3.6' google-auth-httplib2==0.1.0 @@ -16,9 +16,9 @@ idna==3.2; python_version >= '3' protobuf==3.17.3 pyasn1-modules==0.2.8 pyasn1==0.4.8 -pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2' +pyparsing==2.4.7; python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' requests==2.26.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' rsa==4.7.2; python_version >= '3.5' and python_version < '4' -six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2' +six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' uritemplate==3.0.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3' urllib3==1.26.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4' diff --git a/setup.py b/setup.py index 31aee3a0..1bd72452 100644 --- a/setup.py +++ b/setup.py @@ -62,6 +62,7 @@ ], extras_require={ "dev": [ + "docker==5.0.0", "check-manifest", "tox==3.24.1", "flake8==3.9.2",