trying to fix CI build

mozilla · Nov 8, 2023 · ee556e3 · ee556e3
1 parent a32712b
commit ee556e3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -32,16 +32,17 @@ test_settings: &test_settings
         command: |
           # python-snappy compression relies on C bindings to libsnappy-dev.
           # pyspark needs to run Java, so we install openjdk.
-          echo "deb [check-valid-until=no] http://cdn-fastly.deb.debian.org/debian jessie main" > /etc/apt/sources.list.d/jessie.list
-          echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/jessie-backports.list
-          sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
+          sed -i 's/^/#/' /etc/apt/sources.list
+          echo "deb [check-valid-until=no] http://archive.debian.org/debian-archive/debian jessie main" >> /etc/apt/sources.list.d/jessie.list
+          echo "deb [check-valid-until=no] http://archive.debian.org/debian-archive/debian jessie-backports main" >> /etc/apt/sources.list.d/jessie-backports.list
+          # sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
           apt-get -o Acquire::Check-Valid-Until=false update
-          apt-get install -t jessie-backports -y libsnappy-dev openjdk-8-jre-headless
+          apt-get install --force-yes -t jessie-backports -y libsnappy-dev openjdk-8-jre-headless
           /usr/sbin/update-java-alternatives -s java-1.8.0-openjdk-amd64
     - run: &run_tox_environment_matching_circleci_job_name
         name: Run tox job
         command: |
-          pip install tox
+          pip install tox==3.24.5
           tox -e $CIRCLE_JOB
     # - run:
     #     name: Submit code coverage data
@@ -127,7 +128,7 @@ jobs:
     - run:
         name: Run tests
         command: |
-          pip install flake8
+          pip install flake8==3.9.1
           flake8 moztelemetry/ tests/
 
   # Only runs when a tag starting with 'v' is place on the repository;

diff --git a/setup.py b/setup.py
@@ -6,8 +6,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 from setuptools import setup, find_packages
 
-tests_require = ['mock', 'pytest-timeout', 'moto', 'responses',
-                 'scipy', 'pyspark', 'pytest', 'pytest-cov']
+tests_require = [
+    'mock>=3.0.4,<=5.0.0',
+    'pytest-timeout>=1.3.4,<=2.0.2',
+    'moto>=2.2.15,<=2.2.20',
+    'responses>=0.16.0,<=0.18.0',
+    'scipy>=1.3.3,<=1.9.2',
+    'pyspark>=2.2.3,<=3.2.4',
+    'pytest>=5.3.1,<=6.2.4',
+    'pytest-cov>2.6.0,<=2.8.0',
+    'flake8>3.8.3,<=3.9.1',
+]
 
 setup(
     name='python_moztelemetry',
@@ -21,21 +30,24 @@
     install_requires=[
         'boto<=2.49.0',
         'boto3<=1.28.57',
-        'ujson<=5.8.0',
-        'requests>2.30.0,<=2.31.0',
-        'protobuf>=3.6.0',
+        'ujson>=4.0.2,<=5.6.0',
+        'requests>2.24.0,<=2.31.0',
+        # 'protobuf>=3.6.0',
         'six==1.12',
         'expiringdict==1.2.2',
         "functools32;python_version<'3'",
-        'py4j==0.10.9.7',
+        'py4j>=0.10.9.4,<=0.10.9.7',
         'pandas>=0.19.2',
         'numpy>=1.8.2',
         'PyYAML==5.1.2',
         'python-snappy==0.6.1',
         'urllib3<1.27,>=1.25.4',
         'typed-ast<1.5,>=1.4.0'
     ],
-    setup_requires=['pytest-runner', 'setuptools_scm==7.1.0'],
+    setup_requires=[
+        'pytest-runner>=5.2,<=5.3.2',
+        'setuptools_scm>=4.1.2,<=7.0.5'
+    ],
     extras_require={
         'testing': tests_require,
     },