Merge pull request #28 from mdsol/develop

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tests/mauth-protocol-test-suite"]
+	path = tests/mauth-protocol-test-suite
+	url = https://github.com/mdsol/mauth-protocol-test-suite.git

.travis.yml

@@ -1,12 +1,12 @@
+dist: focal
 language: python
 cache: pip
 
 python:
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
-  - pypy3
+  - 3.9
 
 before_install:
   - pip install poetry
@@ -33,12 +33,11 @@ jobs:
       python: 3.8
       script: skip
       before_deploy:
-        - poetry config repositories.mdsol https://mdsol.jfrog.io/mdsol/api/pypi/pypi-local
-        - poetry config http-basic.mdsol $ARTIFACTORY_USERNAME $ARTIFACTORY_PASSWORD # Stored as Travis CI Environment Vars
+        - poetry config pypi-token.pypi $POETRY_PYPI_TOKEN_PYPI  # this may be unnecessary
         - poetry build
       deploy:
         provider: script
-        script: poetry publish -r mdsol
+        script: poetry publish
         skip_cleanup: true
         on:
           tags: true

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.2.1
+- Add autodeploy to PyPI
+- Remove Support for EOL Python 3.5
+- Remove PyPy support
+
 # 1.2.0
 - Change the default signing versions (`MAUTH_SIGN_VERSIONS` option) to `v1` only.
 

CONTRIBUTING.md

@@ -35,16 +35,24 @@ To setup your environment:
   pyenv local 3.5.8 3.6.10 3.7.7 3.8.2 pypy3.6-7.1.1
   ```
 
-## Unit Tests
 
-1. Make any changes, update the tests and then run tests with `tox`
-1. Coverage report can be viewed using `open htmlcov/index.html`
+## Cloning the Repo
 
+This repo contains the submodule `mauth-protocol-test-suite` so requires a flag when initially cloning in order to clone and init submodules:
+```sh
+git clone --recurse-submodules [email protected]:mdsol/mauth-client-python.git
+```
 
-## Running mauth-protocol-test-suite
+If you have already cloned before the submodule was introduced, then run:
+```sh
+cd tests/mauth-protocol-test-suite
+git submodule update --init
+```
 
-To run the mauth-protocol-test-suite clone the latest test suite onto your machine and place it in the [`tests`](./tests) directory (or supply the ENV var `TEST_SUITE_RELATIVE_PATH` with the path to the test suite relative to the `tests` directory). Then run:
+to init the submodule.
 
-```
-poetry run pytest -m protocol_suite
-```
+
+## Unit Tests
+
+1. Make any changes, update the tests and then run tests with `tox`
+1. Coverage report can be viewed using `open htmlcov/index.html`

mauth_client/__init__.py

@@ -1 +1,8 @@
-__version__ = "1.2.0"
+# Load the version from the project metatdata
+try:
+    import importlib.metadata as importlib_metadata
+except ModuleNotFoundError:
+    # needed for Python < 3.8
+    import importlib_metadata
+
+__version__ = importlib_metadata.version(__name__)