Pass cleaninstall (facebookresearch#4900)

* address failing clean install * protbuf * api * keep going * finally * add ninja back * CORRECT PROTO
tancnle · Dec 2, 2022 · 9fcd098 · 9fcd098
1 parent 4c96c88
commit 9fcd098
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -219,26 +219,26 @@ commands:
             - setupcuda
       - fixgit
       - restore_cache:
-          key: deps-20221115-<< parameters.cachename >>-{{ checksum "requirements.txt" }}
+          key: deps-20221130-<< parameters.cachename >>-{{ checksum "requirements.txt" }}
       - setup
       - installdeps
       - << parameters.more_installs >>
       - save_cache:
-          key: deps-20221115-<< parameters.cachename >>-{{ checksum "requirements.txt" }}
+          key: deps-20221130-<< parameters.cachename >>-{{ checksum "requirements.txt" }}
           paths:
             - "~/venv/bin"
             - "~/venv/lib"
       - findtests:
           marker: << parameters.marker >>
       - restore_cache:
-          key: data-20221115-<< parameters.cachename >>-{{ checksum "teststorun.txt" }}
+          key: data-20221130-<< 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-20221115-<< parameters.cachename >>-{{ checksum "teststorun.txt" }}
+          key: data-20221130-<< parameters.cachename >>-{{ checksum "teststorun.txt" }}
           paths:
             - "~/ParlAI/data"
       - codecov
@@ -255,12 +255,12 @@ commands:
       - checkout
       - fixgit
       - restore_cache:
-          key: deps-20221115-bw-{{ checksum "requirements.txt" }}
+          key: deps-20221130-bw-{{ checksum "requirements.txt" }}
       - setup
       - installdeps
       - installtorchgpu
       - save_cache:
-          key: deps-20221115-bw-{{ checksum "requirements.txt" }}
+          key: deps-20221130-bw-{{ checksum "requirements.txt" }}
           paths:
             - "~/venv/bin"
             - "~/venv/lib"

diff --git a/requirements.txt b/requirements.txt
@@ -41,22 +41,22 @@ sphinx_rtd_theme==0.4.3
 sphinx-autodoc-typehints~=1.10.3
 Sphinx~=2.2.0
 subword-nmt==0.3.7
-tensorboardX==2.5.1
+tensorboardX<=2.5.0
 tokenizers>=0.8.0
 tomli>=2.0.0
 torchtext>=0.5.0,<=0.13.1
 tornado==6.0.4
 tqdm~=4.62.1
 typing-extensions==3.7.4.3
 Unidecode==1.1.1
-urllib3>=1.26.5
+urllib3<1.27,>=1.26.5
 websocket-client==0.56.0
 jsonlines==1.2.0
-numpy~=1.22 
+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,>=3.8.0
+protobuf<=3.20.3, >=3.8.0
 contractions~=0.1.72
 fsspec~=2022.2.0
-google-api-core<=2.10.1 # Latest 2.10.2 requires latest protobuf
+google-api-core<=2.11.0 # Latest 2.10.2 requires latest protobuf