From 05761621217604abb9f050485ee78a1a40b854ef Mon Sep 17 00:00:00 2001
From: Orion Martin <40585662+95-martin-orion@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:32:28 -0800
Subject: [PATCH 1/2] Revert "refactor: split dev requirements out of main
 requirements.txt"

---
 .github/workflows/python_format.yml  |  6 ++++--
 .github/workflows/testing_wheels.yml |  1 -
 MANIFEST.in                          |  1 -
 dev-requirements.txt                 |  3 ---
 docs/install_qsimcirq.md             |  6 ------
 requirements.txt                     | 12 ++++++++++--
 setup.py                             |  4 ----
 7 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 dev-requirements.txt

diff --git a/.github/workflows/python_format.yml b/.github/workflows/python_format.yml
index 213abf2e..adb5f56f 100644
--- a/.github/workflows/python_format.yml
+++ b/.github/workflows/python_format.yml
@@ -24,7 +24,9 @@ jobs:
         with:
           python-version: '3.7'
           architecture: 'x64'
-      - name: Install dev requirements
-        run: pip install -r dev-requirements.txt
+      - name: Install flynt
+        run: cat requirements.txt | grep flynt | xargs pip install
+      - name: Install black
+        run: cat requirements.txt | grep black | xargs pip install
       - name: Format
         run: check/format-incremental
diff --git a/.github/workflows/testing_wheels.yml b/.github/workflows/testing_wheels.yml
index 55dd237a..eeb4d741 100644
--- a/.github/workflows/testing_wheels.yml
+++ b/.github/workflows/testing_wheels.yml
@@ -45,7 +45,6 @@ jobs:
       CIBW_REPAIR_WHEEL_COMMAND_MACOS: ""
       # due to package and module name conflict have to temporarily move it away to run tests
       CIBW_BEFORE_TEST: "mv {package}/qsimcirq /tmp"
-      CIBW_TEST_EXTRAS: "dev"
       CIBW_TEST_COMMAND: "pytest {package}/qsimcirq_tests/qsimcirq_test.py && mv /tmp/qsimcirq {package}"
     steps:
       - uses: actions/checkout@v2
diff --git a/MANIFEST.in b/MANIFEST.in
index 4b487267..2968589b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,4 @@
 include requirements.txt
-include dev-requirements.txt
 include CMakeLists.txt
 
 graft pybind_interface
diff --git a/dev-requirements.txt b/dev-requirements.txt
deleted file mode 100644
index 4cb3afc0..00000000
--- a/dev-requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-black==20.8b1
-flynt~=0.60
-pytest
diff --git a/docs/install_qsimcirq.md b/docs/install_qsimcirq.md
index 0a0f3182..9ae35d21 100644
--- a/docs/install_qsimcirq.md
+++ b/docs/install_qsimcirq.md
@@ -17,12 +17,6 @@ Prerequisites are included in the
 [`requirements.txt`](https://github.com/quantumlib/qsim/blob/master/requirements.txt)
 file, and will be automatically installed along with qsimcirq.
 
-If you'd like to develop qsimcirq, a separate set of dependencies are includes
-in the
-[`dev-requirements.txt`](https://github.com/quantumlib/qsim/blob/master/dev-requirements.txt)
-file. You can install them with `pip3 install -r dev-requirements.txt` or
-`pip3 install qsimcirq[dev]`.
-
 ## Linux installation
 
 We provide `qsimcirq` Python wheels on 64-bit `x86` architectures with `Python 3.{6,7,8,9}`.
diff --git a/requirements.txt b/requirements.txt
index 0a95d64c..01d20cd5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,13 @@
-absl-py
+# Runtime requirements for the python 3 version of cirq.
+
 cirq-core
 numpy~=1.16
-pybind11
 typing_extensions
+absl-py
+
+# Build and test requirements
+
+black==20.8b1
+flynt~=0.60
+pybind11
+pytest
diff --git a/setup.py b/setup.py
index e1e80a70..2fc70507 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,6 @@ def build_extension(self, ext):
 
 
 requirements = open("requirements.txt").readlines()
-dev_requirements = open("dev-requirements.txt").readlines()
 
 description = "Schrödinger and Schrödinger-Feynman simulators for quantum circuits."
 
@@ -95,9 +94,6 @@ def build_extension(self, ext):
     author_email="devabathini92@gmail.com",
     python_requires=">=3.3.0",
     install_requires=requirements,
-    extras_require={
-        "dev": dev_requirements,
-    },
     license="Apache 2",
     description=description,
     long_description=long_description,

From 51ba016984d63f2594a57bbbc1b368f28e746f8d Mon Sep 17 00:00:00 2001
From: Orion Martin <40585662+95-martin-orion@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:36:00 -0800
Subject: [PATCH 2/2] Revert #469

---
 .github/workflows/cirq_compatibility.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/cirq_compatibility.yml b/.github/workflows/cirq_compatibility.yml
index f4fd7473..04e13559 100644
--- a/.github/workflows/cirq_compatibility.yml
+++ b/.github/workflows/cirq_compatibility.yml
@@ -18,7 +18,5 @@ jobs:
         run: pip3 install -U cirq --pre
       - name: Install qsim requirements
         run: pip3 install -r requirements.txt
-      - name: Install test requirements
-        run: pip3 install -r dev-requirements.txt
       - name: Run python tests
         run: make run-py-tests