8000 Dropping Python 3.3 Support (#232) · ClarkDing/firebase-admin-python@932cf17 · GitHub
[go: up one dir, main page]
Skip to content

Commit 932cf17

Browse files
hiranya911hiranya911
authored
Dropping Python 3.3 Support (firebase#232)
* Dropped support for Python 3.3 * Not installing Firestore on PyPy
< 8000 div class="p-2 d-flex gap-2 flex-column flex-md-row flex-justify-between">
1 parent 0ee828a commit 932cf17

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
language: python
22
python:
33
- "2.7"
4-
- "3.3"
4+
- "3.4"
55
- "3.5"
66
- "3.6"
7+
- "pypy3.5"
78
# command to install dependencies
89
install: "pip install -r requirements.txt"
910
before_script:

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Unreleased
22

3-
-
3+
- [changed] Dropped support for Python 3.3.
44

55
# v2.14.0
66

‎requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ tox >= 2.6.0
66

77
cachecontrol >= 0.12.4
88
google-auth >= 1.3.0
9-
google-cloud-firestore >= 0.27.0
9+
google-cloud-firestore >= 0.27.0; platform.python_implementation != 'PyPy'
1010
google-cloud-storage >= 1.2.0
1111
requests >= 2.13.0
1212
six >= 1.6.1
13-
enum34 >= 1.0.4; python_version < '3.4'

‎scripts/prepare_release.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,21 @@ fi
9393
# Ensure the checked out branch is master
9494
CHECKED_OUT_BRANCH="$(git branch | grep "*" | awk -F ' ' '{print $2}')"
9595
if [[ $CHECKED_OUT_BRANCH != "master" ]]; then
96-
read -p "[WARN] You are on the '${CHECKED_OUT_BRANCH}' branch, not 'master'. Continue? (Y/n) " CONTINUE
96+
read -p "[WARN] You are on the '${CHECKED_OUT_BRANCH}' branch, not 'master'. Continue? (y/N) " CONTINUE
9797
echo
9898

99-
if ! [[ $CONTINUE == "Y" ]]; then
99+
if ! [[ $CONTINUE == "y" || $CONTINUE == "Y" ]]; then
100100
echo "[INFO] You chose not to continue."
101101
exit 1
102102
fi
103103
fi
104104

105105
# Ensure the branch does not have local changes
106106
if [[ $(git status --porcelain) ]]; then
107-
read -p "[WARN] Local changes exist in the repo. Continue? (Y/n) " CONTINUE
107+
read -p "[WARN] Local changes exist in the repo. Continue? (y/N) " CONTINUE
108108
echo
109109

110-
if ! [[ $CONTINUE == "Y" ]]; then
110+
if ! [[ $CONTINUE == "y" || $CONTINUE == "Y" ]]; then
111111
echo "[INFO] You chose not to continue."
112112
exit 1
113113
fi

‎setup.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
from setuptools import setup
2323

2424

25-
if sys.version_info < (2, 7):
26-
print('firebase_admin requires python2 version >= 2.7 or python3.', file=sys.stderr)
25+
(major, minor) = (sys.version_info.major, sys.version_info.minor)
26+
if (major == 2 and minor < 7) or (major == 3 and minor < 4):
27+
print('firebase_admin requires python2 >= 2.7 or python3 >= 3.4', file=sys.stderr)
2728
sys.exit(1)
2829

29-
# Read in the package meta data per recommendations from:
30+
# Read in the package metadata per recommendations from:
3031
# https://packaging.python.org/guides/single-sourcing-package-version/
3132
about_path = path.join(path.dirname(path.abspath(__file__)), 'firebase_admin', '__about__.py')
3233
about = {}
@@ -45,10 +46,6 @@
4546
'six>=1.6.1'
4647
]
4748

48-
extras_require = {
49-
':python_version<"3.4"': ('enum34>=1.0.4',),
50-
}
51-
5249
setup(
5350
name=about['__title__'],
5451
version=about['__version__'],
@@ -58,18 +55,20 @@
5855
author=about['__author__'],
5956
license=about['__license__'],
6057
keywords='firebase cloud development',
61-
extras_require=extras_require,
6258
install_requires=install_requires,
6359
packages=find_packages(exclude=['tests']),
60+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
6461
classifiers=[
6562
'Development Status :: 5 - Production/Stable',
6663
'Intended Audience :: Developers',
6764
'Topic :: Software Development :: Build Tools',
6865
'Programming Language :: Python :: 2',
6966
'Programming Language :: Python :: 2.7',
7067
'Programming Language :: Python :: 3',
71-
'Programming Language :: Python :: 3.3',
68+
'Programming Language :: Python :: 3.4',
7269
'Programming Language :: Python :: 3.5',
70+
'Programming Language :: Python :: 3.6',
71+
'Programming Language :: Python :: 3.7',
7372
'License :: OSI Approved :: Apache Software License',
7473
],
7574
)

0 commit comments

Comments
 (0)
0