Merge pull request #26 from canonical/requirements/unpin

python: unpin dependencies (CRAFT-665)

.github/workflows/tests.yaml

@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       - name: Install python packages and dependencies
         run: |
-          pip install -U -r requirements.txt -r requirements-dev.txt
+          pip install -U .[dev]
       - name: Run black
         run: |
           make test-black
@@ -59,7 +59,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          pip install -U -r requirements.txt -r requirements-dev.txt
+          pip install -U .[dev]
           pip install -e .
       - name: Run unit tests
         run: |

.readthedocs.yml

@@ -2,26 +2,22 @@
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
 
-# Required
 version: 2
 
-# Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
-# Build documentation with MkDocs
-#mkdocs:
-#  configuration: mkdocs.yml
+build:
+  os: "ubuntu-20.04"
+  tools:
+    python: "3.8"
 
-# Optionally build your docs in additional formats such as PDF
 formats:
   - pdf
 
-# Optionally set the version of Python and requirements required to build your docs
 python:
-  version: 3.8
+  version: "3.8"
   install:
-    - requirements: requirements.txt
-    - requirements: requirements-dev.txt
     - method: pip
+      requirements: docs/requirements.txt
       path: .

Makefile

@@ -39,6 +39,7 @@ coverage: ## Run pytest with coverage report.
 docs: ## Generate documentation.
 	rm -f docs/craft_store.rst
 	rm -f docs/modules.rst
+	pip install -r docs/requirements.txt
 	$(MAKE) -C docs clean
 	$(MAKE) -C docs html
 

docs/requirements.txt

@@ -0,0 +1,10 @@
+Sphinx==4.2.0
+sphinx-autodoc-typehints==1.12.0
+sphinx-jsonschema==1.16.11
+sphinx-pydantic==0.1.1
+sphinx-rtd-theme==1.0.0
+sphinxcontrib-applehelp==1.0.2
+sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-htmlhelp==2.0.0
+sphinxcontrib-jsmath==1.0.1
+sphinxcontrib-qthelp==1.0.3

setup.cfg

@@ -65,7 +65,6 @@ test =
     types-pyyaml
 dev =
     autoflake
-    %(doc)s
     %(release)s
     %(test)s
 
@@ -91,6 +90,9 @@ extend-ignore = E501
 python_version = 3.8
 plugins = pydantic.mypy
 
+[mypy-keyring.*]
+ignore_missing_imports = True
+
 [mypy-macaroonbakery.*]
 ignore_missing_imports = True