diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 859370564b..5c455b36ea 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,20 +12,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + - name: Set up Python + uses: actions/setup-python@v4 with: python-version: 3.8 + - name: Update OS + run: sudo apt-get update - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install -y libssl-dev libcurl4-openssl-dev - python -m pip install --upgrade setuptools pip wheel - make install-dev + run: make install-dev - name: Run Tests run: make test - - diff --git a/Makefile b/Makefile index 8458dcffdf..fd8bc5ee3e 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ LOCAL_ID_MANAGER_API_PORT = 8000 setup: install install-rmlmapper init-saxon local-dotenv-file install: - @ echo -e "$(BUILD_PRINT)Installing the requirements$(END_BUILD_PRINT)" + @ echo -e "$(BUILD_PRINT)Installing user requirements$(END_BUILD_PRINT)" @ python -m pip install --upgrade pip @ python -m pip install --no-cache-dir --upgrade --force-reinstall -r requirements.txt @@ -85,13 +85,9 @@ clear-output: @ rm -rf mappings/$(id)/output/* @ rm -rf mappings/$(id)/validation/sparql/cm_assertions/* -install-dev: - @ echo -e "$(BUILD_PRINT)Installing the requirements$(END_BUILD_PRINT)" -# @ python -m pip install --no-cache-dir --upgrade --force-reinstall --no-deps ../ted-rdf-conversion-pipeline -# @ python -m pip install --no-cache-dir --upgrade --force-reinstall git+https://github.com/meaningfy-ws/mapping-workbench@feature/TED-1090 -# @ python -m pip install --no-cache-dir --upgrade --force-reinstall git+https://github.com/OP-TED/ted-rdf-conversion-pipeline@feature/TED-1090 - @ python -m pip install --no-cache-dir --upgrade --force-reinstall git+https://github.com/meaningfy-ws/mapping-workbench - @ python -m pip install --no-cache-dir --upgrade --force-reinstall git+https://github.com/OP-TED/ted-rdf-conversion-pipeline +install-dev: install + @ echo -e "$(BUILD_PRINT)Installing dev requirements$(END_BUILD_PRINT)" + @ python -m pip install --no-cache-dir --upgrade --force-reinstall -r requirements-dev.txt test: @ mapping_suite_validator package_F03 diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000000..238897a761 --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1 @@ +ted-sws @ git+https://github.com/OP-TED/ted-rdf-conversion-pipeline.git