From 579fede18f3b0be5a361622a20401759439e6f43 Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:21:08 -0700 Subject: [PATCH 1/8] upgrade protobuf --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 0e6b7daeb79..adfb63e9a75 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf<=3.19.6,>=3.19.5 +protobuf~=3.20 contractions~=0.1.72 fsspec~=2022.2.0 From 9888883112be0950de518c2a8583097a237d5cdb Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:30:15 -0700 Subject: [PATCH 2/8] updating tensorboard --- .circleci/config.yml | 12 ++++++------ requirements.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f6c0075a5f2..48cb4348e92 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -219,26 +219,26 @@ commands: - setupcuda - fixgit - restore_cache: - key: deps-20221027-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221101-<< parameters.cachename >>-{{ checksum "requirements.txt" }} - setup - installdeps - << parameters.more_installs >> - save_cache: - key: deps-20221027-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221101-<< parameters.cachename >>-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" - findtests: marker: << parameters.marker >> - restore_cache: - key: data-20221027-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221101-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} - run: name: Run tests no_output_timeout: 60m command: | coverage run -m pytest -m << parameters.marker >> << parameters.pytest_flags >> --junitxml=test-results/junit.xml - save_cache: - key: data-20221027-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221101-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} paths: - "~/ParlAI/data" - codecov @@ -255,12 +255,12 @@ commands: - checkout - fixgit - restore_cache: - key: deps-20221027-bw-{{ checksum "requirements.txt" }} + key: deps-20221101-bw-{{ checksum "requirements.txt" }} - setup - installdeps - installtorchgpu - save_cache: - key: deps-20221027-bw-{{ checksum "requirements.txt" }} + key: deps-20221101-bw-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" diff --git a/requirements.txt b/requirements.txt index adfb63e9a75..ba167dd1faf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -40,7 +40,7 @@ sphinx_rtd_theme==0.4.3 sphinx-autodoc-typehints~=1.10.3 Sphinx~=2.2.0 subword-nmt==0.3.7 -tensorboardX==2.1 +tensorboardX==2.5.1 tokenizers>=0.8.0 tomli>=2.0.0 torchtext>=0.5.0,<=0.13.1 From 7c402b619ae3b258ac4d4e79a710390223f65382 Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:37:04 -0700 Subject: [PATCH 3/8] specific version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ba167dd1faf..2cd82c51db6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf~=3.20 +protobuf==3.20.1 contractions~=0.1.72 fsspec~=2022.2.0 From 93b936845b7763be8201752e54ea7f5cdc575548 Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:44:35 -0700 Subject: [PATCH 4/8] weird versioning --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2cd82c51db6..39996e2e9f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf==3.20.1 +protobuf~=3.20.1 contractions~=0.1.72 fsspec~=2022.2.0 From a4984657a1ff26865c78fcd8fb126f6aaf2b8a10 Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:47:05 -0700 Subject: [PATCH 5/8] seriously, use this version --- .circleci/config.yml | 12 ++++++------ requirements.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48cb4348e92..86be2cf0014 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -219,26 +219,26 @@ commands: - setupcuda - fixgit - restore_cache: - key: deps-20221101-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221102-<< parameters.cachename >>-{{ checksum "requirements.txt" }} - setup - installdeps - << parameters.more_installs >> - save_cache: - key: deps-20221101-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221102-<< parameters.cachename >>-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" - findtests: marker: << parameters.marker >> - restore_cache: - key: data-20221101-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221102-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} - run: name: Run tests no_output_timeout: 60m command: | coverage run -m pytest -m << parameters.marker >> << parameters.pytest_flags >> --junitxml=test-results/junit.xml - save_cache: - key: data-20221101-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221102-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} paths: - "~/ParlAI/data" - codecov @@ -255,12 +255,12 @@ commands: - checkout - fixgit - restore_cache: - key: deps-20221101-bw-{{ checksum "requirements.txt" }} + key: deps-20221102-bw-{{ checksum "requirements.txt" }} - setup - installdeps - installtorchgpu - save_cache: - key: deps-20221101-bw-{{ checksum "requirements.txt" }} + key: deps-20221102-bw-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" diff --git a/requirements.txt b/requirements.txt index 39996e2e9f8..2cd82c51db6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf~=3.20.1 +protobuf==3.20.1 contractions~=0.1.72 fsspec~=2022.2.0 From ebf5bb728630c20b5fe225766ce58bc40041eb4a Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:48:21 -0700 Subject: [PATCH 6/8] seriously, use this version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2cd82c51db6..39996e2e9f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf==3.20.1 +protobuf~=3.20.1 contractions~=0.1.72 fsspec~=2022.2.0 From 798085741f8796e67621edffeca2be87e8aeccfb Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 12:54:35 -0700 Subject: [PATCH 7/8] how about that" --- .circleci/config.yml | 12 ++++++------ requirements.txt | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 86be2cf0014..71d67414a9c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -219,26 +219,26 @@ commands: - setupcuda - fixgit - restore_cache: - key: deps-20221102-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221031-<< parameters.cachename >>-{{ checksum "requirements.txt" }} - setup - installdeps - << parameters.more_installs >> - save_cache: - key: deps-20221102-<< parameters.cachename >>-{{ checksum "requirements.txt" }} + key: deps-20221031-<< parameters.cachename >>-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" - findtests: marker: << parameters.marker >> - restore_cache: - key: data-20221102-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221031-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} - run: name: Run tests no_output_timeout: 60m command: | coverage run -m pytest -m << parameters.marker >> << parameters.pytest_flags >> --junitxml=test-results/junit.xml - save_cache: - key: data-20221102-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} + key: data-20221031-<< parameters.cachename >>-{{ checksum "teststorun.txt" }} paths: - "~/ParlAI/data" - codecov @@ -255,12 +255,12 @@ commands: - checkout - fixgit - restore_cache: - key: deps-20221102-bw-{{ checksum "requirements.txt" }} + key: deps-20221031-bw-{{ checksum "requirements.txt" }} - setup - installdeps - installtorchgpu - save_cache: - key: deps-20221102-bw-{{ checksum "requirements.txt" }} + key: deps-20221031-bw-{{ checksum "requirements.txt" }} paths: - "~/venv/bin" - "~/venv/lib" diff --git a/requirements.txt b/requirements.txt index 39996e2e9f8..5c9a3e07f5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -55,6 +55,6 @@ numpy~=1.22 markdown<=3.3.2 # Pin to something that works so tests are happy jinja2==3.0.3 ninja~=1.10.2.3 -protobuf~=3.20.1 +protobuf<=3.20.1,>=3.8.0 contractions~=0.1.72 fsspec~=2022.2.0 From 87496736df216a9e483d1da128d18ba0aaf981c1 Mon Sep 17 00:00:00 2001 From: Olga Golovneva Date: Wed, 2 Nov 2022 18:16:38 -0700 Subject: [PATCH 8/8] one more limitation --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 5c9a3e07f5b..3eeb669b486 100644 --- a/requirements.txt +++ b/requirements.txt @@ -58,3 +58,4 @@ ninja~=1.10.2.3 protobuf<=3.20.1,>=3.8.0 contractions~=0.1.72 fsspec~=2022.2.0 +google-api-core<=2.10.1 # Latest 2.10.2 requires latest protobuf