Skip to content

Commit

Permalink
Merge pull request #36 from dbrgn/python-bump
Browse files Browse the repository at this point in the history
Bump minimal supported Python version to 3.9+, switch to GitHub CI
  • Loading branch information
dbrgn authored Dec 2, 2023
2 parents 69c2227 + d2aa660 commit 2326fc9
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 91 deletions.
79 changes: 0 additions & 79 deletions .circleci/config.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: CI
on: [push]
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
pyversion: ["3.9", "3.10", "3.11"]
steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "${{ matrix.version }}"
- name: Display Python version
run: python -c "import sys; print(sys.version)"
- name: Install tox
run: pip install tox
- name: Run tests on Python ${{ matrix.version }}
run: tox
env:
TOXENV: "py${{ matrix.version }}"
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
.coverage
.coveralls.yml
.tox
venv/
VENV/
virtual/
VIRTUAL/
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ fahrplan
========


.. image:: https://circleci.com/gh/dbrgn/fahrplan.svg?style=shield&circle-token=:circle-token
.. image:: https://github.com/dbrgn/fahrplan/actions/workflows/CI/badge.svg
:alt: Build status
:target: https://circleci.com/gh/dbrgn/fahrplan/
:target: https://github.com/dbrgn/fahrplan/actions

Goal: Simple access to the SBB/CFF/FFS timetable service from the commandline with human
Goal: Simple access to the SBB/CFF/FFS timetable service from the command line with human
readable argument parsing.

Relies on the public transport API by opendata.ch: http://transport.opendata.ch/

Fahrplan supports Python 3.5+.
Fahrplan supports Python 3.9+.


Installing
Expand Down
1 change: 0 additions & 1 deletion fahrplan/tests/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def testHelp(self):
r = run_command('{0} {1}'.format(BASE_COMMAND, arg))
self.assertTrue(meta.description in r.std_out)
self.assertTrue('usage:' in r.std_out)
self.assertTrue('optional arguments:' in r.std_out)
self.assertTrue('positional arguments:' in r.std_out)
self.assertTrue('Examples:' in r.std_out)

Expand Down
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@

f = open('requirements.txt', 'r')
lines = f.readlines()
requirements = [l.strip().strip('\n') for l in lines if l.strip() and not l.strip().startswith('#')]
requirements = [
line.strip().strip('\n') for line in lines
if line.strip() and not line.strip().startswith('#')
]
readme = open('README.rst').read()

setup(name='fahrplan',
Expand Down Expand Up @@ -38,10 +41,6 @@
'Operating System :: MacOS',
'Operating System :: POSIX :: Linux',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Topic :: Internet',
'Topic :: Terminals',
],
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py35, py36, py37
envlist = py39, py310, py311

[testenv]
deps =
Expand All @@ -8,7 +8,7 @@ deps =
commands = nose2 fahrplan

[testenv:cov]
basepython=python3.5
basepython=python3.11
deps=
{[testenv]deps}
cov-core
Expand Down

0 comments on commit 2326fc9

Please sign in to comment.