Merge pull request #74 from scottwernervt/73/refactor/tox-pyproject-d…

…ependencies

.pre-commit-config.yaml

@@ -1,11 +1,19 @@
 repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.4.0
+  hooks:
+  - id: check-ast
+  - id: check-toml
+  - id: sort-simple-yaml
+  - id: end-of-file-fixer
+  - id: trailing-whitespace
 - repo: https://github.com/python/black
-  rev: 19.10b0
+  rev: 20.8b1
   hooks:
   - id: black
     language_version: python3
 - repo: https://gitlab.com/pycqa/flake8
-  rev: 3.7.9
+  rev: 3.8.4
   hooks:
   - id: flake8
-    additional_dependencies: ["flake8-bugbear==20.1.4"]
+    additional_dependencies: ["flake8-bugbear==20.11.1"]

.travis.yml

@@ -18,10 +18,10 @@ jobs:
   include:
     - { name: 'check', python: '3.7', env: TOXENV=check }
     - { name: 'lint', python: '3.7', env: TOXENV=lint }
-    - { name: 'py35', python: '3.5', env: TOXENV=py35 }
     - { name: 'py36', python: '3.6', env: TOXENV=py36 }
     - { name: 'py37', python: '3.7', env: TOXENV=py37 }
     - { name: 'py38', python: '3.8', env: TOXENV=py38 }
+    - { name: 'py39', python: '3.9', env: TOXENV=py39 }
     - { name: 'docs', python: '3.7', env: TOXENV=docs }
 
 after_failure:
@@ -31,4 +31,4 @@ after_failure:
 notifications:
   email:
     on_success: never
-    on_failure: always
+    on_failure: always

CHANGELOG.rst

@@ -127,4 +127,4 @@ Other
 0.1 (2017-04-20)
 ++++++++++++++++
 
-* First release.
+* First release.

MANIFEST.in

@@ -21,4 +21,4 @@ recursive-exclude docs *.pyo
 recursive-exclude tests *.pyc
 recursive-exclude tests *.pyo
 
-prune dist/docs
+prune dist/docs

docs/Makefile

@@ -17,4 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/changelog.rst

@@ -1,3 +1,3 @@
 .. _changelog:
 
-.. include:: ../CHANGELOG.rst
+.. include:: ../CHANGELOG.rst

docs/supported.rst

@@ -23,4 +23,4 @@ Do not see your provider? Create an issue and vote for at `cloudstorage issues
 .. _`Minio Cloud Storage`: https://www.minio.io/
 .. _`Rackspace CloudFiles`: https://www.rackspace.com/cloud/files
 .. _B2TODO: https://github.com/scottwernervt/cloudstorage/issues/2
-.. _MSTODO: https://github.com/scottwernervt/cloudstorage/issues/1
+.. _MSTODO: https://github.com/scottwernervt/cloudstorage/issues/1

pyproject.toml

@@ -1,6 +1,54 @@
+[build-system]
+requires = ["setuptools>=35.0.2", "wheel>=0.29.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.tox]
+legacy_tox_ini = """
+[tox]
+envlist =
+    check
+    lint
+    py36
+    py37
+    py38
+    py39
+    docs
+
+[testenv]
+extras =
+    tests
+    amazon
+    google
+    local
+    microsoft
+    minio
+    rackspace
+passenv = *
+commands = pytest {posargs}
+
+[testenv:check]
+extras =
+    check
+commands =
+    python setup.py check --strict --metadata --restructuredtext
+    check-manifest -v
+
+[testenv:lint]
+extras =
+    lint
+commands =
+    pre-commit run --all-files
+
+[testenv:docs]
+deps = -rdocs/requirements.txt
+commands =
+    sphinx-build docs/ dist/docs {posargs}
+    sphinx-build -b linkcheck docs dist/docs
+"""
+
 [tool.black]
 line-length = 88
-target-version = ["py35", "py36", "py37", "py38"]
+target-version = ["py36", "py37", "py38"]
 include = '\.pyi?$'
 exclude = '''
 /(

setup.py

@@ -20,20 +20,26 @@
         "xattr>=0.9.6; sys_platform != 'win32'",
     ],
     "microsoft": ["azure==4.0.0"],
-    "minio": ["minio>=4.0.0"],
+    "minio": ["minio==4.0.0"],
     "rackspace": ["openstacksdk<=0.17.2", "rackspacesdk==0.7.5", "requests>=2.19.1"],
-    "tests": ["flake8", "pytest", "prettyconf", "requests>=2.19.1"],
+    "tests": ["flake8==3.8.4", "pytest==6.2.1", "prettyconf", "requests>=2.19.1"],
     "lint": [
-        "black==19.10b0",
-        "flake8==3.7.9",
-        "flake8-bugbear==20.1.4",
-        "pre-commit~=2.0",
+        "black==20.8b1",
+        "flake8==3.8.4",
+        "flake8-bugbear==20.11.1",
+        "pre-commit==2.9.3",
+    ],
+    "check": [
+        "docutils==0.16",
+        "check-manifest==0.46",
+        "readme-renderer==28.0",
+        "pygments==2.7.4",
     ],
     "docs": [
-        "sphinx==3.0.2",
-        "sphinx_rtd_theme==0.4.3",
-        "sphinx_autodoc_typehints==1.10.3",
-        "pygments==2.6.1",
+        "sphinx==3.4.3",
+        "sphinx_rtd_theme==0.5.1",
+        "sphinx_autodoc_typehints==1.11.1",
+        "pygments==2.7.4",
     ],
 }
 EXTRAS_REQUIRE["dev"] = EXTRAS_REQUIRE["tests"] + EXTRAS_REQUIRE["lint"] + ["tox"]
@@ -93,9 +99,10 @@ def find_version(fname):
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 3 :: Only",
-        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Internet",
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],

src/cloudstorage/drivers/digitalocean.py

@@ -56,8 +56,7 @@ def _create_bucket_params(self, params: Dict[Any, Any]) -> Dict[Any, Any]:
 
     @property
     def regions(self) -> List[str]:
-        """List of DigitalOcean regions that support Spaces.
-        """
+        """List of DigitalOcean regions that support Spaces."""
         return ["nyc3", "ams3", "sfo2", "sgp1", "fra1"]
 
     # noinspection PyUnresolvedReferences

src/cloudstorage/drivers/local.py

@@ -508,7 +508,7 @@ def upload_blob(
         base_path = os.path.dirname(blob_path)
         self._make_path(base_path)
 
-        tmp_blob_path = f'{blob_path}.tmp'
+        tmp_blob_path = f"{blob_path}.tmp"
 
         with lock_local_file(blob_path):
             if isinstance(filename, str):

src/cloudstorage/drivers/microsoft.py

@@ -280,7 +280,9 @@ def delete_container(self, container: Container) -> None:
     def container_cdn_url(self, container: Container) -> str:
         azure_container = self._get_azure_container(container.name)
         url = "{}://{}/{}".format(
-            self.service.protocol, self.service.primary_endpoint, azure_container.name,
+            self.service.protocol,
+            self.service.primary_endpoint,
+            azure_container.name,
         )
         return url
 

src/cloudstorage/drivers/minio.py

@@ -107,7 +107,7 @@ def __init__(
         key: str,
         secret: str = None,
         region: str = "us-east-1",
-        **kwargs: Dict
+        **kwargs: Dict,
     ) -> None:
         secure = kwargs.pop("secure", True)
         http_client = kwargs.pop("http_client", None)

tests/conftest.py

@@ -63,7 +63,7 @@ def binary_stream(binary_filename):
 @pytest.fixture(scope="function")
 def binary_bytes():
     f = io.BytesIO()
-    f.write(b'1' * 1024 * 1024 * 10)
+    f.write(b"1" * 1024 * 1024 * 10)
     f.seek(0)
     yield f
 

tests/data/flask.txt

@@ -1 +1 @@
-The Flask logo is available for download and use in the formats below. You can use the logo to promote Flask like you want. The image is licensed under the “Flask Artwork License”. Read license text.
+The Flask logo is available for download and use in the formats below. You can use the logo to promote Flask like you want. The image is licensed under the “Flask Artwork License”. Read license text.

tests/settings.py

@@ -17,7 +17,7 @@
 TEXT_FILENAME = "flask.txt"
 TEXT_STREAM_FILENAME = "flask-stream.txt"
 TEXT_FORM_FILENAME = "flask-form.txt"
-TEXT_MD5_CHECKSUM = "2a5a634f5c8d931350e83e41c9b3b0bb"
+TEXT_MD5_CHECKSUM = "5a9b3669e3a17311e9135fe65e0877a8"
 
 BINARY_FILENAME = "avatar.png"
 BINARY_FORM_FILENAME = "avatar-form.png"

tests/test_drivers_local.py

@@ -187,24 +187,21 @@ def test_blob_upload_stream(container, binary_stream):
 
 
 def test_blob_upload_stream_interrupted(container, binary_bytes):
-    BLOB_NAME = 'data.bin'
+    BLOB_NAME = "data.bin"
     md5 = hashlib.md5()
     md5.update(binary_bytes.getbuffer())
     mk5_checksum = md5.hexdigest()
 
     def _upload():
-        container.upload_blob(
-            filename=binary_bytes,
-            blob_name=BLOB_NAME
-        )
+        container.upload_blob(filename=binary_bytes, blob_name=BLOB_NAME)
 
     p = mp.Process(target=_upload)
     p.start()
     time.sleep(0.01)
     os.kill(p.pid, 9)
     p.join()
 
-    bad_blob = container.get_blob(BLOB_NAME + '.tmp')
+    bad_blob = container.get_blob(BLOB_NAME + ".tmp")
     assert bad_blob.checksum != mk5_checksum
     bad_blob.delete()