Skip to content

Commit f239fcd

Browse files
althonosalthonos
authored
Merge pull request #436 from PyFilesystem/patch-12
Prepare for release `v2.4.12`
2 parents a16d165 + a55c9ff commit f239fcd

9 files changed

+86
-55
lines changed

‎pull_request_template.md ‎.github/PULL_REQUEST_TEMPLATE.md

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
## Type of changes
22

3-
- [ ] Bug fix
4-
- [ ] New feature
5-
- [ ] Documentation / docstrings
6-
- [ ] Tests
7-
- [ ] Other
3+
<!-- Remove unrelated categories -->
4+
5+
- Bug fix
6+
- New feature
7+
- Documentation / docstrings
8+
- Tests
9+
- Other
810

911
## Checklist
1012

1113
- [ ] I've run the latest [black](https://github.com/ambv/black) with default args on new code.
1214
- [ ] I've updated CHANGELOG.md and CONTRIBUTORS.md where appropriate.
1315
- [ ] I've added tests for new code.
14-
- [ ] I accept that @willmcgugan may be pedantic in the code review.
16+
- [ ] I accept that @PyFilesystem/maintainers may be pedantic in the code review.
1517

1618
## Description
1719

‎.travis.yml

+17-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ python:
99
- "3.6"
1010
- "3.7"
1111
- "3.8"
12+
- "3.9"
1213
- "pypy"
1314
- "pypy3.5-7.0" # Need 7.0+ due to a bug in earlier versions that broke our tests.
1415

@@ -35,8 +36,22 @@ before_install:
3536
install:
3637
- pip install -e .
3738

39+
# command to run tests
40+
script: tox
41+
3842
after_success:
3943
- coveralls
4044

41-
# command to run tests
42-
script: tox
45+
before_deploy:
46+
- pip install -U twine wheel
47+
- python setup.py sdist bdist_wheel
48+
49+
deploy:
50+
provider: script
51+
script: twine upload dist/*
52+
skip_cleanup: true
53+
on:
54+
python: 3.9
55+
tags: true
56+
repo: PyFilesystem/pyfilesystem2
57+

‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8-
## [2.4.12] - (Unreleased)
8+
## [2.4.12] - 2021-01-13
99

1010
### Added
1111

‎CONTRIBUTORS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Many thanks to the following developers for contributing to this project:
66
- [C. W.](https://github.com/chfw)
77
- [Diego Argueta](https://github.com/dargueta)
88
- [Geoff Jukes](https://github.com/geoffjukes)
9-
- [Giampaolo](https://github.com/gpcimino)
9+
- [Giampaolo Cimino](https://github.com/gpcimino)
1010
- [Justin Charlong](https://github.com/jcharlong)
1111
- [Louis Sautier](https://github.com/sbraz)
1212
- [Martin Larralde](https://github.com/althonos)

‎LICENSE

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
MIT License
22

3+
Copyright (c) 2017-2021 The PyFilesystem2 contributors
34
Copyright (c) 2016-2019 Will McGugan
45

56
Permission is hereby granted, free of charge, to any person obtaining a copy

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,11 @@ The following developers have contributed code and their time to this projects:
9595

9696
- [Will McGugan](https://github.com/willmcgugan)
9797
- [Martin Larralde](https://github.com/althonos)
98-
- [Giampaolo](https://github.com/gpcimino)
98+
- [Giampaolo Cimino](https://github.com/gpcimino)
9999
- [Geoff Jukes](https://github.com/geoffjukes)
100100

101-
See CONTRIBUTORS.md for a full list of contributors.
101+
See [CONTRIBUTORS.md](https://github.com/PyFilesystem/pyfilesystem2/blob/master/CONTRIBUTORS.md)
102+
for a full list of contributors.
102103

103104
PyFilesystem2 owes a massive debt of gratitude to the following
104105
developers who contributed code and ideas to the original version.

‎fs/_version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""Version, used in module and setup.py.
22
"""
3-
__version__ = "2.4.11"
3+
__version__ = "2.4.12"

‎setup.cfg

+50
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,64 @@
22
universal = 1
33

44
[metadata]
5+
version = attr: fs._version.__version__
6+
name = fs
7+
author = Will McGugan
8+
author_email = [email protected]
9+
maintainer = Martin Larralde
10+
maintainer_email = [email protected]
11+
url = https://github.com/PyFilesystem/pyfilesystem2
12+
license = MIT
513
license_file = LICENSE
14+
description = Python's filesystem abstraction layer
615
long_description = file: README.md
716
long_description_content_type = text/markdown
17+
platform = any
18+
classifiers =
19+
Development Status :: 5 - Production/Stable
20+
Intended Audience :: Developers
21+
License :: OSI Approved :: MIT License
22+
Operating System :: OS Independent
23+
Programming Language :: Python
24+
Programming Language :: Python :: 2.7
25+
Programming Language :: Python :: 3.4
26+
Programming Language :: Python :: 3.5
27+
Programming Language :: Python :: 3.6
28+
Programming Language :: Python :: 3.7
29+
Programming Language :: Python :: 3.8
30+
Programming Language :: Python :: 3.9
31+
Programming Language :: Python :: Implementation :: CPython
32+
Programming Language :: Python :: Implementation :: PyPy
33+
Topic :: System :: Filesystems
834
project_urls =
935
Bug Reports = https://github.com/PyFilesystem/pyfilesystem2/issues
1036
Documentation = https://pyfilesystem2.readthedocs.io/en/latest/
1137
Wiki = https://www.pyfilesystem.org/
1238
39+
[options]
40+
zip_safe = false
41+
packages = find:
42+
setup_requires =
43+
setuptools >=38.3.0
44+
install_requires =
45+
appdirs~=1.4.3
46+
pytz
47+
setuptools
48+
six ~=1.10
49+
enum34 ~=1.1.6 ; python_version < '3.4'
50+
typing ~=3.6 ; python_version < '3.6'
51+
backports.os ~=0.1 ; python_version < '3.0'
52+
53+
[options.extras_require]
54+
scandir =
55+
scandir~=1.5 ; python_version < '3.5'
56+
57+
[options.packages.find]
58+
exclude = tests
59+
60+
[options.package_data]
61+
fs = py.typed
62+
1363
[pydocstyle]
1464
inherit = false
1565
ignore = D102,D105,D200,D203,D213,D406,D407

‎setup.py

+4-42
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,9 @@
11
#!/usr/bin/env python
22

3-
from setuptools import setup, find_packages
3+
import os
44

5-
with open("fs/_version.py") as f:
5+
with open(os.path.join("fs", "_version.py")) as f:
66
exec(f.read())
77

8-
CLASSIFIERS = [
9-
"Development Status :: 5 - Production/Stable",
10-
"Intended Audience :: Developers",
11-
"License :: OSI Approved :: MIT License",
12-
"Operating System :: OS Independent",
13-
"Programming Language :: Python",
14-
"Programming Language :: Python :: 2.7",
15-
"Programming Language :: Python :: 3.4",
16-
"Programming Language :: Python :: 3.5",
17-
"Programming Language :: Python :: 3.6",
18-
"Programming Language :: Python :: 3.7",
19-
"Programming Language :: Python :: 3.8",
20-
"Programming Language :: Python :: Implementation :: CPython",
21-
"Programming Language :: Python :: Implementation :: PyPy",
22-
"Topic :: System :: Filesystems",
23-
]
24-
25-
REQUIREMENTS = ["appdirs~=1.4.3", "pytz", "setuptools", "six~=1.10"]
26-
27-
setup(
28-
author="Will McGugan",
29-
author_email="[email protected]",
30-
classifiers=CLASSIFIERS,
31-
description="Python's filesystem abstraction layer",
32-
install_requires=REQUIREMENTS,
33-
extras_require={
34-
"scandir :python_version < '3.5'": ["scandir~=1.5"],
35-
":python_version < '3.4'": ["enum34~=1.1.6"],
36-
":python_version < '3.6'": ["typing~=3.6"],
37-
":python_version < '3.0'": ["backports.os~=0.1"],
38-
},
39-
license="MIT",
40-
name="fs",
41-
packages=find_packages(exclude=("tests",)),
42-
package_data={"fs": ["py.typed"]},
43-
zip_safe=False,
44-
platforms=["any"],
45-
url="https://github.com/PyFilesystem/pyfilesystem2",
46-
version=__version__,
47-
)
8+
from setuptools import setup
9+
setup(version=__version__)

0 commit comments

Comments
 (0)