Skip to content

Commit

Permalink
Update to schemas 0.3.1 (#24)
Browse files Browse the repository at this point in the history
* Update files in the root project folder

* Update server files minus src and test

* Update CI/CD workflow
  • Loading branch information
tschaffter authored Jan 27, 2021
1 parent 2e741c2 commit da4b548
Show file tree
Hide file tree
Showing 11 changed files with 1,089 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ updates:
- package-ecosystem: "docker"
directory: "/server"
schedule:
interval: "weekly"
interval: "monthly"
target-branch: "develop"

- package-ecosystem: "pip"
directory: "/server"
schedule:
interval: "weekly"
interval: "monthly"
target-branch: "develop"
18 changes: 12 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
with:
entrypoint: hadolint
args: server/Dockerfile
- name: Validate docker-compose.yml
run: |
docker-compose -f docker-compose.yml config >/dev/null
- name: Check that packages in requirements.txt files are in asc order
run: |
sort -f --check server/requirements.txt
Expand All @@ -36,18 +39,21 @@ jobs:
test:
needs: [lint]
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Validate docker-compose.yml
run: docker-compose -f docker-compose.yml config >/dev/null
- name: Set up Python
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: '3.x'
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip tox
- name: Run integration tests
cd server
python -m pip install --upgrade pip
pip install tox tox-gh-actions
- name: Test with tox
run: |
cd server
tox
Expand Down
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
node_modules
.idea
venv
dist.yaml
.empty/
.vscode/
node_modules/

.env
dist.yaml
openapi.yaml
openapitools.json
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ services:
build:
context: server
dockerfile: Dockerfile
container_name: nlp-physical-address-annotator
container_name: physical-address-annotator
ports:
- "8080:8080"
Loading

0 comments on commit da4b548

Please sign in to comment.