Update setup (#227)

* remove redundant requirements files * update setup.py and remove redundant functions * update setup.py classifiers * add requirements.txt for tox.ini to use * update requirements.txt related settings * update dependencies version * update pkg version & introduce pytest-cov * update python version * Update .gitignore & LICENSE (#225) * update .gitignore & LICENSE * remove contribution section and add alternative choice * [docs] Remove docs $ prefix (#229) * remove docs $ prefix * align code indent * Dev debug pytest (#230) * add import hint for pytest * update pytest usage * update deprecated scrapy.utils.request usage * Update .gitignore & LICENSE (#225) * update .gitignore & LICENSE * remove contribution section and add alternative choice * [docs] Remove docs $ prefix (#229) * remove docs $ prefix * align code indent * add import hint for pytest * add import hint for pytest * add text color helper * add json type check add json formatted_data type check and warning message * fix subset not equal assert * update test & install guide * fix push json (#239) * Remove python 2.x support (#231) * remove python 2.x support * python3.6 has already deprecated * update import scrapy_redis.utils (#232) * [test] Dev flake8 style (#233) * add flake8 rules * add flake8 guide * fix flake8 style suggestion * [test] Dev bandit (#234) * add bandit rules * add bandit badge * fix CWE-703 * [test] Dev tox (#237) * update tox.ini * fix push json (#239) * Remove python 2.x support (#231) * remove python 2.x support * python3.6 has already deprecated * update import scrapy_redis.utils (#232) * [test] Dev flake8 style (#233) * add flake8 rules * add flake8 guide * fix flake8 style suggestion * [test] Dev bandit (#234) * add bandit rules * add bandit badge * fix CWE-703 * replace pkg coverage with pytest-cov * update CONTRIBUTING.rst to meet tox requirements * update list indexes Co-authored-by: songhao <[email protected]> * [docs] Update README.md (#236) * landscape.io is already down * update requires.io badge update requires.io badge, local temporarily * update badge source * update requirements version * fix gh copy function * fix gh copy function * fix gh copy function * fix gh copy function * move running example section to example/ * update links * update indent * Update contribution link * [dev] Default value for json support data (#240) * give default value to variable for push json * add make_request_from_data comment * update json supported data guide * update json supported data guide Co-authored-by: LuckyPigeon <[email protected]> * update flake8 Co-authored-by: songhao <[email protected]>
rmax · May 16, 2022 · a0342cc · a0342cc
1 parent cade7d3
commit a0342cc
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 26 deletions.
diff --git a/.flake8 b/.flake8
@@ -5,4 +5,5 @@ max-line-length = 119
 ignore = W503
 
 exclude =
-    tests/test_spiders.py E731
+    tests/test_spiders.py E731
+    docs/conf.py E265
diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -10,9 +10,9 @@ build:
     # For available versions, see:
     # https://docs.readthedocs.io/en/stable/config-file/v2.html#build-tools-python
     python: "3.7"  # Keep in sync with .github/workflows/checks.yml
-    scrapy: "2.5.1"
+    scrapy: "2.6.1"
 
 python:
   install:
-    - requirements: ./requirements-dev.txt
+    - requirements: docs/requirements.txt
     - path: .
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,8 @@
-# Readthedocs workaround.
-# This should be installed using pip from the root directory.
--e .
+# This packages are requires only for development and release management.
+Sphinx
+bumpversion
+check-manifest
+pip-tools
+twine
+watchdog
+wheel
diff --git a/requirements-dev.txt b/requirements-dev.txt
diff --git a/requirements-install.txt b/requirements-install.txt
diff --git a/requirements-setup.txt b/requirements-setup.txt
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,9 @@
+scrapy>=2.0
+redis>=4.0
+six>=1.15
+coverage
+flake8
+mock
+pytest
+tox
+pytest-cov
diff --git a/setup.py b/setup.py
@@ -37,8 +37,7 @@ def read_requirements(filename):
     url='https://github.com/rolando/scrapy-redis',
     packages=list(find_packages('src')),
     package_dir={'': 'src'},
-    setup_requires=read_requirements('requirements-setup.txt'),
-    install_requires=read_requirements('requirements-install.txt'),
+    install_requires=read_requirements('requirements.txt'),
     include_package_data=True,
     license="MIT",
     keywords='scrapy-redis',
@@ -47,10 +46,10 @@ def read_requirements(filename):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
     ],
 )