Skip to content

Commit

Permalink
Version 20211005
Browse files Browse the repository at this point in the history
  • Loading branch information
mborsetti committed Oct 5, 2021
1 parent 22c66f5 commit fee76b4
Show file tree
Hide file tree
Showing 11 changed files with 486 additions and 80 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ['3.9', '3.8', '3.7', '3.6']
python-version: ['3.10', '3.9', '3.8', '3.7', '3.6']
# for valid python-version see https://github.com/actions/python-versions/blob/main/versions-manifest.json
include:
- os: ubuntu-latest
Expand Down
18 changes: 12 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@

# NOTE: in this package implementation, tox runs 'pre-commit run -a'

minimum_pre_commit_version: 2.15.0

# Force all unspecified python hooks to run python3
default_language_version:
python: python3

# A list of repository mappings.
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
Expand Down Expand Up @@ -109,12 +115,12 @@ repos:
- id: text-unicode-replacement-char
description: Forbid files which have a UTF-8 Unicode replacement character

# NOT using black because it does not support single-quote
# - repo: https://github.com/python/black
# rev: 20.8b1
# hooks:
# - id: black
# language_version: python3
- repo: https://github.com/python/black
rev: 21.9b0
hooks:
- id: black
name: Uncompromising code formatting (black)
language_version: python3

- repo: https://github.com/pycqa/flake8
rev: 3.9.2
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on the UTC date of the release.

`Contributions <https://github.com/mborsetti/airportdata/blob/master/CHANGELOG.rst>`__ always welcomed!

Version 20211005
==================
* Support for Python 3.10

Version 20210926
==================
* Renamed KSJG to Northeast Florida Regional Airport (formerly St Augustine Airport)
Expand Down
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ Known issues:
Please report any issues you may find `here
<https://github.com/mborsetti/airportsdata/blob/main/CONTRIBUTING.rst>`__.

This project is a fork of https://github.com/mwgg/Airports and all IATA codes submitted in this fork have been
valdidated against `IATA <https://www.iata.org/en/publications/directories/code-search/>`__.
This project is a fork of https://github.com/mwgg/Airports. All IATA codes submitted in this fork have been
validated against `IATA <https://www.iata.org/en/publications/directories/code-search/>`__.

Raw data
========
Expand Down
8 changes: 1 addition & 7 deletions RELEASE.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1 @@
* Renamed KSJG to Northeast Florida Regional Airport (formerly St Augustine Airport)
* Upstream contributions by `himelsaha29 <https://github.com/himelsaha29>`__ in `#53
<https://github.com/mwgg/Airports/pull/53>`__:
* Added ``iata`` UST to KSJG Northeast Florida Regional Airport
* Added UAAL/USJ Usharal Airport, Usharal, Kazakhstan
* Added city to YBLN/BQB Busselton Regional Airport, Busselton, WA, Australia
* Python code now has more extensive type hints
* Support for Python 3.10
2 changes: 1 addition & 1 deletion airportsdata/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

__project_name__ = __package__
# Release numbering follows the release data
__version__ = '20210926'
__version__ = '20211005'
__min_python_version__ = (3, 6)
__author__ = 'Mike Borsetti <mike@borsetti.com>'
__copyright__ = 'Copyright 2020- Mike Borsetti'
Expand Down
10 changes: 10 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[tool.black]
# Uncompromising code formatting
# Runs as part of pre-commit
# https://black.readthedocs.io/en/stable/usage_and_configuration/the_basics.html#configuration-via-a-file
# What's in here overrides the command-line options shown by running $ black --help.
line-length = 120
target-version = ['py37']
skip-string-normalization = true
extend-exclude = '/(\.idea|\.pytest_cache|\__pycache__|\venv.*|\webchanges.egg-info)/'
color = true
24 changes: 13 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,16 @@
import airportsdata as project

if sys.version_info < project.__min_python_version__:
sys.exit(f'{project.__project_name__} requires Python version '
f'{".".join(str(v) for v in project.__min_python_version__)} or newer.\n'
f'You are running {sys.version}')
sys.exit(
f'{project.__project_name__} requires Python version '
f'{".".join(str(v) for v in project.__min_python_version__)} or newer.\n'
f'You are running {sys.version}'
)

# requirements = list(map(str.strip, open('requirements.txt').readlines()))
requirements = ['typing_extensions; python_version < "3.8"']
# requirements_testing = list(map(str.strip, open('tests/requirements_testing.txt').readlines()))
requirements_testing = ['backports.zoneinfo; python_version < "3.9"',
'pytest',
'pytest-cov',
'tzdata; os_name == "nt"']
requirements_testing = ['backports.zoneinfo; python_version < "3.9"', 'pytest', 'pytest-cov', 'tzdata; os_name == "nt"']
README_rst = open('README.rst').read()

SETUP = {
Expand All @@ -41,9 +40,10 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Operating System :: OS Independent',
'Topic :: Database',
'Intended Audience :: Developers'
'Intended Audience :: Developers',
],
'license': project.__license__,
# data_files is deprecated. It does not work with wheels, so it should be avoided.
Expand All @@ -54,8 +54,10 @@
# 'entry_points': {},
'extras_require': {'testing': requirements_testing},
'python_requires': f'>={".".join(str(v) for v in project.__min_python_version__)}',
'project_urls': {'Bug Tracker': f'{project.__url__.rstrip("//")}/issues',
'Source Code': project.__url__,
'Documentation': f'{project.__url__.rstrip("//")}/README.rst'}
'project_urls': {
'Bug Tracker': f'{project.__url__.rstrip("//")}/issues',
'Source Code': project.__url__,
'Documentation': f'{project.__url__.rstrip("//")}/README.rst',
},
}
setup(**SETUP)

0 comments on commit fee76b4

Please sign in to comment.