Merge requirements (#273)

* Merge requirements

* Cleanup requirements

* Fix

* Fix

* Fix readthedocs

* Fix

* Fix

* fix

* fix

Author: asvetlov

.github/workflows/ci.yml

@@ -34,10 +34,10 @@ jobs:
     - name: Install dependencies
       uses: py-actions/py-dependency-install@v3
       with:
-        path: requirements/flake.txt
+        path: requirements/ci.txt
     - name: Install itself
       run: |
-        python setup.py install
+        pip install .
       env:
         FROZENLIST_NO_EXTENSIONS: 1
     - name: Run flake8
@@ -52,8 +52,7 @@ jobs:
     - name: Install spell checker
       run: |
         sudo apt install libenchant-dev
-        pip install -r requirements/doc-spelling.txt
-        pip install -r requirements/towncrier.txt
+        pip install -r requirements/doc.txt
     - name: Run docs spelling
       run: |
         towncrier --yes
@@ -76,7 +75,7 @@ jobs:
     needs: [lint]
     strategy:
       matrix:
-        pyver: ['3.6', '3.7', '3.8', '3.9', '3.10']
+        pyver: ['3.7', '3.8', '3.9', '3.10']
         no-extensions: ['', 'Y']
         os: [ubuntu, macos, windows]
         exclude:
@@ -109,19 +108,17 @@ jobs:
         path: ${{ steps.pip-cache.outputs.dir }}
         restore-keys: |
             pip-ci-${{ runner.os }}-${{ matrix.pyver }}-{{ matrix.no-extensions }}-
-    - name: Install cython
-      if: matrix.no-extensions == ''
+    - name: Install dependencies
       uses: py-actions/py-dependency-install@v3
       with:
-        path: requirements/cython.txt
+        path: requirements/ci.txt
     - name: Cythonize
       if: matrix.no-extensions == ''
       run: |
         make cythonize
-    - name: Install dependencies
-      uses: py-actions/py-dependency-install@v3
-      with:
-        path: requirements/dev.txt
+    - name: Install itself
+      run: |
+        pip install .
       env:
         FROZENLIST_NO_EXTENSIONS: ${{ matrix.no-extensions }}
     - name: Run unittests
@@ -171,7 +168,7 @@ jobs:
     - name: Install cython
       uses: py-actions/py-dependency-install@v3
       with:
-        path: requirements/cython.txt
+        path: requirements/ci.txt
     - name: Cythonize
       run: |
         make cythonize
@@ -222,7 +219,7 @@ jobs:
     - name: Install cython
       uses: py-actions/py-dependency-install@v3
       with:
-        path: requirements/cython.txt
+        path: requirements/ci.txt
     - name: Cythonize
       run: |
         make cythonize

Makefile

@@ -6,7 +6,7 @@ SRC = frozenlist tests setup.py
 all: test
 
 .install-cython:
-	pip install -r requirements/cython.txt
+	pip install -r requirements/ci.txt
 	touch .install-cython
 
 frozenlist/%.c: frozenlist/%.pyx
@@ -15,7 +15,7 @@ frozenlist/%.c: frozenlist/%.pyx
 cythonize: .install-cython $(PYXS:.pyx=.c)
 
 .install-deps: cythonize $(shell find requirements -type f)
-	pip install -r requirements/dev.txt
+	pip install -r requirements/ci.txt
 	@touch .install-deps
 
 lint: flake isort-check flake8
@@ -57,7 +57,7 @@ check_changes:
 	./tools/check_changes.py
 
 .develop: .install-deps $(shell find frozenlist -type f) .flake check_changes mypy
-	# pip install -e .
+	pip install -e .
 	@touch .develop
 
 test: .develop

requirements/ci-wheel.txt

@@ -1,6 +1,10 @@
+coverage==6.2
+cython==0.29.26
+flake8==4.0.1
+isort==5.10.1
 mypy==0.931; implementation_name=="cpython"
-mypy-extensions==0.4.3; implementation_name=="cpython"
-
--r ci-wheel.txt
--r doc.txt
--e .
+pytest==6.2.5
+pytest-cov==3.0.0
+towncrier==21.3.0
+tox==3.24.5
+twine==3.7.1

requirements/ci.txt

@@ -1,3 +1,2 @@
--r ci.txt
--r towncrier.txt
-cherry_picker==2.1.0; python_version>="3.6"
+-e .
+-r dev.txt

requirements/cython.txt

@@ -1,3 +1,3 @@
-sphinx==4.4.0
-pygments>=2.1
 aiohttp-theme==0.1.6
+sphinx==4.4.0
+sphinxcontrib-spelling==7.3.2; platform_system!="Windows"