merge requirements

Dockerfile

@@ -79,36 +79,22 @@ ADD . ${GRR_SOURCE}
 WORKDIR ${GRR_SOURCE}
 
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/proto/requirements/ubuntu.txt
+  -r travis/requirements/ubuntu.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/proto
 
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/core/requirements/ubuntu.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/core
 
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/client/requirements/ubuntu.txt
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
--r grr/client/requirements/ubuntu_only.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/client
 
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/server/requirements/ubuntu.txt
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/server/requirements/ubuntu_only.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/server
 
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r grr/client_builder/requirements/ubuntu.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e grr/client_builder
 
-RUN ${VIRTUAL_ENV}/bin/python -m pip install --require-hashes \
-  -r api_client/python/requirements/ubuntu.txt
 RUN ${VIRTUAL_ENV}/bin/python -m pip install --no-deps --no-index \
   -e api_client/python
 

appveyor/windows_templates/build_windows_templates.py

@@ -189,7 +189,7 @@ def MakeProtoSdist(self):
     ])
     return glob.glob(
         os.path.join(args.build_dir, "grr_response_proto-*.zip")
-    ).pop(), [os.path.join(args.grr_src, "grr", "proto", "requirements", "windows.txt")]
+    ).pop()
 
   def MakeCoreSdist(self):
     os.chdir(os.path.join(args.grr_src, "grr/core"))
@@ -203,7 +203,7 @@ def MakeCoreSdist(self):
     ])
     return glob.glob(
         os.path.join(args.build_dir, "grr_response_core-*.zip")
-    ).pop(), [os.path.join(args.grr_src, "grr", "core", "requirements", "windows.txt")]
+    ).pop()
 
   def MakeClientSdist(self):
     os.chdir(os.path.join(args.grr_src, "grr/client/"))
@@ -216,10 +216,7 @@ def MakeClientSdist(self):
     ])
     return glob.glob(
         os.path.join(args.build_dir, "grr_response_client-*.zip")
-    ).pop(), [
-      os.path.join(args.grr_src, "grr", "client", "requirements", "windows.txt"),
-      os.path.join(args.grr_src, "grr", "client", "requirements", "windows_only.txt"),
-    ] 
+    ).pop()
 
   def MakeClientBuilderSdist(self):
     os.chdir(os.path.join(args.grr_src, "grr/client_builder/"))
@@ -232,15 +229,14 @@ def MakeClientBuilderSdist(self):
     ])
     return glob.glob(
         os.path.join(args.build_dir, "grr_response_client_builder-*.zip")
-    ).pop(), [os.path.join(args.grr_src, "grr", "client_builder", "requirements", "windows.txt")]
+    ).pop()
 
-  def InstallGRR(self, path: str, requirements_files: Optional[List[str]] = None):
-    """Installs GRR."""
-    if requirements_files:
-      for req_file in requirements_files:
-        install_requirements_cmd = ["pip", "install", "--require-hashes", "-r", req_file]
-        subprocess.check_call(install_requirements_cmd)
+  def InstallRequirements(self, requirements_file: str) -> None:
+      install_requirements_cmd = ["pip", "install", "--require-hashes", "-r", requirements_file]
+      subprocess.check_call(install_requirements_cmd)
 
+  def InstallGRR(self, path: str):
+    """Installs GRR."""
     cmd64 = ["pip", "install", "--no-deps", "--no-index"]
 
     if args.wheel_dir:
@@ -429,15 +425,19 @@ def Build(self):
 
     if not os.path.exists(args.grr_src):
       self.GitCheckoutGRR()
-    proto_sdist, proto_requirements = self.MakeProtoSdist()
-    core_sdist, core_requirements = self.MakeCoreSdist()
-    client_sdist, client_requirements = self.MakeClientSdist()
-    client_builder_sdist, client_builder_requirements = self.MakeClientBuilderSdist()
-
-    self.InstallGRR(proto_sdist, proto_requirements)
-    self.InstallGRR(core_sdist, core_requirements)
-    self.InstallGRR(client_sdist, client_requirements)
-    self.InstallGRR(client_builder_sdist, client_builder_requirements)
+    proto_sdist = self.MakeProtoSdist()
+    core_sdist = self.MakeCoreSdist()
+    client_sdist = self.MakeClientSdist()
+    client_builder_sdist = self.MakeClientBuilderSdist()
+
+    self.InstallRequirements(os.path.join(
+        args.grr_src, "travis/requirements/windows.txt"
+    ))
+
+    self.InstallGRR(proto_sdist)
+    self.InstallGRR(core_sdist)
+    self.InstallGRR(client_sdist)
+    self.InstallGRR(client_builder_sdist)
     self.BuildTemplates()
     if args.test_repack_install:
       self._RepackTemplates()