From 0409bb4506eed90e09dece7e850e7bb447c0ced2 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 28 Jun 2021 16:36:18 -0400 Subject: [PATCH 1/6] Use Python venv to build virtual environment for CI References: * [AC-195] Use Python venv instead of virtualenv to build virtual environments for CI Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 4 ---- tests/Makefile | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63ff0db..1d49004 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,10 +31,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install Python virtualenv for Github runner - run: | - python -m pip install --upgrade pip - pip install virtualenv - name: Start from clean state run: make clean - name: Run tests diff --git a/tests/Makefile b/tests/Makefile index 7857855..949f671 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -41,8 +41,7 @@ all: \ $(top_srcdir)/setup.py \ requirements.txt rm -rf venv - $(PYTHON3) -m virtualenv \ - --python=$(PYTHON3) \ + $(PYTHON3) -m venv \ venv source venv/bin/activate \ && pip install \ From b09d4bfe9fc08fb937408f88631bd9fb7ba4ed6d Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Mon, 28 Jun 2021 16:39:24 -0400 Subject: [PATCH 2/6] Bump examples-QC repository to its use of venv References: * [AC-195] Use Python venv instead of virtualenv to build virtual environments for CI Signed-off-by: Alex Nelson --- dependencies/CASE-Examples-QC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/CASE-Examples-QC b/dependencies/CASE-Examples-QC index 7a678bc..1a153c7 160000 --- a/dependencies/CASE-Examples-QC +++ b/dependencies/CASE-Examples-QC @@ -1 +1 @@ -Subproject commit 7a678bc0bb99b9a722b6e5ba4b05ec4cd7525bd3 +Subproject commit 1a153c73d5d7f66509650c5c9d453b852676a60a From fd9d86125bc773b664397ca80834bf4d8be1df8c Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 7 Sep 2021 09:46:21 -0400 Subject: [PATCH 3/6] Import rdflib >= 6.0.0 to account for rdflib-jsonld package being archived References: * [AC-205] Adjust Python packages importing rdflib-jsonld to import rdflib >= 6.0.0 Signed-off-by: Alex Nelson --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 5837731..900fd1f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,7 +21,7 @@ install_requires = # Note that numpy (pandas dependency) is only supported in Python >= 3.7. pandas;python_version>='3.7' pyparsing < 3.0.0 - rdflib-jsonld + rdflib >= 6.0.0 requests tabulate packages = find: From a8663b046a9c8ed691af5c80e41bc304ce4dc330 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 7 Sep 2021 10:08:13 -0400 Subject: [PATCH 4/6] Drop testing for Python 3.6 As a package making extensive use of rdflib, the upstream support matrix nudges this project out of being able to test for Python 3.6. From the rdflib contribution guide as of today (possibly as of July): https://rdflib.readthedocs.io/en/stable/developers.html > RDFLib 5.0.0 maintained compatibility with python versions 2.7, 3.4, 3.5, 3.6, 3.7. > The latest 6.0.0 release and subsequent will only support Python 3.7 and newer. Signed-off-by: Alex Nelson --- .github/workflows/ci.yml | 2 +- setup.cfg | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1d49004..1e976a0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ 3.6, 3.8 ] + python-version: [ 3.7, 3.8 ] steps: - uses: actions/checkout@v2 diff --git a/setup.cfg b/setup.cfg index 900fd1f..66d100d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,14 +18,13 @@ classifiers = # TODO The constraint on pyparsing can be removed when rdflib Issue #1190 is resolved. # https://github.com/RDFLib/rdflib/issues/1190 install_requires = - # Note that numpy (pandas dependency) is only supported in Python >= 3.7. - pandas;python_version>='3.7' + pandas pyparsing < 3.0.0 rdflib >= 6.0.0 requests tabulate packages = find: -python_requires = >=3.6 +python_requires = >=3.7 [options.entry_points] console_scripts = From 4cf4c4b383c5132e06d61b6901b0c29d3294f2ff Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 7 Sep 2021 10:47:15 -0400 Subject: [PATCH 5/6] Bump CASE-Examples-QC pointer to remove dependency on rdflib-jsonld Signed-off-by: Alex Nelson --- dependencies/CASE-Examples-QC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/CASE-Examples-QC b/dependencies/CASE-Examples-QC index 1a153c7..49e1bdf 160000 --- a/dependencies/CASE-Examples-QC +++ b/dependencies/CASE-Examples-QC @@ -1 +1 @@ -Subproject commit 1a153c73d5d7f66509650c5c9d453b852676a60a +Subproject commit 49e1bdf7d6f366dc18655ace5ea3043e84493767 From ddcf0c76f62db75cdcbc321af0a61ccde5c733c0 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 7 Sep 2021 12:06:07 -0400 Subject: [PATCH 6/6] Bump version --- case_utils/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_utils/__init__.py b/case_utils/__init__.py index a7184e2..0190a05 100644 --- a/case_utils/__init__.py +++ b/case_utils/__init__.py @@ -11,7 +11,7 @@ # # We would appreciate acknowledgement if the software is used. -__version__ = "0.2.0" +__version__ = "0.2.1" import rdflib.util