Skip to content

Commit

Permalink
Merge branch 'release/3.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dermatologist committed Nov 20, 2023
2 parents 7de89d4 + 3f224ad commit 3fcc84a
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
make -C docs/ html
cp docs/_config.yml docs/_build/html/_config.yml
- name: Deploy Docs 🚀
uses: JamesIves/github-pages-deploy-action@v4.2.5
uses: JamesIves/github-pages-deploy-action@v4
with:
branch: gh-pages # The branch the action should deploy to.
folder: docs/_build/html # The folder the action should deploy.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Changelog

## [Unreleased](https://github.com/dermatologist/fhiry/tree/HEAD)
## [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...HEAD)
[Full Changelog](https://github.com/dermatologist/fhiry/compare/3.0.0...3.1.0)

**Implemented enhancements:**

Expand Down
2 changes: 1 addition & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ babel==2.9.1
# via sphinx
backports-entry-points-selectable==1.1.0
# via virtualenv
certifi==2023.7.22
certifi==2023.11.17
# via
# -c requirements.txt
# requests
Expand Down
1 change: 0 additions & 1 deletion docs/authors.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/authors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```{include} ../AUTHORS.md
:relative-docs: docs/
:relative-images:
```
1 change: 0 additions & 1 deletion docs/changelog.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```{include} ../CHANGELOG.md
:relative-docs: docs/
:relative-images:
```
4 changes: 4 additions & 0 deletions docs/contributing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```{include} ../CONTRIBUTING.md
:relative-docs: docs/
:relative-images:
```
25 changes: 9 additions & 16 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,17 @@
FHIR to pandas.dataframe for AI and ML


## Note

> This is the main page of your project's [Sphinx] documentation. It is
> formatted in [Markdown]. Add additional pages by creating md-files in
> `docs` or rst-files (formated in [reStructuredText]) and adding links to
> them in the `Contents` section below.
>
> Please check [Sphinx], [recommonmark] and [autostructify] for more information
> about how to document your project and how to configure your preferences.

## Contents

* [Overview](readme)
* [License](license)
* [Authors](authors)
* [Changelog](changelog)
* [Module Reference](api/modules)
```{toctree}
:maxdepth: 2
Overview <readme>
Module Reference <api/modules>
Contributions & Help <contributing>
License <license>
Authors <authors>
Changelog <changelog>
## Indices and tables
Expand Down
5 changes: 5 additions & 0 deletions docs/license.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# License

```{literalinclude} ../LICENSE.txt
:language: text
```
1 change: 0 additions & 1 deletion docs/readme.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
```{include} ../README.md
:relative-docs: docs/
:relative-images:
```
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
cachetools==5.3.2
# via google-auth
certifi==2023.7.22
certifi==2023.11.17
# via requests
charset-normalizer==3.3.2
# via requests
Expand All @@ -33,12 +33,12 @@ googleapis-common-protos==1.61.0
# via
# google-api-core
# grpcio-status
grpcio==1.59.2
grpcio==1.59.3
# via
# google-api-core
# google-cloud-bigquery
# grpcio-status
grpcio-status==1.59.2
grpcio-status==1.59.3
# via google-api-core
idna==3.4
# via requests
Expand All @@ -57,7 +57,7 @@ pandas==2.1.3
# fhiry (setup.py)
proto-plus==1.22.3
# via google-cloud-bigquery
protobuf==4.25.0
protobuf==4.25.1
# via
# google-api-core
# google-cloud-bigquery
Expand Down
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ testing =
# CAUTION: --cov flags may prohibit setting breakpoints while debugging.
# Comment those flags to avoid this py.test issue.
addopts =
--cov fhiry --cov-report term-missing
--verbose
norecursedirs =
dist
Expand Down

0 comments on commit 3fcc84a

Please sign in to comment.