Skip to content

Commit 8ee7831

Browse files
pquentinpquentin
authored
Merge branch 'master' into unasync-remove
2 parents d8a8fc6 + 0d21b04 commit 8ee7831

12 files changed

Lines changed: 175 additions & 228 deletions

File tree

‎.appveyor.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
name: CI
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
Windows:
7+
name: 'Windows (${{ matrix.python }})'
8+
runs-on: 'windows-latest'
9+
strategy:
10+
fail-fast: false
11+
matrix:
12+
python: ['3.7', '3.8', '3.9', '3.10']
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Setup python
18+
uses: actions/setup-python@v2
19+
with:
20+
python-version: ${{ matrix.python }}
21+
cache: pip
22+
cache-dependency-path: test-requirements.txt
23+
- name: Run tests
24+
run: ./ci.sh
25+
shell: bash
26+
env:
27+
# Should match 'name:' up above
28+
JOB_NAME: 'Windows (${{ matrix.python }})'
29+
30+
Ubuntu:
31+
name: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
32+
timeout-minutes: 10
33+
runs-on: 'ubuntu-latest'
34+
strategy:
35+
fail-fast: false
36+
matrix:
37+
python: ['3.7', '3.8', '3.9', '3.10', '3.11-dev']
38+
check_formatting: ['0']
39+
extra_name: ['']
40+
include:
41+
- python: '3.10'
42+
check_formatting: '1'
43+
extra_name: ', check formatting'
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v2
47+
- name: Setup python
48+
uses: actions/setup-python@v2
49+
if: "!endsWith(matrix.python, '-dev')"
50+
with:
51+
python-version: ${{ matrix.python }}
52+
cache: pip
53+
cache-dependency-path: test-requirements.txt
54+
- name: Setup python (dev)
55+
uses: deadsnakes/[email protected]
56+
if: endsWith(matrix.python, '-dev')
57+
with:
58+
python-version: '${{ matrix.python }}'
59+
- name: Run tests
60+
run: ./ci.sh
61+
env:
62+
CHECK_FORMATTING: '${{ matrix.check_formatting }}'
63+
# Should match 'name:' up above
64+
JOB_NAME: 'Ubuntu (${{ matrix.python }}${{ matrix.extra_name }})'
65+
66+
macOS:
67+
name: 'macOS (${{ matrix.python }})'
68+
timeout-minutes: 10
69+
runs-on: 'macos-latest'
70+
strategy:
71+
fail-fast: false
72+
matrix:
73+
python: ['3.7', '3.8', '3.9', '3.10']
74+
steps:
75+
- name: Checkout
76+
uses: actions/checkout@v2
77+
- name: Setup python
78+
uses: actions/setup-python@v2
79+
with:
80+
python-version: ${{ matrix.python }}
81+
cache: pip
82+
cache-dependency-path: test-requirements.txt
83+
- name: Run tests
84+
run: ./ci.sh
85+
env:
86+
# Should match 'name:' up above
87+
JOB_NAME: 'macOS (${{ matrix.python }})'

‎.readthedocs.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ formats:
55

66
requirements_file: ci/rtd-requirements.txt
77

8-
# Currently RTD's default image only has 3.5
9-
# This gets us 3.6 (and hopefully 3.7 in the future)
10-
# https://docs.readthedocs.io/en/latest/yaml-config.html#build-image
11-
build:
12-
image: latest
13-
148
python:
159
version: 3
1610
pip_install: True

‎.travis.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎ci.sh‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
BLACK_VERSION=22.6.0
6+
7+
pip install -U pip setuptools wheel
8+
9+
python setup.py sdist --formats=zip
10+
pip install dist/*.zip
11+
12+
if [ "$CHECK_FORMATTING" = "1" ]; then
13+
pip install black==${BLACK_VERSION} isort>=5
14+
if ! black --diff setup.py src tests; then
15+
cat <<EOF
16+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
17+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
18+
19+
Formatting problems were found (listed above). To fix them, run
20+
21+
pip install black==$BLACK_VERSION
22+
black setup.py src tests
23+
24+
in your local checkout.
25+
26+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
27+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
28+
EOF
29+
exit 1
30+
fi
31+
32+
# required for isort to order test imports correctly
33+
pip install -Ur test-requirements.txt
34+
35+
if ! isort --check-only --diff . ; then
36+
cat <<EOF
37+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
38+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
39+
40+
Formatting problems were found (listed above). To fix them, run
41+
42+
pip install isort
43+
isort .
44+
45+
in your local checkout.
46+
47+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
48+
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
49+
EOF
50+
exit 1
51+
fi
52+
exit 0
53+
fi
54+
55+
# Actual tests
56+
pip install -Ur test-requirements.txt
57+
58+
pytest -W error -ra -v tests --cov --cov-config=.coveragerc
59+
60+
bash <(curl -s https://codecov.io/bash)

‎ci/travis.sh‎

Lines changed: 0 additions & 97 deletions
This file was deleted.

‎docs/source/conf.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
32
#
43
# Documentation build configuration file, created by
54
# sphinx-quickstart on Sat Jan 21 19:11:14 2017.

‎setup.py‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
import io
1+
from setuptools import find_packages, setup
22

3-
from setuptools import setup, find_packages
3+
exec(open("src/unasync/_version.py", encoding="utf-8").read())
44

5-
exec(io.open("src/unasync/_version.py", encoding="utf-8").read())
6-
7-
LONG_DESC = io.open("README.rst", encoding="utf-8").read()
5+
LONG_DESC = open("README.rst", encoding="utf-8").read()
86

97
setup(
108
name="unasync",
@@ -15,27 +13,24 @@
1513
long_description_content_type="text/x-rst",
1614
author="Ratan Kulshreshtha",
1715
author_email="[email protected]",
18-
license="MIT -or- Apache License 2.0",
16+
license="MIT OR Apache-2.0",
1917
include_package_data=True,
2018
packages=find_packages("src"),
2119
package_dir={"": "src"},
2220
install_requires=['tokenize_rt; python_version >= "3.8.0"'],
2321
keywords=["async"],
24-
python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4",
22+
python_requires=">=3.7",
2523
classifiers=[
2624
"License :: OSI Approved :: MIT License",
2725
"License :: OSI Approved :: Apache Software License",
2826
"Framework :: Trio",
2927
"Operating System :: POSIX :: Linux",
3028
"Operating System :: MacOS :: MacOS X",
3129
"Operating System :: Microsoft :: Windows",
32-
"Programming Language :: Python :: 2",
33-
"Programming Language :: Python :: 2.7",
34-
"Programming Language :: Python :: 3",
35-
"Programming Language :: Python :: 3.5",
36-
"Programming Language :: Python :: 3.6",
3730
"Programming Language :: Python :: 3.7",
3831
"Programming Language :: Python :: 3.8",
32+
"Programming Language :: Python :: 3.9",
33+
"Programming Language :: Python :: 3.10",
3934
"Programming Language :: Python :: Implementation :: CPython",
4035
"Programming Language :: Python :: Implementation :: PyPy",
4136
],

0 commit comments

Comments
 (0)