Use pip-compile for CI dependencies (#818)

* use pip compile * use in setup.py * typo * no dead code * typos * use same version of mypy * migrate nightly as well
quantumlib · May 29, 2023 · bab637d · bab637d
1 parent 7c34b68
commit bab637d
Show file tree

Hide file tree

Showing 18 changed files with 1,010 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,10 +12,10 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
       - name: Install yapf
-        run: cat dev_tools/conf/pip-list-dev-tools.txt | grep yapf | xargs pip install
+        run: pip install -r dev_tools/requirements/format.env.txt
       - name: Format
         run: check/format-incremental
   mypy:
@@ -25,10 +25,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
       - name: Install mypy
-        run: cat dev_tools/conf/pip-list-dev-tools.txt | grep mypy | xargs pip install
+        run: pip install -r dev_tools/requirements/mypy.env.txt
       - name: Type check
         run: check/mypy
   lint:
@@ -38,10 +38,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
       - name: Install pylint
-        run: cat dev_tools/conf/pip-list-dev-tools.txt | grep "pylint\|astroid" | grep -v "#" | xargs pip install
+        run: pip install -r dev_tools/requirements/pylint.env.txt
       - name: Lint
         run: check/pylint
   pytest:
@@ -51,8 +51,8 @@ jobs:
       matrix:
         # On each operating system, check latest version of python and cirq
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ '3.9' ]
-        cirq-version: [ '~=1.0.0' ]
+        python-version: [ '3.10' ]
+        cirq-version: [ '~=1.0' ]
         # Also check least-supported versions (linux only)
         include:
           - os: ubuntu-latest
@@ -66,8 +66,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install requirements
         run: |
-          pip install -r dev_tools/conf/pip-list-dev-tools.txt
-          pip install cirq-core${{matrix.cirq-version}} cirq-google${{matrix.cirq-version}} -r requirements.txt
+          pip install -r dev_tools/requirements/pytest.env.txt
+          pip install cirq-core${{matrix.cirq-version}}
       - name: Pytest check
         run: check/pytest
         shell: bash
@@ -80,13 +80,9 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-python@v1
         with:
-          python-version: '3.8'
+          python-version: '3.10'
           architecture: 'x64'
       - name: Install requirements
-        run: |
-          pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -r dev_tools/conf/pip-list-dev-tools.txt
-          git config --global user.name ${GITHUB_ACTOR}
+        run: pip install -r dev_tools/requirements/pytest.env.txt
       - name: Coverage check
         run: check/pytest-and-incremental-coverage
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macos-latest, windows-latest ]
-        python-version: [ '3.9' ]
+        python-version: [ '3.10' ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -20,9 +20,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install requirements
         run: |
-          pip install -r dev_tools/conf/pip-list-dev-tools.txt
-          pip install -r requirements.txt
-          pip install -U cirq-core cirq-google --pre
+          pip install -r dev_tools/requirements/pytest.env.txt
+          pip install -U cirq-core --pre
       - name: Pytest check
         run: check/pytest
         shell: bash
diff --git a/dev_tools/conf/pip-list-dev-tools.txt b/dev_tools/conf/pip-list-dev-tools.txt
diff --git a/dev_tools/requirements/deps/dev-tools.txt b/dev_tools/requirements/deps/dev-tools.txt
@@ -0,0 +1,7 @@
+pip-tools
+
+-r mypy.txt
+-r pytest.txt
+-r format.txt
+-r pylint.txt
+-r packaging.txt
diff --git a/dev_tools/requirements/deps/format.txt b/dev_tools/requirements/deps/format.txt
@@ -0,0 +1 @@
+yapf~=0.27.0
diff --git a/dev_tools/requirements/deps/mypy.txt b/dev_tools/requirements/deps/mypy.txt
@@ -0,0 +1 @@
+mypy~=0.782.0
diff --git a/dev_tools/requirements/deps/packaging.txt b/dev_tools/requirements/deps/packaging.txt
@@ -0,0 +1,9 @@
+# for testing packaging in isolation
+virtualenv
+
+# for creating packages
+setuptools
+wheel
+
+# for uploading packages to pypi
+twine
diff --git a/dev_tools/requirements/deps/pylint.txt b/dev_tools/requirements/deps/pylint.txt
@@ -0,0 +1,2 @@
+pylint~=2.15.6
+
diff --git a/dev_tools/requirements/deps/pytest.txt b/dev_tools/requirements/deps/pytest.txt
@@ -0,0 +1,6 @@
+pytest
+pytest-asyncio
+pytest-cov
+pytest-xdist
+
+nbformat
diff --git a/requirements.txt → dev_tools/requirements/deps/runtime.txt b/requirements.txt → dev_tools/requirements/deps/runtime.txt
@@ -1,10 +1,12 @@
-cirq-core>=0.15.0
-cirq-google>=0.15.0
+cirq-core~=1.0
 deprecation
 h5py>=2.8
 networkx
 numpy>=1.11.0
 pubchempy
 requests>=2.18
+
+# https://github.com/scipy/scipy/issues/18250
 scipy>=1.1.0,<1.10.0
+
 sympy