update requirements to flask 2 and python version up to 3.10

Author: dennyche

.github/workflows/run_tests.yml

@@ -18,7 +18,7 @@ jobs:
       # don't cancel tests if any of the pipelines fails
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v2
@@ -27,7 +27,10 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install the package and dependencies
-      run: python setup.py install
+      run: |
+        pip install -U setuptools
+        pip install -r requirements.txt
+        python setup.py install
     - name: Lint with flake8
       run: |
         pip install flake8
@@ -36,9 +39,10 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Install testing dependencies
-      run: pip install pytest --upgrade
+      run: |
+        pip install pytest --upgrade
     - name: Test with pytest and run coverage
-      run: pytest -s -vv --color=yes
+      run: pytest -s -vv --color=yes tests
 
   coverage:
 
@@ -51,7 +55,9 @@ jobs:
       with:
         python-version: '3.8'
     - name: Install the package and dependencies
-      run: python setup.py install
+      run: |
+        pip install -r requirements-dev.txt
+        python setup.py install
     - name: Lint with flake8
       run: |
         pip install flake8
@@ -62,10 +68,8 @@ jobs:
     - name: Install testing and coverage dependencies
       run: |
         pip install coveralls coverage
-        pip install -U setuptools
-        pip install pytest --upgrade
     - name: Test with pytest with coverage
-      run: coverage run --source combojsonapi -m pytest
+      run: coverage run --source combojsonapi -m pytest tests
     - name: Trigger Coveralls
       run: coveralls --service=github
       env:

requirements.txt

@@ -1,6 +1,6 @@
-sqlalchemy<1.4
-marshmallow==3.2.1
-marshmallow_jsonapi==0.24.0
-Flask>=1.0.1,<2
+Flask>=2.0,<2.1
+marshmallow>=3.14,<3.15
+marshmallow_jsonapi>=0.24,<0.25
+sqlalchemy>=1.4,<2
 apispec[yaml]>=4.3.0,<5
-flask-combo-jsonapi
+-e git+https://github.com/AdCombo/flask-combo-jsonapi.git@d088f48a598057e7d369066891644ee56abe3b8c#egg=flask-combo-jsonapi

setup.py

@@ -1,14 +1,6 @@
-import os
-
 from setuptools import setup, find_packages
 
-__version__ = "1.1.2"
-
-
-requirements_filepath = os.path.join(os.path.dirname(__name__), "requirements.txt")
-with open(requirements_filepath) as fp:
-    install_requires = fp.read()
-
+__version__ = "2.0"
 
 def get_description():
     """
@@ -17,7 +9,6 @@ def get_description():
     with open('README.rst', 'r', encoding='utf-8') as f:
         return f.read()
 
-
 setup(
     name="ComboJSONAPI",
     version=__version__,
@@ -36,6 +27,7 @@ def get_description():
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: MIT License",
         "Topic :: Internet",
     ],
@@ -45,7 +37,7 @@ def get_description():
     include_package_data=True,
     zip_safe=False,
     platforms="any",
-    install_requires=install_requires,
+    install_requires=[],
     setup_requires=["pytest-runner"],
     tests_require=["pytest"],
     extras_require={"tests": "pytest", "docs": "sphinx"},