From 4c1690e42a545e9e23cdc30b25be24bd0e8ac2ef Mon Sep 17 00:00:00 2001 From: Midnighter Date: Tue, 26 May 2020 22:25:59 +0200 Subject: [PATCH] refactor: remove build timestamp --- .travis.yml | 1 - Dockerfile | 10 +- LATEST_BASE_TAG | 2 +- Makefile | 8 +- docker-compose.yml | 5 +- requirements/requirements.txt | 242 +++++++++++++++++++--------------- 6 files changed, 145 insertions(+), 123 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7d3afd..35e9663 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ env: - BRANCH=${TRAVIS_BRANCH} - BUILD_COMMIT=${TRAVIS_COMMIT} - SHORT_COMMIT=${TRAVIS_COMMIT:0:7} - - BUILD_TIMESTAMP=$(date -u +%Y-%m-%dT%T+00:00) - BUILD_DATE=$(date -u +%Y-%m-%d) - BUILD_TAG=${BRANCH}_${BUILD_DATE}_${SHORT_COMMIT} diff --git a/Dockerfile b/Dockerfile index 08bcc22..22cc563 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,14 +19,12 @@ FROM dddecaf/wsgi-base:${BASE_TAG} ARG BASE_TAG=alpine ARG BUILD_COMMIT -ARG BUILD_TIMESTAMP LABEL dk.dtu.biosustain.id-mapper.alpine.vendor="Novo Nordisk Foundation \ -Center for Biosustainability, Technical University of Denmark" \ - maintainer="niso@biosustain.dtu.dk" \ - dk.dtu.biosustain.id-mapper.alpine.build.base-tag="${BASE_TAG}" \ - dk.dtu.biosustain.id-mapper.alpine.build.commit="${BUILD_COMMIT}" \ - dk.dtu.biosustain.id-mapper.alpine.build.timestamp="${BUILD_TIMESTAMP}" +Center for Biosustainability, Technical University of Denmark" +LABEL maintainer="niso@biosustain.dtu.dk" +LABEL dk.dtu.biosustain.id-mapper.alpine.build.base-tag="${BASE_TAG}" +LABEL dk.dtu.biosustain.id-mapper.alpine.build.commit="${BUILD_COMMIT}" ARG CWD="/app" diff --git a/LATEST_BASE_TAG b/LATEST_BASE_TAG index 92d2fd8..ca88fc6 100644 --- a/LATEST_BASE_TAG +++ b/LATEST_BASE_TAG @@ -1 +1 @@ - alpine_2020-04-29_467416e + alpine_2020-05-26_7beedaa diff --git a/Makefile b/Makefile index b27b604..ff2f05b 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,6 @@ IMAGE ?= gcr.io/dd-decaf-cfbf6/id-mapper BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) BUILD_COMMIT ?= $(shell git rev-parse HEAD) SHORT_COMMIT ?= $(shell git rev-parse --short HEAD) -# Full timestamp in UTC. Format corresponds to ISO-8601 but Unix compatible. -BUILD_TIMESTAMP ?= $(shell date -u +%Y-%m-%dT%T+00:00) BUILD_DATE ?= $(shell date -u +%Y-%m-%d) BUILD_TAG ?= ${BRANCH}_${BUILD_DATE}_${SHORT_COMMIT} @@ -28,7 +26,7 @@ setup: network ## Generate the compiled requirements files. lock: docker pull dddecaf/tag-spy:latest - $(eval LATEST_BASE_TAG := $(shell docker run --rm dddecaf/tag-spy:latest tag-spy dddecaf/wsgi-base alpine dk.dtu.biosustain.wsgi-base.alpine.build.timestamp)) + $(eval LATEST_BASE_TAG := $(shell docker run --rm dddecaf/tag-spy:latest tag-spy dddecaf/wsgi-base alpine)) $(file >LATEST_BASE_TAG, $(LATEST_BASE_TAG)) $(eval COMPILER_TAG := $(subst alpine,alpine-compiler,$(LATEST_BASE_TAG))) $(info ************************************************************) @@ -57,9 +55,9 @@ build-travis: $(info * depend on a later version.) $(info ************************************************************) docker pull dddecaf/wsgi-base:$(LATEST_BASE_TAG) - docker build --build-arg BASE_TAG=$(LATEST_BASE_TAG) \ + docker build \ + --build-arg BASE_TAG=$(LATEST_BASE_TAG) \ --build-arg BUILD_COMMIT=$(BUILD_COMMIT) \ - --build-arg BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) \ --tag $(IMAGE):$(BRANCH) \ --tag $(IMAGE):$(BUILD_TAG) \ . diff --git a/docker-compose.yml b/docker-compose.yml index df4772a..5566b67 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,10 +5,9 @@ services: context: . dockerfile: Dockerfile args: - - BASE_TAG=${BASE_TAG} + - BASE_TAG=${BASE_TAG:-alpine} - BUILD_COMMIT=${BUILD_COMMIT:-unknown} - - BUILD_TIMESTAMP=${BUILD_TIMESTAMP:-unknown} - image: gcr.io/dd-decaf-cfbf6/id-mapper:${IMAGE_TAG:-latest} + image: gcr.io/dd-decaf-cfbf6/id-mapper:${BUILD_TAG:-latest} networks: default: DD-DeCaF: diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 25d7fa5..5fa06a0 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,9 +8,9 @@ apispec==3.3.0 \ --hash=sha256:419d0564b899e182c2af50483ea074db8cb05fee60838be58bb4542095d5c08d \ --hash=sha256:9bf4e51d56c9067c60668b78210ae213894f060f85593dc2ad8805eb7d875a2a \ # via -r /opt/base-requirements.txt, flask-apispec -appdirs==1.4.3 \ - --hash=sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92 \ - --hash=sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e \ +appdirs==1.4.4 \ + --hash=sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41 \ + --hash=sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128 \ # via -r /opt/base-requirements.txt, black attrs==19.3.0 \ --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \ @@ -84,10 +84,6 @@ ecdsa==0.15 \ --hash=sha256:867ec9cf6df0b03addc8ef66b56359643cb5d0c1dc329df76ba7ecfe256c8061 \ --hash=sha256:8f12ac317f8a1318efa75757ef0a651abe12e51fc1af8838fb91079445227277 \ # via -r /opt/base-requirements.txt, python-jose -entrypoints==0.3 \ - --hash=sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19 \ - --hash=sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451 \ - # via -r /opt/base-requirements.txt, flake8 flake8-bugbear==20.1.4 \ --hash=sha256:a3ddc03ec28ba2296fc6f89444d1c946a6b76460f859795b35b77d4920a51b63 \ --hash=sha256:bd02e4b009fb153fe6072c31c52aeab5b133d508095befb2ffcf3b41c4823162 \ @@ -96,9 +92,9 @@ flake8-docstrings==1.5.0 \ --hash=sha256:3d5a31c7ec6b7367ea6506a87ec293b94a0a46c0bce2bb4975b7f1d09b6f3717 \ --hash=sha256:a256ba91bc52307bef1de59e2a009c3cf61c3d0952dbe035d6ff7208940c2edc \ # via -r /opt/base-requirements.txt -flake8==3.7.9 \ - --hash=sha256:45681a117ecc81e870cbf1262835ae4af5e7a8b08e40b944a8a6e6b895914cfb \ - --hash=sha256:49356e766643ad15072a789a20915d3c91dc89fd313ccd71802303fd67e4deca \ +flake8==3.8.2 \ + --hash=sha256:c69ac1668e434d37a2d2880b3ca9aafd54b3a10a3ac1ab101d22f29e29cf8634 \ + --hash=sha256:ccaa799ef9893cebe69fdfefed76865aeaefbb94cb8545617b2298786a4de9a5 \ # via -r /opt/base-requirements.txt, flake8-bugbear, flake8-docstrings flask-apispec==0.8.8 \ --hash=sha256:af6354efe26266f46cbf588635e6d3bcbdf82615799edd7023cedd4ddb6ea262 \ @@ -112,31 +108,29 @@ flask==1.1.2 \ --hash=sha256:4efa1ae2d7c9865af48986de8aeb8504bf32c7f3d6fdc9353d34b21f4b127060 \ --hash=sha256:8a4fdd8936eba2512e9c85df320a37e694c93945b33ef33c89946a340a238557 \ # via -r /opt/base-requirements.txt, flask-apispec, flask-cors, raven -gevent==20.4.0 \ - --hash=sha256:0b84a8d6f088b29a74402728681c9f11864b95e49f5587a666e6fbf5c683e597 \ - --hash=sha256:1ef086264e846371beb5742ebaeb148dc96adf72da2ff350ae5603421cdc2ad9 \ - --hash=sha256:2070c65896f89a85b39f49427d6132f7abd047129fc4da88b3670f0ba13b0cf7 \ - --hash=sha256:2fbe0bc43d8c5540153f06eece6235dda14e5f99bdd9183838396313100815d7 \ - --hash=sha256:32813de352918fb652a3db805fd6e08e0a1666a1a9304eef95938c9c426f9573 \ - --hash=sha256:38c45d8a3b647f56f8a68769a8ac4953be84a84735c7c7a4d7ca62022bd54036 \ - --hash=sha256:3b4c4d99f87c0d04b825879c5a91fbfa2b66da7c25b8689e9bdd9f4741d5f80d \ - --hash=sha256:42cae3be36b7458f411bd589c66aaba27e4e611ec3d3621e37fd732fe383f9b6 \ - --hash=sha256:4572dc7907a0ac3c39b9f0898dbdf390ae3250baaae5f7395661fb844e2e23be \ - --hash=sha256:6088bedd8b6bcdb815be322304a5d1c028ffa837d84e93b349928dadac62f354 \ - --hash=sha256:8a9aba59a3268f20c7b584119215bdc589cb81500d93dad4dab428eb02f72944 \ - --hash=sha256:8cca7ffd58559f8d51e5605ad73afcc6f348f9747d2fa539b336e70851b69b79 \ - --hash=sha256:956e82a5d0e90f8d71efe4cecccde602cfb657cd866c58bb953c9c30ca1b3d77 \ - --hash=sha256:b0aea12de542f8fcd6882087bdd5b4d7dc8bb316d28181f6b012dd0b91583285 \ - --hash=sha256:b46399f6c9eccc2e6de1dc1057d362be840443e5439b06cce8b01d114ba1a7ec \ - --hash=sha256:c0b38a654c8fde5b9d9bd27ea3261aeefe36bc9244b170b6d3b11d72a2163bdb \ - --hash=sha256:c516cc5d70c3faf07f271d50930d144339c69fb80f3cac9b687aa964e518535e \ - --hash=sha256:c7a62d51c6dca84f91a91b940037523c926a516f0568f47dc1386bd1682cf4e9 \ - --hash=sha256:cea28f958bc4206ae092043e0775cd7a2bb2536bcbece292732c6484c1076c01 \ - --hash=sha256:d56f36eb98532d2bccc51cb0964c31e9fbd9b2282074c297dc9b006b047e2966 \ - --hash=sha256:de6c0cbcb890d0a79323961d3b593a0f2f54dcb9fe38ee5167f2d514e69e3c8c \ - --hash=sha256:e0990009e7c1624f9a0f3335df1ab8d45678241c852659ac645b70ed8229097c \ - --hash=sha256:e7d23d5f32c9db6ae49c4b58585618dcafd6ad0babae251c9c8297afebc4744b \ - --hash=sha256:ee39caf14d66e619709cdfe3962bc68a234518e43ea8c811c0d67a864bc7c196 \ +gevent==20.5.1 \ + --hash=sha256:13ed2fa4a074c26fd60744a0757bf65004950554dfd9efd7c9deee1c241279af \ + --hash=sha256:1734f56ea545668780a4a283542a48d11298ab525c780a6001071f9d9d3c6880 \ + --hash=sha256:1c2ad11663597d785e06daa8b65978a1536347a42bc840cf32823b54a0209d15 \ + --hash=sha256:1cf6ed4f66ecc432939e4be9434a20dffcf3207fb0ab6bc0343e7a9ea76d233b \ + --hash=sha256:2504563f44bb188c1e48684e2ac7d2793f9f5b1e1cf119a8fdf8c36d2bf2eaf7 \ + --hash=sha256:28a71ac05cf8a80897a8402f3193dab89bd225a3f0d27042d7352ec37156ba6a \ + --hash=sha256:29eefad2557138fb654ba5cedfb94055f959e6c9705f9983518195cbcf250cc6 \ + --hash=sha256:3a1ec10c73fb70bd474cd778e4ab487c1375b7d93053c24db15acbda367e3734 \ + --hash=sha256:42ff095288b1f335f7ea96a7812f378d843a034f4f0e604edc24a3dddb001106 \ + --hash=sha256:52567bdc3769bc6df4693c1ea5ed1d82f825a6066835b405676ece437caf3fb9 \ + --hash=sha256:5c07973cd9f5a73480a386d1805b6a6b94e69aa906ee42f84a0cba02619a19e3 \ + --hash=sha256:653ad83784b872e78204c7e049b650c41c2e7ccb956142d8edc23a72e57ff80c \ + --hash=sha256:71438390acb6aea432d5f853d5dcb16fa2a6d3c1d2299a0ebe32eed03ac81547 \ + --hash=sha256:765b39e502c76a1d77f743b821b7b1afe2a816848cf73a3606b1d5a91841cb9c \ + --hash=sha256:7cb2fedafb0a692a3f1a14ddb13cbb3283863a1dfc3b536452f5ac6dfb88317a \ + --hash=sha256:7f1e339b6d51c354fa904ec8233b994b53c7c339b81c0743e07f2921b299d787 \ + --hash=sha256:867c77a6da601b2f4600b71b7f8663cadb8f11c31f294b3a49025cdbaf406110 \ + --hash=sha256:8bea8dccb6ea671ecf00e1ba16d5275da8b78464082ac035e7391097513db777 \ + --hash=sha256:ad01ef76f1d71cc7f2ce131cde6575ecc35d0a682a187a3229df3e977847f378 \ + --hash=sha256:b53cf1a495c065df8b4b65d9f73a1cd7c5fa010955c0ed7bc5de196062099e41 \ + --hash=sha256:f4a73e288fab042335b19f4b40407f8b44a40612626429943e37db23b40dd055 \ + --hash=sha256:fe3ede0282c023b6ac1d0441402866488017b8f90f47691794441d0a18342a65 \ # via -r /opt/base-requirements.txt greenlet==0.4.15 \ --hash=sha256:000546ad01e6389e98626c1367be58efa613fa82a1be98b0c6fc24b563acc6d0 \ @@ -173,14 +167,14 @@ idna==2.9 \ importlib-metadata==1.6.0 \ --hash=sha256:2a688cbaa90e0cc587f1df48bdc97a6eadccdcd9c35fb3f976a09e3b5016d90f \ --hash=sha256:34513a8a0c4962bc66d35b359558fd8a5e10cd472d37aec5f66858addef32c1e \ - # via -r /opt/base-requirements.txt, pluggy, pytest + # via -r /opt/base-requirements.txt, flake8, pluggy, pytest ipython-genutils==0.2.0 \ --hash=sha256:72dd37233799e619666c9f639a9da83c34013a73e8bbc79a7a6348d93c61fab8 \ --hash=sha256:eb2e116e75ecef9d4d228fdc66af54269afa26ab4463042e33785b887c628ba8 \ # via -r /opt/base-requirements.txt, traitlets -ipython==7.13.0 \ - --hash=sha256:ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a \ - --hash=sha256:eb8d075de37f678424527b5ef6ea23f7b80240ca031c2dd6de5879d687a65333 \ +ipython==7.14.0 \ + --hash=sha256:5b241b84bbf0eb085d43ae9d46adf38a13b45929ca7774a740990c2c242534bb \ + --hash=sha256:f0126781d0f959da852fb3089e170ed807388e986a8dd4e6ac44855845b0fb1c \ # via -r /opt/base-requirements.txt isort==4.3.21 \ --hash=sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1 \ @@ -233,21 +227,21 @@ markupsafe==1.1.1 \ --hash=sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7 \ --hash=sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be \ # via -r /opt/base-requirements.txt, jinja2 -marshmallow==3.5.1 \ - --hash=sha256:90854221bbb1498d003a0c3cc9d8390259137551917961c8b5258c64026b2f85 \ - --hash=sha256:ac2e13b30165501b7d41fc0371b8df35944f5849769d136f20e2c5f6cdc6e665 \ +marshmallow==3.6.0 \ + --hash=sha256:c2673233aa21dde264b84349dc2fd1dce5f30ed724a0a00e75426734de5b84ab \ + --hash=sha256:f88fe96434b1f0f476d54224d59333eba8ca1a203a2695683c1855675c4049a7 \ # via -r /opt/base-requirements.txt, flask-apispec, webargs mccabe==0.6.1 \ --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ # via -r /opt/base-requirements.txt, flake8 -more-itertools==8.2.0 \ - --hash=sha256:5dd8bcf33e5f9513ffa06d5ad33d78f31e1931ac9a18f33d37e77a180d393a7c \ - --hash=sha256:b1ddb932186d8a6ac451e1d95844b382f55e12686d51ca0c68b6f61f2ab7a507 \ +more-itertools==8.3.0 \ + --hash=sha256:558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be \ + --hash=sha256:7818f596b1e87be009031c7653d01acc46ed422e6656b394b0f765ce66ed4982 \ # via -r /opt/base-requirements.txt, pytest -packaging==20.3 \ - --hash=sha256:3c292b474fda1671ec57d46d739d072bfd495a4f51ad01a055121d81e952b7a3 \ - --hash=sha256:82f77b9bee21c1bafbf35a84905d604d5d1223801d639cf3ed140bd651c08752 \ +packaging==20.4 \ + --hash=sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8 \ + --hash=sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181 \ # via -r /opt/base-requirements.txt, dparse, pytest, safety parso==0.7.0 \ --hash=sha256:158c140fc04112dc45bca311633ae5033c2c2a7b732fa33d0955bad8152a8dd0 \ @@ -285,31 +279,20 @@ py==1.8.1 \ --hash=sha256:c20fdd83a5dbc0af9efd622bee9a5564e278f6380fffcacc43ba6f43db2813b0 \ # via -r /opt/base-requirements.txt, pytest pyasn1==0.4.8 \ - --hash=sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359 \ - --hash=sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576 \ - --hash=sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf \ - --hash=sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7 \ --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ - --hash=sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00 \ - --hash=sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8 \ - --hash=sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86 \ - --hash=sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12 \ - --hash=sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776 \ --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba \ - --hash=sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2 \ - --hash=sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3 \ # via -r /opt/base-requirements.txt, python-jose, rsa -pycodestyle==2.5.0 \ - --hash=sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56 \ - --hash=sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c \ +pycodestyle==2.6.0 \ + --hash=sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367 \ + --hash=sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e \ # via -r /opt/base-requirements.txt, flake8 pydocstyle==5.0.2 \ --hash=sha256:da7831660b7355307b32778c4a0dbfb137d89254ef31a2b2978f50fc0b4d7586 \ --hash=sha256:f4f5d210610c2d153fae39093d44224c17429e2ad7da12a8b419aba5c2f614b5 \ # via -r /opt/base-requirements.txt, flake8-docstrings -pyflakes==2.1.1 \ - --hash=sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0 \ - --hash=sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2 \ +pyflakes==2.2.0 \ + --hash=sha256:0d94e0e05a19e57a99444b6ddcf9a6eb2e5c68d3ca1e98e90707af8152c90a92 \ + --hash=sha256:35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8 \ # via -r /opt/base-requirements.txt, flake8 pygments==2.6.1 \ --hash=sha256:647344a061c249a3b74e230c739f434d7ea4d8b1d5f3721bc0f3558049b38f44 \ @@ -319,13 +302,13 @@ pyparsing==2.4.7 \ --hash=sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1 \ --hash=sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b \ # via -r /opt/base-requirements.txt, packaging -pytest-cov==2.8.1 \ - --hash=sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b \ - --hash=sha256:cdbdef4f870408ebdbfeb44e63e07eb18bb4619fae852f6e760645fa36172626 \ +pytest-cov==2.9.0 \ + --hash=sha256:b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322 \ + --hash=sha256:c87dfd8465d865655a8213859f1b4749b43448b5fae465cb981e16d52a811424 \ # via -r /opt/base-requirements.txt -pytest==5.4.1 \ - --hash=sha256:0e5b30f5cb04e887b91b1ee519fa3d89049595f428c1db76e73bd7f17b09b172 \ - --hash=sha256:84dde37075b8805f3d1f392cc47e38a0e59518fb46a431cfdaf7cf1ce805f970 \ +pytest==5.4.2 \ + --hash=sha256:95c710d0a72d91c13fae35dce195633c929c3792f54125919847fdcdf7caa0d3 \ + --hash=sha256:eb2b5e935f6a019317e455b6da83dd8650ac9ffd2ee73a7b657a30873d67a698 \ # via -r /opt/base-requirements.txt, pytest-cov python-jose==3.1.0 \ --hash=sha256:1ac4caf4bfebd5a70cf5bd82702ed850db69b0b6e1d0ae7368e5f99ac01c9571 \ @@ -348,28 +331,28 @@ raven[flask]==6.10.0 \ --hash=sha256:3fa6de6efa2493a7c827472e984ce9b020797d0da16f1db67197bcc23c8fae54 \ --hash=sha256:44a13f87670836e153951af9a3c80405d36b43097db869a36e92809673692ce4 \ # via -r /opt/base-requirements.txt -regex==2020.4.4 \ - --hash=sha256:08119f707f0ebf2da60d2f24c2f39ca616277bb67ef6c92b72cbf90cbe3a556b \ - --hash=sha256:0ce9537396d8f556bcfc317c65b6a0705320701e5ce511f05fc04421ba05b8a8 \ - --hash=sha256:1cbe0fa0b7f673400eb29e9ef41d4f53638f65f9a2143854de6b1ce2899185c3 \ - --hash=sha256:2294f8b70e058a2553cd009df003a20802ef75b3c629506be20687df0908177e \ - --hash=sha256:23069d9c07e115537f37270d1d5faea3e0bdded8279081c4d4d607a2ad393683 \ - --hash=sha256:24f4f4062eb16c5bbfff6a22312e8eab92c2c99c51a02e39b4eae54ce8255cd1 \ - --hash=sha256:295badf61a51add2d428a46b8580309c520d8b26e769868b922750cf3ce67142 \ - --hash=sha256:2a3bf8b48f8e37c3a40bb3f854bf0121c194e69a650b209628d951190b862de3 \ - --hash=sha256:4385f12aa289d79419fede43f979e372f527892ac44a541b5446617e4406c468 \ - --hash=sha256:5635cd1ed0a12b4c42cce18a8d2fb53ff13ff537f09de5fd791e97de27b6400e \ - --hash=sha256:5bfed051dbff32fd8945eccca70f5e22b55e4148d2a8a45141a3b053d6455ae3 \ - --hash=sha256:7e1037073b1b7053ee74c3c6c0ada80f3501ec29d5f46e42669378eae6d4405a \ - --hash=sha256:90742c6ff121a9c5b261b9b215cb476eea97df98ea82037ec8ac95d1be7a034f \ - --hash=sha256:a58dd45cb865be0ce1d5ecc4cfc85cd8c6867bea66733623e54bd95131f473b6 \ - --hash=sha256:c087bff162158536387c53647411db09b6ee3f9603c334c90943e97b1052a156 \ - --hash=sha256:c162a21e0da33eb3d31a3ac17a51db5e634fc347f650d271f0305d96601dc15b \ - --hash=sha256:c9423a150d3a4fc0f3f2aae897a59919acd293f4cb397429b120a5fcd96ea3db \ - --hash=sha256:ccccdd84912875e34c5ad2d06e1989d890d43af6c2242c6fcfa51556997af6cd \ - --hash=sha256:e91ba11da11cf770f389e47c3f5c30473e6d85e06d7fd9dcba0017d2867aab4a \ - --hash=sha256:ea4adf02d23b437684cd388d557bf76e3afa72f7fed5bbc013482cc00c816948 \ - --hash=sha256:fb95debbd1a824b2c4376932f2216cc186912e389bdb0e27147778cf6acb3f89 \ +regex==2020.5.14 \ + --hash=sha256:1386e75c9d1574f6aa2e4eb5355374c8e55f9aac97e224a8a5a6abded0f9c927 \ + --hash=sha256:27ff7325b297fb6e5ebb70d10437592433601c423f5acf86e5bc1ee2919b9561 \ + --hash=sha256:329ba35d711e3428db6b45a53b1b13a0a8ba07cbbcf10bbed291a7da45f106c3 \ + --hash=sha256:3a9394197664e35566242686d84dfd264c07b20f93514e2e09d3c2b3ffdf78fe \ + --hash=sha256:51f17abbe973c7673a61863516bdc9c0ef467407a940f39501e786a07406699c \ + --hash=sha256:579ea215c81d18da550b62ff97ee187b99f1b135fd894a13451e00986a080cad \ + --hash=sha256:70c14743320a68c5dac7fc5a0f685be63bc2024b062fe2aaccc4acc3d01b14a1 \ + --hash=sha256:7e61be8a2900897803c293247ef87366d5df86bf701083b6c43119c7c6c99108 \ + --hash=sha256:8044d1c085d49673aadb3d7dc20ef5cb5b030c7a4fa253a593dda2eab3059929 \ + --hash=sha256:89d76ce33d3266173f5be80bd4efcbd5196cafc34100fdab814f9b228dee0fa4 \ + --hash=sha256:99568f00f7bf820c620f01721485cad230f3fb28f57d8fbf4a7967ec2e446994 \ + --hash=sha256:a7c37f048ec3920783abab99f8f4036561a174f1314302ccfa4e9ad31cb00eb4 \ + --hash=sha256:c2062c7d470751b648f1cacc3f54460aebfc261285f14bc6da49c6943bd48bdd \ + --hash=sha256:c9bce6e006fbe771a02bda468ec40ffccbf954803b470a0345ad39c603402577 \ + --hash=sha256:ce367d21f33e23a84fb83a641b3834dd7dd8e9318ad8ff677fbfae5915a239f7 \ + --hash=sha256:ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5 \ + --hash=sha256:ce5cc53aa9fbbf6712e92c7cf268274eaff30f6bd12a0754e8133d85a8fb0f5f \ + --hash=sha256:d466967ac8e45244b9dfe302bbe5e3337f8dc4dec8d7d10f5e950d83b140d33a \ + --hash=sha256:d881c2e657c51d89f02ae4c21d9adbef76b8325fe4d5cf0e9ad62f850f3a98fd \ + --hash=sha256:e565569fc28e3ba3e475ec344d87ed3cd8ba2d575335359749298a0899fe122e \ + --hash=sha256:ea55b80eb0d1c3f1d8d784264a6764f931e172480a2f1868f2536444c5f01e01 \ # via -r /opt/base-requirements.txt, black requests==2.23.0 \ --hash=sha256:43999036bfa82904b6af1d99e4882b560e5e2c68e5c4b0aa03b655f3d7d73fee \ @@ -383,22 +366,21 @@ safety==1.9.0 \ --hash=sha256:23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9 \ --hash=sha256:86c1c4a031fe35bd624fce143fbe642a0234d29f7cbf7a9aa269f244a955b087 \ # via -r /opt/base-requirements.txt -six==1.14.0 \ - --hash=sha256:236bdbdce46e6e6a3d61a337c0f8b763ca1e8717c03b369e87a7ec7ce1319c0a \ - --hash=sha256:8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c \ +six==1.15.0 \ + --hash=sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259 \ + --hash=sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced \ # via -r /opt/base-requirements.txt, ecdsa, flask-apispec, flask-cors, packaging, python-jose, traitlets snowballstemmer==2.0.0 \ --hash=sha256:209f257d7533fdb3cb73bdbd24f436239ca3b2fa67d56f6ff88e86be08cc5ef0 \ --hash=sha256:df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52 \ # via -r /opt/base-requirements.txt, pydocstyle -toml==0.10.0 \ - --hash=sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c \ - --hash=sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e \ - --hash=sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3 \ +toml==0.10.1 \ + --hash=sha256:926b612be1e5ce0634a2ca03470f95169cf16f939018233a670519cb4ac58b0f \ + --hash=sha256:bda89d5935c2eac546d648028b9901107a595863cb36bae0c73ac804a9b4ce88 \ # via -r /opt/base-requirements.txt, black, dparse -tqdm==4.45.0 \ - --hash=sha256:00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81 \ - --hash=sha256:ea9e3fd6bd9a37e8783d75bfc4c1faf3c6813da6bd1c3e776488b41ec683af94 \ +tqdm==4.46.0 \ + --hash=sha256:4733c4a10d0f2a4d098d801464bdaf5240c7dadd2a7fde4ee93b0a0efd9fb25e \ + --hash=sha256:acdafb20f51637ca3954150d0405ff1a7edde0ff19e38fb99a80a66210d2a28f \ # via -r /opt/requirements/requirements.in traitlets==4.3.3 \ --hash=sha256:70b4c6a1d9019d7b4f6846832288f86998aa3b9207c6821f3578a6a6a467fe44 \ @@ -448,9 +430,55 @@ zipp==3.1.0 \ --hash=sha256:aa36550ff0c0b7ef7fa639055d797116ee891440eac1a56f378e2d3179e0320b \ --hash=sha256:c599e4d75c98f6798c509911d08a22e6c021d074469042177c8c86fb92eefd96 \ # via -r /opt/base-requirements.txt, importlib-metadata +zope.event==4.4 \ + --hash=sha256:69c27debad9bdacd9ce9b735dad382142281ac770c4a432b533d6d65c4614bcf \ + --hash=sha256:d8e97d165fd5a0997b45f5303ae11ea3338becfe68c401dd88ffd2113fe5cae7 \ + # via -r /opt/base-requirements.txt, gevent +zope.interface==5.1.0 \ + --hash=sha256:0103cba5ed09f27d2e3de7e48bb320338592e2fabc5ce1432cf33808eb2dfd8b \ + --hash=sha256:14415d6979356629f1c386c8c4249b4d0082f2ea7f75871ebad2e29584bd16c5 \ + --hash=sha256:1ae4693ccee94c6e0c88a4568fb3b34af8871c60f5ba30cf9f94977ed0e53ddd \ + --hash=sha256:1b87ed2dc05cb835138f6a6e3595593fea3564d712cb2eb2de963a41fd35758c \ + --hash=sha256:269b27f60bcf45438e8683269f8ecd1235fa13e5411de93dae3b9ee4fe7f7bc7 \ + --hash=sha256:27d287e61639d692563d9dab76bafe071fbeb26818dd6a32a0022f3f7ca884b5 \ + --hash=sha256:39106649c3082972106f930766ae23d1464a73b7d30b3698c986f74bf1256a34 \ + --hash=sha256:40e4c42bd27ed3c11b2c983fecfb03356fae1209de10686d03c02c8696a1d90e \ + --hash=sha256:461d4339b3b8f3335d7e2c90ce335eb275488c587b61aca4b305196dde2ff086 \ + --hash=sha256:4f98f70328bc788c86a6a1a8a14b0ea979f81ae6015dd6c72978f1feff70ecda \ + --hash=sha256:558a20a0845d1a5dc6ff87cd0f63d7dac982d7c3be05d2ffb6322a87c17fa286 \ + --hash=sha256:562dccd37acec149458c1791da459f130c6cf8902c94c93b8d47c6337b9fb826 \ + --hash=sha256:5e86c66a6dea8ab6152e83b0facc856dc4d435fe0f872f01d66ce0a2131b7f1d \ + --hash=sha256:60a207efcd8c11d6bbeb7862e33418fba4e4ad79846d88d160d7231fcb42a5ee \ + --hash=sha256:645a7092b77fdbc3f68d3cc98f9d3e71510e419f54019d6e282328c0dd140dcd \ + --hash=sha256:6874367586c020705a44eecdad5d6b587c64b892e34305bb6ed87c9bbe22a5e9 \ + --hash=sha256:74bf0a4f9091131de09286f9a605db449840e313753949fe07c8d0fe7659ad1e \ + --hash=sha256:7b726194f938791a6691c7592c8b9e805fc6d1b9632a833b9c0640828cd49cbc \ + --hash=sha256:8149ded7f90154fdc1a40e0c8975df58041a6f693b8f7edcd9348484e9dc17fe \ + --hash=sha256:8cccf7057c7d19064a9e27660f5aec4e5c4001ffcf653a47531bde19b5aa2a8a \ + --hash=sha256:911714b08b63d155f9c948da2b5534b223a1a4fc50bb67139ab68b277c938578 \ + --hash=sha256:a5f8f85986197d1dd6444763c4a15c991bfed86d835a1f6f7d476f7198d5f56a \ + --hash=sha256:a744132d0abaa854d1aad50ba9bc64e79c6f835b3e92521db4235a1991176813 \ + --hash=sha256:af2c14efc0bb0e91af63d00080ccc067866fb8cbbaca2b0438ab4105f5e0f08d \ + --hash=sha256:b054eb0a8aa712c8e9030065a59b5e6a5cf0746ecdb5f087cca5ec7685690c19 \ + --hash=sha256:b0becb75418f8a130e9d465e718316cd17c7a8acce6fe8fe07adc72762bee425 \ + --hash=sha256:b1d2ed1cbda2ae107283befd9284e650d840f8f7568cb9060b5466d25dc48975 \ + --hash=sha256:ba4261c8ad00b49d48bbb3b5af388bb7576edfc0ca50a49c11dcb77caa1d897e \ + --hash=sha256:d1fe9d7d09bb07228650903d6a9dc48ea649e3b8c69b1d263419cc722b3938e8 \ + --hash=sha256:d7804f6a71fc2dda888ef2de266727ec2f3915373d5a785ed4ddc603bbc91e08 \ + --hash=sha256:da2844fba024dd58eaa712561da47dcd1e7ad544a257482392472eae1c86d5e5 \ + --hash=sha256:dcefc97d1daf8d55199420e9162ab584ed0893a109f45e438b9794ced44c9fd0 \ + --hash=sha256:dd98c436a1fc56f48c70882cc243df89ad036210d871c7427dc164b31500dc11 \ + --hash=sha256:e74671e43ed4569fbd7989e5eecc7d06dc134b571872ab1d5a88f4a123814e9f \ + --hash=sha256:eb9b92f456ff3ec746cd4935b73c1117538d6124b8617bc0fe6fda0b3816e345 \ + --hash=sha256:ebb4e637a1fb861c34e48a00d03cffa9234f42bef923aec44e5625ffb9a8e8f9 \ + --hash=sha256:ef739fe89e7f43fb6494a43b1878a36273e5924869ba1d866f752c5812ae8d58 \ + --hash=sha256:f40db0e02a8157d2b90857c24d89b6310f9b6c3642369852cdc3b5ac49b92afc \ + --hash=sha256:f68bf937f113b88c866d090fea0bc52a098695173fc613b055a17ff0cf9683b6 \ + --hash=sha256:fb55c182a3f7b84c1a2d6de5fa7b1a05d4660d866b91dbf8d74549c57a1499e8 \ + # via -r /opt/base-requirements.txt, gevent # The following packages are considered to be unsafe in a requirements file: -setuptools==46.1.3 \ - --hash=sha256:4fe404eec2738c20ab5841fa2d791902d2a645f32318a7850ef26f8d7215a8ee \ - --hash=sha256:795e0475ba6cd7fa082b1ee6e90d552209995627a2a227a47c6ea93282f4bfb1 \ - # via -r /opt/base-requirements.txt, gunicorn, ipython, safety +setuptools==46.4.0 \ + --hash=sha256:4334fc63121aafb1cc98fd5ae5dd47ea8ad4a38ad638b47af03a686deb14ef5b \ + --hash=sha256:d05c2c47bbef97fd58632b63dd2b83426db38af18f65c180b2423fea4b67e6b8 \ + # via -r /opt/base-requirements.txt, gevent, gunicorn, ipython, safety, zope.event, zope.interface