Split lint and test requirements into two separate files

Author: molinav

CHANGELOG.md

@@ -7,6 +7,9 @@ since version 1.3.0.
 
 ## [Unreleased]
 
+### Changed
+- Split lint and test requirements into two separate files.
+
 ### Fixed
 - Fix setup encoding comment to deal with corner case under PowerShell.
 - Enforce dependency `numpy >= 1.21` for Python >= 3.7 due to `numpy`

packages/basemap/requirements-lint.txt

@@ -0,0 +1,13 @@
+unittest2; python_version <= "3.9"
+
+flake8 >= 2.6, < 3.0; python_version == "2.6"
+flake8 >= 2.6, < 4.0; python_version == "2.7"
+flake8 >= 2.6, < 3.0; python_version == "3.2"
+flake8 >= 2.6, < 3.0; python_version == "3.3"
+flake8 >= 2.6, < 3.9; python_version == "3.4"
+flake8 >= 2.6, < 4.1; python_version >= "3.5"
+
+astroid >= 1.6, < 2.0; python_version == "2.7"
+astroid >= 2.4, < 3.0; python_version >= "3.5"
+pylint >= 1.9, < 2.0; python_version == "2.7"
+pylint >= 2.6, < 3.0; python_version >= "3.5"

packages/basemap/requirements-dev.txt packages/basemap/requirements-test.txt

@@ -1,23 +1,12 @@
-flake8 >= 2.6, < 3.0; python_version == "2.6"
-flake8 >= 2.6, < 4.0; python_version == "2.7"
-flake8 >= 2.6, < 3.0; python_version == "3.2"
-flake8 >= 2.6, < 3.0; python_version == "3.3"
-flake8 >= 2.6, < 3.9; python_version == "3.4"
-flake8 >= 2.6, < 4.1; python_version >= "3.5"
-
-astroid >= 1.6, < 2.0; python_version == "2.7"
-astroid >= 2.4, < 3.0; python_version >= "3.5"
-pylint >= 1.9, < 2.0; python_version == "2.7"
-pylint >= 2.6, < 3.0; python_version >= "3.5"
-
-unittest2; python_version < "3.10"
+unittest2; python_version <= "3.9"
 
+typing >= 3.5, < 3.11; python_version == "3.4"
 pytest >= 3.2, < 3.3; python_version == "2.6"
 pytest >= 3.2, < 5.0; python_version == "2.7"
 pytest >= 2.9, < 3.0; python_version == "3.2"
 pytest >= 3.2, < 3.3; python_version == "3.3"
 pytest >= 3.2, < 5.0; python_version == "3.4"
-pytest >= 3.2, < 6.3; python_version == "3.5"
+pytest >= 3.2, < 6.2; python_version == "3.5"
 pytest >= 6.2.5, < 6.3; python_version >= "3.6"
 
 coverage >= 3.7, < 4.0; python_version == "3.2"

packages/basemap/setup.py

@@ -146,25 +146,20 @@ def _default_to_zip(self):
 ]
 
 # Define all the different requirements.
-dev_requires = get_content("requirements-dev.txt", splitlines=True)
-doc_requires = get_content("requirements-doc.txt", splitlines=True)
 setup_requires = get_content("requirements-setup.txt", splitlines=True)
 install_requires = get_content("requirements.txt", splitlines=True)
 if sys.version_info[:2] == (3, 2):
     # Hack for Python 3.2 because pip < 8 cannot handle version markers.
-    marker = '; python_version == "3.2"'
-    dev_requires = [
-        item.replace(marker, "") for item in dev_requires
-        if item.endswith(marker) or "python_version" not in item]
-    doc_requires = [
-        item.replace(marker, "") for item in doc_requires
-        if item.endswith(marker) or "python_version" not in item]
+    marker1 = '; python_version == "3.2"'
+    marker2 = '; python_version >= "2.7"'
     setup_requires = [
-        item.replace(marker, "") for item in setup_requires
-        if item.endswith(marker) or "python_version" not in item]
+        item.replace(marker1, "").replace(marker2, "") for item in setup_requires
+        if item.endswith(marker1) or item.endswith(marker2)
+        or "python_version" not in item]
     install_requires = [
-        item.replace(marker, "") for item in install_requires
-        if item.endswith(marker) or "python_version" not in item]
+        item.replace(marker1, "").replace(marker2, "") for item in install_requires
+        if item.endswith(marker1) or item.endswith(marker2)
+        or "python_version" not in item]
 
 setup(**{
     "name":
@@ -228,10 +223,12 @@ def _default_to_zip(self):
     "install_requires":
         install_requires,
     "extras_require": {
-        "dev":
-            dev_requires,
         "doc":
-            doc_requires,
+            get_content("requirements-doc.txt", splitlines=True),
+        "lint":
+            get_content("requirements-lint.txt", splitlines=True),
+        "test":
+            get_content("requirements-test.txt", splitlines=True),
     },
     "cmdclass": {
         "sdist": basemap_sdist,