Merge branch 'develop' into SDEV-4409_add_constants

.github/workflows/publishdevdocs.yml

@@ -10,20 +10,20 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
     - name: checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
     - name: install and build
       run: |
         python -m pip install --upgrade pip setuptools
         pip install .[docs]
         pip install markdown_refdocs mkdocs mkdocs-material
-        markdown_refdocs ipr -o docs/reference --link
+        markdown_refdocs pori_python -o docs/reference --link
         mkdocs build
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3

.github/workflows/gkb_workflows/pypipublish.yml → .github/workflows/pypitestpublish.yml

@@ -1,12 +1,9 @@
 # This workflows will upload a Python Package using Twine when a release is created
 # For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
 
-name: upload to pypi
+name: upload to testpypi
 
-on:
-  release:
-    types: [released]
-  workflow_dispatch:
+on: workflow_dispatch
 
 jobs:
   deploy:
@@ -25,8 +22,8 @@ jobs:
         pip install setuptools wheel twine
     - name: Build and publish
       env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        TWINE_USERNAME: ${{ secrets.PYPI_TEST_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_TEST_PASSWORD }}
       run: |
         python setup.py sdist bdist_wheel install
-        twine upload dist/*
+        twine upload --repository testpypi dist/*

setup.cfg

@@ -35,13 +35,13 @@ install_requires =
     progressbar2
     pandas>=1.1.0
     jsonschema
-    requests<2.29.0
-    typing_extensions>=3.7.4.2,<4.4
+    requests
+    typing_extensions>=3.7.4.2,<5
 
 [options.extras_require]
 deploy = twine; wheel; m2r
 test = pytest; pytest-cov; pytest-runner
-doc = mkdocs; mkdocs-material; markdown-refdocs; mkdocs-redirects
+docs = mkdocs; mkdocs-material; markdown-refdocs; mkdocs-redirects
 dev =
     twine
     wheel