Merge pull request #219 from FAIRDataPipeline/hotfix/tidy

Updates

.github/workflows/fair-data-registry.yaml

@@ -24,7 +24,7 @@ jobs:
               fi
       - name: Run Tests
         run: |
-          python -m pip install -r local-requirements.txt
+          python -m pip install -r requirements.txt
           DJANGO_SETTINGS_MODULE=drams.test-settings coverage run --omit=drams,scripts,tools manage.py test 
       - name: Generate XML
         run: coverage xml

Vagrantfile

@@ -35,7 +35,7 @@ source "$FAIR_HOME"/venv/bin/activate
 # see https://www.virtualbox.org/ticket/8761 
 # a work around for this is to use the --ignore-installed option for pip
 python -m pip install --upgrade pip wheel --ignore-installed
-python -m pip install -r "$FAIR_HOME"/local-requirements.txt  --ignore-installed
+python -m pip install -r "$FAIR_HOME"/requirements.txt  --ignore-installed
 
 export DJANGO_SETTINGS_MODULE="drams.vagrant-settings"
 export DJANGO_SUPERUSER_USERNAME=admin

requirements.txt

@@ -13,7 +13,7 @@ future==0.17.1
 gunicorn==20.0.4
 idna==2.9
 isodate==0.6.0
-lxml>=4.9
+lxml~=4.9
 mysql-connector-python==8.0.20
 networkx==3.0
 oauthlib==3.1.0
@@ -26,16 +26,17 @@ python3-openid==3.1.0
 pytz==2020.1
 rdflib==6.0.1
 requests>=2.25.0
-requests-oauthlib==1.3.0
-six==1.16.0
+requests-oauthlib~=1.3.0
+six~=1.16.0
 sqlparse==0.3.1
 urllib3>=1.26.5
 semver>=2.10.2
 django-crispy-forms==1.14.0
 crispy-bootstrap3==2022.1
 Markdown==3.5.1
 setuptools>54.2
-whitenoise==5.2.0
+whitenoise~=5.2.0
 coverage
 rocrate==0.7.0
 boto3>=1.24
+psycopg>=3.1

static/localregistry.bat

@@ -148,7 +148,7 @@ call %FAIR_HOME:"=%\venv\Scripts\activate.bat
 
 :: Install Python Dependencies
 python -m pip install --upgrade pip wheel
-python -m pip install -r "%FAIR_HOME:"=%\local-requirements.txt"
+python -m pip install -r "%FAIR_HOME:"=%\requirements.txt"
 
 :: Change into FAIR HOME directory
 cd /d %FAIR_HOME%

static/localregistry.ps1

@@ -138,7 +138,7 @@ Write-Host "calling ${FAIR_HOME}\venv\scripts\activate.ps1 to activate virtual e
 
 # Install Python Dependencies
 python -m pip install --upgrade pip wheel
-python -m pip install -r "${FAIR_HOME}\local-requirements.txt"
+python -m pip install -r "${FAIR_HOME}\requirements.txt"
 
 $Env:DJANGO_SETTINGS_MODULE= "drams.local-settings"
 $Env:DJANGO_SUPERUSER_USERNAME= "admin"

static/localregistry.sh

@@ -79,7 +79,7 @@ fi
 python3 -m venv "$FAIR_HOME"/venv
 source "$FAIR_HOME"/venv/bin/activate
 python -m pip install --upgrade pip wheel
-python -m pip install -r "$FAIR_HOME"/local-requirements.txt
+python -m pip install -r "$FAIR_HOME"/requirements.txt
 export DJANGO_SETTINGS_MODULE="drams.local-settings"
 export DJANGO_SUPERUSER_USERNAME=admin
 export DJANGO_SUPERUSER_PASSWORD=admin

static/remoteregistry.bat

@@ -224,7 +224,7 @@ call %FAIR_HOME:"=%\venv\Scripts\activate.bat
 
 :: Install Python Dependencies
 python -m pip install --upgrade pip wheel
-python -m pip install -r "%FAIR_HOME:"=%\local-requirements.txt"
+python -m pip install -r "%FAIR_HOME:"=%\requirements.txt"
 
 :: Change into FAIR HOME directory
 cd /d %FAIR_HOME%

static/remoteregistry.ps1

@@ -166,7 +166,7 @@ Write-Host "calling ${FAIR_HOME}\venv\scripts\activate.ps1 to activate virtual e
 
 # Install Python Dependencies
 python -m pip install --upgrade pip wheel
-python -m pip install -r "${FAIR_HOME}\local-requirements.txt"
+python -m pip install -r "${FAIR_HOME}\requirements.txt"
 
 $Env:DJANGO_SETTINGS_MODULE= $DRAMS
 

static/remoteregistry.sh

@@ -117,7 +117,7 @@ fi
 python3 -m venv "$FAIR_HOME"/venv
 source "$FAIR_HOME"/venv/bin/activate
 python -m pip install --upgrade pip wheel
-python -m pip install -r "$FAIR_HOME"/local-requirements.txt
+python -m pip install -r "$FAIR_HOME"/requirements.txt
 export DJANGO_SETTINGS_MODULE=$DRAMS
 if [ ! -z $(echo ${USE_SUPERUSER} | xargs) ]; then
     export DJANGO_SUPERUSER_USERNAME=$SUPERUSER_USERNAME