Skip to content
This repository was archived by the owner on Jan 12, 2023. It is now read-only.

Commit 7e6ef53

Browse files
hugovkc-w
andauthored
Fix tests + drop Python 3.5 (#143)
Co-authored-by: Clemens Wolff <clemens@justamouse.com>
1 parent 2c9aace commit 7e6ef53

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
strategy:
14+
fail-fast: false
1415
matrix:
1516
python:
1617
- '2.7'
17-
- '3.5'
1818
- '3.6'
1919
- '3.7'
2020
- '3.8'

.github/workflows/daily.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ${{ matrix.os }}-latest
1414

1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
python:
1819
- '2.7'
19-
- '3.5'
2020
- '3.9'
2121
os:
2222
- windows
@@ -33,17 +33,19 @@ jobs:
3333

3434
- name: 'Install bsddb3 wheel'
3535
run: |
36-
$mirror = 'https://github.com/c-w/gutenberg/files/4944332/bsddb3-wheels.zip'
37-
$pythonVersionMinor = python -c 'import sys; print(sys.version_info.minor)'
38-
$pythonVersionMajor = python -c 'import sys; print(sys.version_info.major)'
36+
$mirror = 'https://github.com/c-w/gutenberg/files/7776074/bsddb3-wheels.zip'
37+
$pythonVersionMinor = [int]::Parse($(python -c 'import sys; print(sys.version_info.minor)'))
38+
$pythonVersionMajor = [int]::Parse($(python -c 'import sys; print(sys.version_info.major)'))
3939
if ($pythonVersionMajor -lt 3) { exit 0 }
40-
$bsddbVersion = if ($pythonVersionMinor -eq 5) { '6.2.6' } else { '6.2.7' }
40+
$bsddbVersion = '6.2.9'
4141
$abiTag = if ($pythonVersionMinor -ge 8) { "cp3$pythonVersionMinor" } else { "cp3${pythonVersionMinor}m" }
4242
$wheel = "bsddb3-$bsddbVersion-cp3$pythonVersionMinor-$abiTag-win_amd64.whl"
4343
$tmpDir = [System.IO.Path]::GetTempPath()
44-
Invoke-WebRequest -Uri "$mirror" -OutFile "$tmpDir\wheels.zip"
45-
Expand-Archive "$tmpDir\wheels.zip" "$tmpDir"
46-
pip install "$tmpDir\$wheel"
44+
$zipPath = Join-Path "$tmpDir" "wheels.zip"
45+
$wheelPath = Join-Path "$tmpDir" "$wheel"
46+
Invoke-WebRequest -Uri "$mirror" -OutFile "$zipPath"
47+
Expand-Archive "$zipPath" "$tmpDir"
48+
pip install "$wheelPath"
4749
shell: powershell
4850
if: matrix.os == 'windows'
4951

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
'setuptools>=18.5',
1818
'rdflib-sqlalchemy>=0.3.8',
1919
'SPARQLWrapper>=1.8.2',
20+
'pyparsing<3.0.0',
2021
]
2122

2223
if version_info.major == 2:
@@ -55,7 +56,6 @@
5556
'Programming Language :: Python :: 2',
5657
'Programming Language :: Python :: 2.7',
5758
'Programming Language :: Python :: 3',
58-
'Programming Language :: Python :: 3.5',
5959
'Programming Language :: Python :: 3.6',
6060
'Programming Language :: Python :: 3.7',
6161
'Programming Language :: Python :: 3.8',

0 commit comments

Comments
 (0)