Merge pull request #1140 from NHSDigital/develop

ERSSUP-69932 APIM-R 1.25 Cut

Author: nhsd-david-wass

package-lock.json

@@ -12,7 +12,7 @@
   "license": "MIT",
   "homepage": "https://github.com/NHSDigital/e-referrals-service-api",
   "dependencies": {
-    "@redocly/cli": "^1.0.0-beta.130"
+    "@redocly/cli": "^1.0.2"
   },
   "devDependencies": {
     "apigeetool": "^0.16.1",

package.json

@@ -26,21 +26,21 @@ pyyaml = "^6.0"
 docopt = "^0.6.2"
 jsonpath-rw = "^1.4.0"
 semver = "^3.0.1"
-gitpython = "^3.1.32"
+gitpython = "^3.1.36"
 lxml = "^4.7.1"
 xmlformatter = "^0.2.4"
 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"
+black = "^23.9"
 pip-licenses = "^4.3.2"
 jinja2 = "^3.1.2"
 pytest = "^6.1.2"
-pytest-asyncio = "^0.14.0"
+pytest-asyncio = "^0.20.3"
 pytest-nhsd-apim = "^3.3.5"
 
 [tool.poetry.scripts]

poetry.lock

@@ -17,6 +17,6 @@
     "lodash": "^4.17.20"
   },
   "devDependencies": {
-    "eslint": "^8.47.0"
+    "eslint": "^8.49.0"
   }
 }

pyproject.toml

@@ -24,7 +24,7 @@ BASHSTAMP="# APIM_DEV-VM"
 #Adding pyenv configuration to .bash_profile
 echo "Adding pyenv configuration to .bash_profile ..."
 if ! grep -Fxq "$BASHSTAMP" $HOME/.bash_profile ; then
-cat <<EOF >> $HOME/.bash_profile 
+cat <<EOF >> $HOME/.bash_profile
 
 $BASHSTAMP
 if ! grep -Fxq "$BASHSTAMP" $HOME/.bashrc ; then
@@ -82,7 +82,7 @@ fi
 echo "Installing python 3.8.12 with pyenv ..."
 if pyenv versions | grep -Fq "3.8.12" ; then
     echo "Pyenv has already got Python 3.8.12 installed."
-else 
+else
     if pyenv install 3.8.12 ; then
         echo "Pyenv installed Python 3.8.12 successfully."
     else
@@ -96,7 +96,7 @@ fi
 echo "Creating Apigee environment with Python 3.8.12 ..."
 if pyenv versions | grep -q ".*apigee" ; then
     echo "A Python virtualenv named 'apigee' already exists."
-else 
+else
     if pyenv virtualenv 3.8.12 apigee ; then
         echo "A Python 3.8.12 virtualenv named 'apigee' was created."
     else
@@ -140,8 +140,8 @@ fi
 echo "Installing poetry ..."
 if poetry -V 2> /dev/null ; then
     echo "Poetry is already installed on apigee environment."
-else 
-    if pip install poetry ; then
+else
+    if pip install poetry==1.5.1 ; then
         echo "Poetry was installed on apigee environment."
     else
         echo "Poetry was NOT installed on apigee environment."