Merge pull request #108 from kmike/pipenv

Migrate development dependency management to pipenv
kmike · Dec 14, 2022 · 5ed6287 · 5ed6287
2 parents 8752132 + 5861a78
commit 5ed6287
Show file tree

Hide file tree

Showing 24 changed files with 258 additions and 37 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,4 @@
 [run]
 omit =
-    src/port_for/_download_ranges.py
-    src/port_for/docopt.py
+    port_for/_download_ranges.py
+    port_for/docopt.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,4 +8,4 @@ on:
 
 jobs:
   build:
-    uses: fizyk/actions-reuse/.github/workflows/pypi.yml@v1.3.1
+    uses: fizyk/actions-reuse/.github/workflows/pypi.yml@v1.6.3
diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
@@ -11,6 +11,7 @@ on:
     branches: [ master ]
 jobs:
   lint:
-    uses: fizyk/actions-reuse/.github/workflows/linters-python.yml@main
+    uses: fizyk/actions-reuse/.github/workflows/linters-python.yml@v1.6.3
     with:
+      pipenv: true
       mypy: true
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -2,7 +2,7 @@ name: Run test commands
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ master ]
 
 jobs:
 #  bump:
@@ -23,5 +23,5 @@ jobs:
         with:
           python-version: "3.11"
           pipenv-install-options: "--skip-lock"
-          command: towncrier check --compare-with origin/main
+          command: towncrier check --compare-with origin/master
           fetch-depth: 0
diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
@@ -5,7 +5,7 @@ on:
       - v*
 jobs:
   build:
-    uses: fizyk/actions-reuse/.github/workflows/pypi.yml@v1.3.1
+    uses: fizyk/actions-reuse/.github/workflows/pypi.yml@v1.6.3
     with:
       publish: true
     secrets:

diff --git a/.github/workflows/tests-macos.yml b/.github/workflows/tests-macos.yml
@@ -17,8 +17,9 @@ on:
 
 jobs:
   tests:
-    uses: fizyk/actions-reuse/.github/workflows/tests-pytests.yml@v1.3.1
+    uses: fizyk/actions-reuse/.github/workflows/tests-pytests.yml@v1.6.3
     with:
       python-versions: '["3.7", "3.8", "3.9", "3.10", "pypy-3.8"]'
-      cover_package: src/port_for
       os: macos-latest
+      pipenv: true
+      pipenv-install-options: --skip-lock
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -12,7 +12,8 @@ on:
 
 jobs:
   tests:
-    uses: fizyk/actions-reuse/.github/workflows/tests-pytests.yml@v1.3.1
+    uses: fizyk/actions-reuse/.github/workflows/tests-pytests.yml@v1.6.3
     with:
       python-versions: '["3.7", "3.8", "3.9", "3.10", "pypy-3.8"]'
-      cover_package: src/port_for
+      pipenv: true
+      pipenv-install-options: --skip-lock
diff --git a/Pipfile b/Pipfile
@@ -7,6 +7,10 @@ name = "pypi"
 
 [dev-packages]
 towncrier = "==22.8"
-
-[requires]
-python_version = "3.9"
+pytest = "==7.2.0"
+pytest-cov = "==4.0.0"
+coverage = "==6.5.0"
+black = "==22.10.0"
+pydocstyle = {version = "==6.1.1", extras = ["toml"]}
+pycodestyle = "==2.9.1"
+mypy = "==0.991"
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/newsfragments/108.misc.rst b/newsfragments/108.misc.rst
@@ -0,0 +1,2 @@
+Moved development dependencies to be managed by pipenv.
+All development process can be managed  with it - which means automatic isolation.
diff --git a/src/port_for/__init__.py → port_for/__init__.py b/src/port_for/__init__.py → port_for/__init__.py
diff --git a/src/port_for/_download_ranges.py → port_for/_download_ranges.py b/src/port_for/_download_ranges.py → port_for/_download_ranges.py
diff --git a/src/port_for/_ranges.py → port_for/_ranges.py b/src/port_for/_ranges.py → port_for/_ranges.py
diff --git a/src/port_for/api.py → port_for/api.py b/src/port_for/api.py → port_for/api.py
diff --git a/src/port_for/docopt.py → port_for/docopt.py b/src/port_for/docopt.py → port_for/docopt.py
diff --git a/src/port_for/ephemeral.py → port_for/ephemeral.py b/src/port_for/ephemeral.py → port_for/ephemeral.py
diff --git a/src/port_for/exceptions.py → port_for/exceptions.py b/src/port_for/exceptions.py → port_for/exceptions.py
diff --git a/src/port_for/py.typed → port_for/py.typed b/src/port_for/py.typed → port_for/py.typed
diff --git a/src/port_for/store.py → port_for/store.py b/src/port_for/store.py → port_for/store.py
diff --git a/src/port_for/utils.py → port_for/utils.py b/src/port_for/utils.py → port_for/utils.py
diff --git a/requirements-lint.txt b/requirements-lint.txt
diff --git a/requirements-test.txt b/requirements-test.txt
diff --git a/setup.cfg b/setup.cfg
@@ -32,15 +32,10 @@ classifiers =
 zip_safe = False
 include_package_data = True
 python_requires = >= 3.7
-packages = find:
-package_dir =
-    =src
+packages = port_for
 scripts =
     scripts/port-for
 
-[options.packages.find]
-where = src
-
 [options.extras_require]
 tests =
     pytest
@@ -58,7 +53,7 @@ ignore = D203,D212
 match = '(?!docs|build|venv).*\.py'
 
 [tool:pytest]
-addopts =  -vvv --capture=no --showlocals --cov src/port_for --cov tests --ignore src/port_for/_download_ranges.py
+addopts =  -vvv --capture=no --showlocals
 testpaths = tests/
 filterwarnings = error
 xfail_strict = True
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1 @@
+"""Test's module."""