Skip to content

Commit

Permalink
Merge pull request #866 from IanCa/dev_installer
Browse files Browse the repository at this point in the history
Pin wordcloud, switch to python 3.8 minimum
  • Loading branch information
VisLab authored Feb 21, 2024
2 parents 63a5dfc + f506fb6 commit 2b04113
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
run: |
if [[ "${{ github.event_name }}" == 'push' && "${{ github.ref }}" == 'refs/heads/master' ]]; then
# Push to master branch
echo 'matrix=["3.7", "3.9", "3.10", "3.11"]' >> $GITHUB_OUTPUT
echo 'matrix=["3.8", "3.9", "3.10", "3.11"]' >> $GITHUB_OUTPUT
elif [[ "${{ github.event_name }}" == 'pull_request' && "${{ github.event.pull_request.base.ref }}" == 'master' ]]; then
# PR to master branch
echo 'matrix=["3.7", "3.9", "3.10", "3.11"]' >> $GITHUB_OUTPUT
echo 'matrix=["3.8", "3.9", "3.10", "3.11"]' >> $GITHUB_OUTPUT
else
echo 'matrix=["3.9"]' >> $GITHUB_OUTPUT
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_installer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
python-version: ["3.7", "3.10"]
python-version: ["3.8", "3.11"]

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ classifiers = [
"Operating System :: OS Independent",
]

requires-python = ">=3.7"
requires-python = ">=3.8"

dependencies = [
"defusedxml",
Expand All @@ -42,7 +42,7 @@ dependencies = [
"rdflib",
"semantic-version",
"six",
"wordcloud"
"wordcloud==1.9.3"
]

[project.urls]
Expand Down
6 changes: 6 additions & 0 deletions spec_tests/test_errors.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import os
import unittest
import urllib.error

from hed.models import DefinitionDict

from hed import load_schema_version, HedString
Expand Down Expand Up @@ -166,6 +168,7 @@ def _run_single_schema_test(self, info, error_code, description,name, error_hand
for result, tests in info.items():
for test in tests:
schema_string = "\n".join(test)
issues = []
try:
loaded_schema = from_string(schema_string, schema_format=".mediawiki")
issues = loaded_schema.check_compliance()
Expand All @@ -174,6 +177,9 @@ def _run_single_schema_test(self, info, error_code, description,name, error_hand
if not issues:
issues += [{"code": e.code,
"message": e.message}]
except urllib.error.HTTPError:
issues += [{"code": "Http_error",
"message": "HTTP error in testing, probably due to rate limiting for local testing."}]
self.report_result(result, issues, error_code, description, name, test, "schema_tests")

def test_errors(self):
Expand Down

0 comments on commit 2b04113

Please sign in to comment.