Skip to content

Commit 46a8c70

Browse files
committed
Removing Python 2.7 test work-arounds and project classifier
1 parent eb71fa1 commit 46a8c70

File tree

5 files changed

+5
-21
lines changed

5 files changed

+5
-21
lines changed

.github/workflows/python-package.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
strategy:
1919
matrix:
20-
python-version: [2.7, 3.7, 3.8, 3.9, '3.10']
20+
python-version: [3.7, 3.8, 3.9, '3.10']
2121
database:
2222
- pgsql
2323
- mysql
@@ -31,15 +31,12 @@ jobs:
3131
python-version: ${{ matrix.python-version }}
3232
- name: Install dependencies
3333
run: |
34-
if [ ${{ matrix.python-version }} != "2.7" ] ; then
35-
python -m pip install --upgrade pip
36-
fi
34+
python -m pip install --upgrade pip
3735
python -m pip install -r test-requirements.txt
3836
python -m pip install tox-gh-actions coveralls
3937
sudo apt-get install python3-dev
4038
pip install .
4139
- name: Test with tox
42-
if: ${{ ! (matrix['python-version'] == '2.7' && matrix['database'] == 'mysql') }}
4340
env:
4441
DB: ${{ matrix.database }}
4542
GA_PYTHON_VERSION: ${{ matrix.python-version }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Back-end persistence is provided by SQLAlchemy.
1717

1818
Tested dialects are:
1919

20-
- SQLite, using the built-in Python driver or, for Python 2.5, pysqlite
20+
- SQLite, using the built-in Python driver
2121
- MySQL, using the MySQLdb-python driver or, for Python 3, mysql-connector
2222
- PostgreSQL, using the psycopg2 driver or the pg8000 driver.
2323

github-ci.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ if [ "$DB" = 'pgsql' ]; then
1010
fi
1111

1212
if [ "$DB" = 'mysql' ]; then
13-
if [[ "$GA_PYTHON_VERSION" =~ '.*3\.[789].*' ]] ; then
14-
export DBURI='mysql+mysqlconnector://test:[email protected]/test?charset=utf8'
15-
else
16-
export DBURI='mysql+mysqldb://test:[email protected]/test?charset=utf8'
17-
fi
13+
export DBURI='mysql+mysqldb://test:[email protected]/test?charset=utf8'
1814
fi
1915

2016
if [ "$DB" = 'sqlite' ]; then

setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232
classifiers=[
3333
"Development Status :: 4 - Beta",
3434
"Programming Language :: Python",
35-
"Programming Language :: Python :: 2",
36-
"Programming Language :: Python :: 2.7",
3735
"Programming Language :: Python :: 3",
3836
"Programming Language :: Python :: 3.7",
3937
"Programming Language :: Python :: 3.8",

tox.ini

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
envlist =
3-
py27,py37,py38,py39,py310,lint
3+
py37,py38,py39,py310,lint
44

55
[testenv]
66
passenv = DB DBURI
@@ -13,21 +13,14 @@ deps =
1313
pytest-cov>=2.5.1
1414
psycopg2
1515
mysqlclient
16-
py{37,38,39,310}: mysql-connector
1716

1817
[testenv:lint]
1918
commands = flake8 rdflib_sqlalchemy test
2019
deps =
2120
flake8
2221

23-
[travis]
24-
python =
25-
2.7: py27, lint
26-
3.7: py37, lint
27-
2822
[gh-actions]
2923
python =
30-
2.7: py27, lint
3124
3.7: py37, lint
3225
3.8: py38
3326
3.9: py39

0 commit comments

Comments
 (0)