Skip to content

Commit 0522a94

Browse files
authored
Merge branch 'master' into strategies
2 parents 37468b5 + 1fdad68 commit 0522a94

11 files changed

Lines changed: 523 additions & 335 deletions

File tree

appveyor.yml renamed to .appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ environment:
1818
- PYTHON: "C:\\Python37-x64"
1919
TOX_ENV: "test-py37,codecov"
2020

21-
#- PYTHON: "C:\\Python38-x64"
22-
# TOX_ENV: "test-py38,codecov"
21+
- PYTHON: "C:\\Python38-x64"
22+
TOX_ENV: "test-py38,codecov"
2323

2424

2525
init:

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
sudo: false
2-
cache:
3-
directories:
4-
- $HOME/.cache/pip
1+
cache: pip
52

63
language: python
74

85

96
matrix:
107
include:
8+
- python: "3.8"
9+
env: TOXENV=flake8
10+
- python: "3.8"
11+
env: TOXENV=mypy
1112
- python: "2.7"
1213
env: TOXENV=test-py27,codecov
1314
- python: "3.4"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Hyperlink provides a pure-Python implementation of immutable
2525
URLs. Based on [RFC 3986][rfc3986] and [3987][rfc3987], the Hyperlink URL
2626
makes working with both URIs and IRIs easy.
2727

28-
Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, and PyPy.
28+
Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, and PyPy.
2929

3030
Full documentation is available on [Read the Docs][docs].
3131

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ hyperlink
1010
URLs. Based on `RFC 3986`_ and `RFC 3987`_, the Hyperlink URL balances
1111
simplicity and correctness for both :ref:`URIs and IRIs <uris_and_iris>`.
1212

13-
Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, and PyPy.
13+
Hyperlink is tested against Python 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, and PyPy.
1414

1515
For an introduction to the hyperlink library, its background, and URLs
1616
in general, see `this talk from PyConWeb 2017`_ (and `the accompanying

setup.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,21 @@
3434
'idna>=2.5',
3535
'typing ; python_version<"3.5"',
3636
],
37+
python_requires='>=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
3738
classifiers=[
3839
'Topic :: Utilities',
3940
'Intended Audience :: Developers',
4041
'Topic :: Software Development :: Libraries',
4142
'Development Status :: 5 - Production/Stable',
43+
'Programming Language :: Python :: 2',
4244
'Programming Language :: Python :: 2.6',
4345
'Programming Language :: Python :: 2.7',
46+
'Programming Language :: Python :: 3',
4447
'Programming Language :: Python :: 3.4',
4548
'Programming Language :: Python :: 3.5',
4649
'Programming Language :: Python :: 3.6',
50+
'Programming Language :: Python :: 3.7',
51+
'Programming Language :: Python :: 3.8',
4752
'Programming Language :: Python :: Implementation :: PyPy',
4853
'License :: OSI Approved :: MIT License', ]
4954
)

0 commit comments

Comments
 (0)