Skip to content

Commit

Permalink
Drop support for Python 3.7
Browse files Browse the repository at this point in the history
which has reached end of life on 2023-06-27.
  • Loading branch information
nsoranzo committed Jun 30, 2023
1 parent d81b013 commit b5c4c5e
Show file tree
Hide file tree
Showing 26 changed files with 29 additions and 46 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ['3.7', '3.11']
python-version: ['3.8', '3.11']
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
tox_env: [py37]
tox_env: [py38]
galaxy_version:
- dev
- release_23.1
Expand All @@ -52,7 +52,7 @@ jobs:
# Cannot test on macOS because service containers are not supported
# yet: https://github.community/t/github-actions-services-available-on-others-vms/16916
# - os: macos-latest
# tox_env: py37
# tox_env: py38
# galaxy_version: dev
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion ABOUT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ interacting with the `Galaxy`_ API.

BioBlend is supported and tested on:

- Python 3.7 - 3.11
- Python 3.8 - 3.11
- Galaxy release 19.05 and later.

BioBlend's goal is to make it easier to script and automate the running of
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ How to run BioBlend tests

1. Clone Galaxy to a directory outside of BioBlend source directory via `git clone https://github.com/galaxyproject/galaxy.git`

2. Change directory to your BioBlend source and run the tests via `./run_bioblend_tests.sh -g GALAXY_PATH [-r GALAXY_REV] [-e TOX_ENV]` where `GALAXY_PATH` is the directory where the galaxy repository was cloned, `GALAXY_REV` is the branch or commit of Galaxy that you would like to test against (if different from the current state of your galaxy clone), and `TOX_ENV` is used to specify the Python version to use for BioBlend, e.g. `py37` for Python 3.7.
2. Change directory to your BioBlend source and run the tests via `./run_bioblend_tests.sh -g GALAXY_PATH [-r GALAXY_REV] [-e TOX_ENV]` where `GALAXY_PATH` is the directory where the galaxy repository was cloned, `GALAXY_REV` is the branch or commit of Galaxy that you would like to test against (if different from the current state of your galaxy clone), and `TOX_ENV` is used to specify the Python version to use for BioBlend, e.g. `py38` for Python 3.8.

You can also add `2>&1 | tee log.txt` to the command above to contemporarily view the test output and save it to the `log.txt` file.

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BioBlend is a Python library for interacting with the `Galaxy`_ API.

BioBlend is supported and tested on:

- Python 3.7 - 3.11
- Python 3.8 - 3.11
- Galaxy release 19.05 and later.

Full docs are available at https://bioblend.readthedocs.io/ with a quick library
Expand Down
3 changes: 1 addition & 2 deletions bioblend/_tests/GalaxyTestBase.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
from typing import (
Any,
Dict,
Literal,
)

from typing_extensions import Literal

import bioblend
from bioblend.galaxy import GalaxyInstance
from . import test_util
Expand Down
3 changes: 1 addition & 2 deletions bioblend/_tests/TestGalaxyJobs.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
timedelta,
)
from operator import itemgetter

from typing_extensions import Literal
from typing import Literal

from bioblend.galaxy.tools.inputs import (
dataset,
Expand Down
2 changes: 1 addition & 1 deletion bioblend/_tests/TestGalaxyObjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
Dict,
Iterable,
List,
Literal,
Set,
Tuple,
Union,
Expand All @@ -24,7 +25,6 @@
from urllib.request import urlopen

import pytest
from typing_extensions import Literal

import bioblend
from bioblend.galaxy import dataset_collections
Expand Down
2 changes: 1 addition & 1 deletion bioblend/galaxy/datasets/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
Any,
Dict,
List,
Literal,
Optional,
overload,
Tuple,
Expand All @@ -18,7 +19,6 @@
)

from requests import Response
from typing_extensions import Literal

import bioblend
from bioblend import TimeoutException
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/folders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
Union,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/genomes/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@
from typing import (
Any,
Dict,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/histories/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
Dict,
IO,
List,
Literal,
Optional,
overload,
Pattern,
Union,
)

from typing_extensions import Literal

import bioblend
from bioblend import ConnectionError
from bioblend.galaxy.client import Client
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/jobs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend import TimeoutException
from bioblend.galaxy.client import Client

Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/libraries/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client
from bioblend.galaxy.datasets import (
DatasetTimeoutException,
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/objects/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,14 @@
Dict,
Generic,
List,
Literal,
Optional,
overload,
Type,
TYPE_CHECKING,
Union,
)

from typing_extensions import Literal

import bioblend
from bioblend.galaxy.datasets import HdaLdda
from . import wrappers
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/objects/wrappers.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
Iterable,
Iterator,
List,
Literal,
Optional,
Set,
Tuple,
Expand All @@ -30,8 +31,6 @@
Union,
)

from typing_extensions import Literal

import bioblend
from bioblend.galaxy.workflows import InputsBy
from bioblend.util import abstractclass
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/quotas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/tool_dependencies/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/tools/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
Union,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client
from bioblend.galaxyclient import UPLOAD_CHUNK_SIZE
from bioblend.util import attach_file
Expand Down
3 changes: 1 addition & 2 deletions bioblend/galaxy/workflows/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/toolshed/categories/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
Any,
Dict,
List,
Literal,
TYPE_CHECKING,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client

if TYPE_CHECKING:
Expand Down
3 changes: 1 addition & 2 deletions bioblend/toolshed/repositories/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
Any,
Dict,
List,
Literal,
Optional,
TYPE_CHECKING,
Union,
)

from typing_extensions import Literal

from bioblend.galaxy.client import Client
from bioblend.util import attach_file

Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ build-backend = "setuptools.build_meta"
[tool.black]
include = '\.pyi?$'
line-length = 120
target-version = ['py37']
target-version = ['py38']

[tool.darker]
isort = true

[tool.ruff]
select = ["E", "F", "B", "UP"]
target-version = "py37"
target-version = "py38"
# Exceptions:
# B9 flake8-bugbear opinionated warnings
# E501 is line length (delegated to black)
Expand Down
4 changes: 2 additions & 2 deletions run_bioblend_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Options:
-p PORT
Port to use for the Galaxy server. Defaults to 8080.
-e TOX_ENV
Work against specified tox environments. Defaults to py37.
Work against specified tox environments. Defaults to py38.
-t BIOBLEND_TESTS
Subset of tests to run, e.g.
'tests/TestGalaxyObjects.py::TestHistory::test_create_delete' . Defaults
Expand All @@ -33,7 +33,7 @@ get_abs_dirname () {
cd "$1" && pwd
}

e_val=py37
e_val=py38
GALAXY_PORT=8080
while getopts 'hcg:e:p:t:r:v:' option; do
case $option in
Expand Down
4 changes: 1 addition & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ classifiers =
License :: OSI Approved :: MIT License
Operating System :: OS Independent
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Expand Down Expand Up @@ -71,9 +70,8 @@ install_requires =
requests>=2.20.0
requests-toolbelt>=0.5.1,!=0.9.0
tuspy
typing-extensions
packages = find:
python_requires = >=3.7
python_requires = >=3.8

[options.entry_points]
console_scripts =
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = lint, py37
envlist = lint, py38

[testenv]
commands =
Expand Down

0 comments on commit b5c4c5e

Please sign in to comment.