Merge d39d88c into 1d7b7e6

.github/workflows/ci-tests.yml

@@ -8,29 +8,37 @@ on:
       - master
 
 jobs:
-  build:
-    runs-on: ${{ matrix.os }}
+  test:
     strategy:
+      fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        python_version: [
-            3.7,
-            3.8,
-            3.9,
-            pypy3
-        ]
+        config:
+          - python-version: 3.6
+            tox: 36
+          - python-version: 3.7
+            tox: 37
+          - python-version: 3.8
+            tox: 38
+          - python-version: 3.9
+            tox: 39
+        poetry-version: [ 1.1.4 ]
+        os: [ ubuntu-20.04, ubuntu-18.04 ]
+    runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python_version }}
+    - name: Set up Python ${{ matrix.config.python-version }}
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python_version }}
+        python-version: ${{ matrix.config.python-version }}
+    - name: Python Poetry Action
+      uses: abatilo/actions-poetry@v2.1.0
+      with:
+        poetry-version: 1.1.2
     - name: Install dependencies
       run: |
-        pip install -r requirements-dev.txt
-    - name: nosetests
-      run: |
-        nosetests --with-coverage --cover-erase --cover-package=openrouteservice -v
+        pip install tox coveralls
+    - name: Run Tox
+      run: tox -e py${{ matrix.config.tox }}
     - name: coveralls
       run: |
         coveralls --service=github

.gitignore

@@ -16,3 +16,7 @@ test.py
 
 cover/
 conda/
+/coverage.xml
+/poetry.lock
+/setup.py
+/requirements.txt

openrouteservice/__init__.py

@@ -16,8 +16,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 #
+import pkg_resources
 
-__version__ = "2.2.2"
+__version__ = pkg_resources.get_distribution('openrouteservice').version
 
 
 def get_ordinal(number):

pyproject.toml

@@ -0,0 +1,29 @@
+[tool.poetry]
+name = "openrouteservice"
+version = "2.3.3"
+description = "Python client for requests to openrouteservice API services."
+authors = ["Nils Nolde <nils.nolde@gmail.com>", "Julian Psotta <julianpsotta@gmail.com>"]
+readme = 'README.rst'
+license = "Apache2"
+
+[tool.dephell.main]
+from = { format = "poetry", path = "pyproject.toml" }
+to = { format = "setuppy", path = "setup.py" }
+
+[tool.poetry.dependencies]
+python = ">=3.6.0,<4"
+requests = ">=2.0"
+setuptools = ">=53.0.0"
+responses = ">=0.12.1"
+dephell = ">=0.8.3"
+
+[tool.poetry.dev-dependencies]
+responses = ">=0.10"
+coveralls = ">=1.7.0"
+tox = ">=3.21.4"
+pytest = ">=4.6.11"
+pytest-cov = ">=2.11.1"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"

tox.ini

@@ -0,0 +1,13 @@
+[tox]
+envlist = py36,py37,py38,py39
+isolated_build = true
+
+[testenv]
+commands =
+    poetry install -v
+    pytest
+whitelist_externals = poetry
+
+[pytest]
+addopts = -x --cov=openrouteservice
+script_launch_mode = subprocess