Support src/ dir (#10)

.travis.yml

@@ -2,11 +2,14 @@ dist: xenial
 language: python
 cache: pip
 python:
-  - '3.6'
   - '3.7'
+  - '3.9'
+branches:
+  only:
+  - master  # All other branches should become (draft) PRs and be build that way
 
 install:
-  - pip install future-fstrings flit coveralls
+  - pip install flit coveralls
   - flit install --deps develop
 script:
   - PYTHONPATH=. pytest --cov=get_version --black

get_version.py

@@ -187,6 +187,8 @@ def get_version(package: Union[Path, str]) -> str:
     else:
         name = path.with_suffix("").name
         parent = path.parent
+    if parent.name == "src":
+        parent = parent.parent
 
     return str(
         get_version_from_dirname(name, parent)

pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ['flit>=1.3']
-build-backend = 'flit.buildapi'
+requires = ['flit-core>=2,<4']
+build-backend = 'flit_core.buildapi'
 
 [tool.flit.metadata]
 module = 'get_version'
@@ -13,7 +13,7 @@ classifiers = [
     'Topic :: Software Development :: Libraries :: Python Modules',
     'License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)',
 ]
-requires-python = '>=3.6'
+requires-python = '>=3.7'
 requires = ['setuptools']
 description-file = 'README.rst'
 
@@ -27,5 +27,4 @@ test = [
 ]
 
 [tool.black]
-py36 = true
 include = '\.pyi?$'

tests/test_packages.py

@@ -20,26 +20,39 @@
 """
 
 
-def test_git(temp_tree: TempTreeCB):
-    spec = {".git": {}, "git_mod.py": "print('hello')\n"}
+@pytest.fixture(params=[True, False], ids=["src", "plain"])
+def has_src(request) -> bool:
+    return request.param
+
+
+def test_git(temp_tree: TempTreeCB, has_src):
+    content = {"git_mod.py": "print('hello')\n"}
+    if has_src:
+        content = dict(src=content)
+    spec = {".git": {}, **content}
     with temp_tree(spec) as package, MockCommand(
         "git", mock_git_describe.format(package)
     ):
         v = get_version.get_version_from_git(package)
         assert get_version.Version("0.1.2", "3", ["fefe123", "dirty"]) == v
 
-        v = get_version.get_version(package / "git_mod.py")
+        parent = (package / "src") if has_src else package
+        v = get_version.get_version(parent / "git_mod.py")
         assert "0.1.2.dev3+fefe123.dirty" == v
 
 
-def test_dir(temp_tree: TempTreeCB):
+def test_dir(temp_tree: TempTreeCB, has_src):
     dirname = "dir_mod-0.1.3+dirty"
-    spec = {dirname: {"dir_mod.py": "print('hi!')\n"}}
+    content = {"dir_mod.py": "print('hi!')\n"}
+    if has_src:
+        content = dict(src=content)
+    spec = {dirname: content}
     with temp_tree(spec) as package:
         v = get_version.get_version_from_dirname("dir_mod", package / dirname)
         assert get_version.Version("0.1.3", None, ["dirty"]) == v
 
-        v = get_version.get_version(package / dirname / "dir_mod.py")
+        parent = (package / dirname / "src") if has_src else (package / dirname)
+        v = get_version.get_version(parent / "dir_mod.py")
         assert "0.1.3+dirty" == v