Change requirements.txt to requirements-dev.txt and clean up dependen…

…cy versioning. (#978)
arrow-py · May 16, 2021 · 119bb67 · 119bb67
1 parent 05c1a1a
commit 119bb67
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 33 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -33,7 +33,7 @@ jobs:
         if: startsWith(runner.os, 'Linux')
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
@@ -42,7 +42,7 @@ jobs:
         if: startsWith(runner.os, 'macOS')
         with:
           path: ~/Library/Caches/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
@@ -51,7 +51,7 @@ jobs:
         if: startsWith(runner.os, 'Windows')
         with:
           path: ~\AppData\Local\pip\Cache
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 
@@ -85,17 +85,17 @@ jobs:
       - uses: actions/checkout@v2
 
       # Set up Python
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: "3.8"
+          python-version: "3.9"
 
       # Configure pip cache
       - name: Cache pip
         uses: actions/cache@v2
         with:
           path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements-dev.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,7 +2,7 @@ default_language_version:
   python: python3
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -20,7 +20,7 @@ repos:
     hooks:
       - id: isort
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.15.0
+    rev: v2.16.0
     hooks:
       - id: pyupgrade
         args: [--py36-plus]
@@ -34,7 +34,7 @@ repos:
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
   - repo: https://github.com/psf/black
-    rev: 21.5b0
+    rev: 21.5b1
     hooks:
       - id: black
         args: [--safe, --quiet, --target-version=py36]

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,3 @@
-include LICENSE CHANGELOG.rst README.rst Makefile requirements.txt tox.ini
+include LICENSE CHANGELOG.rst README.rst Makefile requirements-dev.txt tox.ini
 recursive-include tests *.py
 recursive-include docs *.py *.rst *.bat Makefile
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: auto test docs clean
 
-auto: build38
+auto: build39
 
 build36: PYTHON_VER = python3.6
 build37: PYTHON_VER = python3.7
@@ -11,7 +11,7 @@ build36 build37 build38 build39: clean
 	$(PYTHON_VER) -m venv venv
 	. venv/bin/activate; \
 	pip install -U pip setuptools wheel; \
-	pip install -r requirements.txt; \
+	pip install -r requirements-dev.txt; \
 	pre-commit install
 
 test:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -0,0 +1,10 @@
+dateparser==1.*
+pre-commit==2.*
+pytest==6.*
+pytest-cov==2.*
+pytest-mock==3.*
+python-dateutil==2.*
+pytz==2019.*
+simplejson==3.*
+sphinx==4.*
+sphinx-autodoc-typehints==1.*
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
@@ -23,12 +23,8 @@ warn_unreachable = True
 strict_equality = True
 no_implicit_reexport = True
 
-##
-
 allow_redefinition = True
 
-
-# Type annotation for test codes and migration files are not mandatory
-
+# Type annotations for testing code and migration files are not mandatory
 [mypy-*.tests.*,tests.*]
 ignore_errors = True
diff --git a/setup.py b/setup.py
@@ -1,12 +1,12 @@
 # mypy: ignore-errors
-from setuptools import setup
+from pathlib import Path
 
-with open("README.rst", encoding="utf-8") as f:
-    readme = f.read()
+from setuptools import setup
 
+readme = Path("README.rst").read_text(encoding="utf-8")
+version = Path("arrow/_version.py").read_text(encoding="utf-8")
 about = {}
-with open("arrow/_version.py", encoding="utf-8") as f:
-    exec(f.read(), about)
+exec(version, about)
 
 setup(
     name="arrow",

diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,7 @@ python =
     3.9: py39
 
 [testenv]
-deps = -rrequirements.txt
+deps = -rrequirements-dev.txt
 allowlist_externals = pytest
 commands = pytest