Loosen requirements and improve setup scripts

.github/workflows/linting.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8"]
+        python-version: ["3.8"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.7", "3.8"]
+        python-version: ["3.8"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/pytest.yml

@@ -9,6 +9,9 @@ on:
 jobs:
   pytest:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ["3.7", "3.8", "3.9"]
     permissions:
       contents: read
       id-token: write
@@ -30,11 +33,13 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -r requirements.txt
+          pip install -r requirements/requirements.txt
 
       - name: Run pytest
         run: |
           access_token=$(az account get-access-token --scope api://88d2b022-3539-4dda-9e66-853801334a86/.default --query accessToken --output tsv)
           echo ${#access_token}
+
+          export ACCESS_TOKEN=$access_token
 
-          pytest -q -s --token $access_token tests/test_sumo_thin_client.py
+          pytest -q -s -x --disable-warnings tests/test_sumo_thin_client.py

conftest.py

@@ -1,8 +1,11 @@
+import os
+
 def pytest_addoption(parser):
     parser.addoption("--token", action="store", default="")
 
 def pytest_generate_tests(metafunc):
-    token = metafunc.config.option.token
+    # token = metafunc.config.option.token
+    token = os.environ.get("ACCESS_TOKEN")
     token = token if len(token) > 0 else None
 
     if "token" in metafunc.fixturenames:

pyproject.toml

@@ -0,0 +1,7 @@
+[build-system]
+requires = [
+  "pip>=19.1.1",
+  "setuptools>=28",
+  "setuptools_scm>=3.2.0",
+  "wheel"
+]

requirements/requirements.txt

@@ -0,0 +1,7 @@
+msal>=1.18.0
+msal-extensions>=1.0.0
+requests>=2.24.0
+pytest>=6.1.1
+PyYAML>=5.4
+setuptools>=49.2.1
+pyjwt>=2.4.0

setup.py

@@ -1,10 +1,37 @@
 # -*- coding: utf-8 -*-
 
 from setuptools import setup, find_packages
+from pip._internal.req import parse_requirements as parse
+from urllib.parse import urlparse
+
+
+def _format_requirement(req):
+    print(req)
+    if req.is_editable:
+        # parse out egg=... fragment from VCS URL
+        parsed = urlparse(req.requirement)
+        egg_name = parsed.fragment.partition("egg=")[-1]
+        without_fragment = parsed._replace(fragment="").geturl()
+        return f"{egg_name} @ {without_fragment}"
+    return req.requirement
+
+
+def parse_requirements(fname):
+    """Turn requirements.txt into a list"""
+    reqs = parse(fname, session="test")
+    return [_format_requirement(ir) for ir in reqs]
+
+
+REQUIREMENTS = parse_requirements("requirements/requirements.txt")
+REQUIREMENTS_DOCS = parse_requirements("requirements/requirements_docs.txt")
+
+EXTRAS_REQUIRE = {"docs": REQUIREMENTS_DOCS}
+
 
 setup(
     name="sumo-wrapper-python",
     description="Python wrapper for the Sumo API",
+    license="Apache 2.0",
     url="https://github.com/equinor/sumo-wrapper-python",
     keywords="sumo, python",
     classifiers=[
@@ -15,11 +42,12 @@
     ],
     use_scm_version={"write_to": "src/sumo/wrapper/version.py"},
     author="Equinor ASA",
-    install_requires=["requests", "msal", "PyYAML", "setuptools"],
+    install_requires=REQUIREMENTS,
     python_requires=">=3.4",
     packages=find_packages("src"),
     package_dir={"": "src"},
     include_package_data=True,
     zip_safe=False,
+    extras_require=EXTRAS_REQUIRE,
     entry_points={"console_scripts": ["sumo_login = sumo.wrapper.login:main"]},
 )