Merge pull request #202 from nestauk/201_update_dependencies

201 update dependencies

.github/workflows/pytest.yml

@@ -4,23 +4,46 @@ on: [push]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os.host }}
     strategy:
       matrix:
         python-version: ["3.8", "3.9"]
+        os:
+          - name: ubuntu
+            host: ubuntu-latest
+          - name: windows
+            host: windows-latest
 
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Install dependencies
+          cache: "pip"
+
+      - name: (ubuntu) Install dependencies
+        if: runner.os != 'windows'
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements_dev.txt
           python -m spacy download en_core_web_sm
           pip install -e ."[test]"
-      - name: Test with pytest
+      - name: (ubuntu) Test with pytest
+        if: runner.os != 'windows'
+        run: |
+          pytest --verbose
+
+      - name: (windows) Install dependencies
+        if: runner.os == 'windows'
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements_dev.txt
+          python -m spacy download en_core_web_sm
+          pip install -e .
+      - name: (windows) Test with pytest
+        if: runner.os == 'windows'
+        shell: bash
         run: |
           pytest --verbose

README.md

@@ -29,16 +29,9 @@ You can use pip to install the library:
 pip install ojd-daps-skills
 ```
 
-You will also need to download [spaCy's](https://spacy.io/models/en) `en_core_web_sm` model:
+Note that this package was developed on MacOS and tested on Ubuntu. Changes have been made to be compatible on a Windows system but are not tested and cannot be guaranteed.
 
-```
-python -m spacy download en_core_web_sm
-```
-
-Note that this package was developed on MacOS and tested on Ubuntu. Changes have been made to be compatible on a Windows system but are not tested and cannot be guaranteed. 
-### AWS CLI
-
-When the package is first used it will automatically download a folder of neccessary data and models. This file is ~ 1GB. Although you don't need to have AWS credentials for this to work, you will need to download the [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html).
+When the package is first used it will automatically download a folder of neccessary data and models. (~1GB)
 
 ## TL;DR: Using Nesta's Skills Extractor library <a name="usage"></a>
 
@@ -152,10 +145,6 @@ git clone [email protected]:nestauk/ojd_daps_skills.git
   - `mkdir .cookiecutter/state`
   - `touch .cookiecutter/state/conda-create.log`
 - Run `make install` to configure the development environment
-- Download spacy model:
-  - `python -m spacy download en_core_web_sm`
-
-If you don't have the AWS CLI installed - you can download a zipped folder of the data [by clicking here](https://open-jobs-indicators.s3.eu-west-1.amazonaws.com/escoe_extension/ojd_daps_skills_data.zip). After downloading and unzipping, it is important that this folder is moved to the project's parent folder - i.e. `ojd_daps_skills/`.
 
 ### Project structure