Merge branch 'release/3.2.1'

dermatologist · Nov 27, 2023 · c8bb20f · c8bb20f
2 parents 3fcc84a + cdb8094
commit c8bb20f
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 77 deletions.
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
@@ -13,7 +13,7 @@ jobs:
 
     steps:
     - name: Checkout Latest Commit
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Generate changelog
       uses: charmixer/auto-changelog-action@v1

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4.1.0
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v4.1.0
       with:

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -13,13 +13,14 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 10
     strategy:
       max-parallel: 4
       matrix:
         python-version: [3.10.13]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4.1.0
       with:

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -9,13 +9,14 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 20
     strategy:
       max-parallel: 4
       matrix:
         python-version: [3.10.13]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4.1.0
       with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [3.2.0](https://github.com/dermatologist/fhiry/tree/3.2.0) (2023-11-20)
+
+[Full Changelog](https://github.com/dermatologist/fhiry/compare/3.1.0...3.2.0)
+
 ## [3.1.0](https://github.com/dermatologist/fhiry/tree/3.1.0) (2023-11-14)
 
 [Full Changelog](https://github.com/dermatologist/fhiry/compare/3.0.0...3.1.0)

diff --git a/docs/fhiry.rst b/docs/fhiry.rst
diff --git a/docs/index.rst b/docs/index.rst
diff --git a/docs/license.rst b/docs/license.rst
diff --git a/docs/modules.rst b/docs/modules.rst
diff --git a/t_install.py b/t_install.py
@@ -0,0 +1,11 @@
+from fhiry.fhirsearch import Fhirsearch
+
+fs = Fhirsearch(fhir_base_url = "http://hapi.fhir.org/fhir/baseR4")
+
+my_fhir_search_parameters = {
+    "code": "http://snomed.info/sct|39065001",
+}
+
+df = fs.search(resource_type = "Condition", search_parameters = my_fhir_search_parameters)
+
+print(df.info())
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@
 
 [tox]
 minversion = 3.15
-envlist = default
+envlist = default, clean, build, docs, doctests
 
 
 [testenv]
@@ -71,3 +71,11 @@ deps = twine
 commands =
     python -m twine check dist/*
     python -m twine upload {posargs:--repository testpypi} dist/*
+
+[testenv:integration]
+setenv = TOXINIDIR = {toxinidir}
+deps =
+    -rrequirements.txt
+    -rdev-requirements.txt
+commands =
+    python t_install.py