Skip to content

Commit

Permalink
Merge branch 'develop' into APM-000-AMP-1732-Doc-Improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
nkinsler1 authored Sep 25, 2023
2 parents 1e884a3 + 8d94b97 commit 35c65e7
Show file tree
Hide file tree
Showing 10 changed files with 764 additions and 998 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ jobs:
- name: Install Java
run: sudo apt-get install --yes default-jre default-jdk

- name: Install node
run: |
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash -
sudo apt-get install -y nodejs
- name: Upgrade python packaging tools
run: python -m pip install --upgrade pip setuptools wheel

Expand Down
881 changes: 334 additions & 547 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"license": "MIT",
"homepage": "https://github.com/NHSDigital/e-referrals-service-patient-care-api",
"dependencies": {
"@redocly/cli": "^1.0.0-beta.124"
"@redocly/cli": "^1.0.2"
},
"devDependencies": {
"apigeetool": "^0.16.1",
Expand Down
542 changes: 281 additions & 261 deletions poetry.lock

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ pyyaml = "^6.0"
docopt = "^0.6.2"
jsonpath-rw = "^1.4.0"
semver = "^3.0.1"
gitpython = "^3.1.32"
gitpython = "^3.1.35"
lxml = "^4.7.1"
xmlformatter = "^0.2.4"
pytest-check = "^2.2.0"
pytest-check = "^2.2.1"
requests = "^2.27.1"
openapi-core = "0.14.2"
openapi-core = "0.17.1"

[tool.poetry.dev-dependencies]
flake8 = "^5.0.4"
black = "^23.7"
pip-licenses = "^4.3.2"
jinja2 = "^3.1.2"
pytest = "^6.1.2"
coverage = "^7.2"
coverage = "^7.3"
aiohttp = "^3.8.5"
pytest-asyncio = "^0.14.0"
pytest-asyncio = "^0.20.3"
pytest-nhsd-apim = "^3.3.5"

[tool.poetry.scripts]
164 changes: 68 additions & 96 deletions sandbox/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions sandbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"dependencies": {
"express": "^4.18.2",
"loglevel": "^1.8.1",
"uuid": "^9.0.0"
"uuid": "^9.0.1"
},
"devDependencies": {
"chai": "^4.3.7",
"chai": "^4.3.8",
"mocha": "<11.0.0",
"mocha-junit-reporter": "^2.2.1",
"mocha-multi": "^1.1.7",
"nodemon": "^2.0.22",
"nodemon": "^3.0.1",
"supertest": "^6.3.3"
}
}
2 changes: 1 addition & 1 deletion scripts/rhel_setup_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ echo "Installing poetry ..."
if poetry -V 2> /dev/null ; then
echo "Poetry is already installed on apigee environment."
else
if pip install poetry ; then
if pip install poetry==1.5.1 ; then
echo "Poetry was installed on apigee environment."
else
echo "Poetry was NOT installed on apigee environment."
Expand Down
Loading

0 comments on commit 35c65e7

Please sign in to comment.