Merge pull request #233 from Secrus/migrate-to-md

Migrate AUTHORS.rst to AUTHORS.md

diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 0beaf510098efd2c39955c94d01c6d109cd1ff2f..a5da4621d6733676ee76ad2638de82d919f02e87 100644 (file)
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -20,7 +20,8 @@ jobs:
     runs-on: ${{ matrix.operating-system }}
     strategy:
       matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        # operating-system: [ubuntu-latest, windows-latest, macos-latest]
+        operating-system: [ubuntu-latest, windows-latest]
         python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
 
     steps:

diff --git a/HISTORY.rst b/HISTORY.rst
index e7dbf473424bef7790965619ae7f436f6822b7e0..f79a5d660598bff673b5e0d224a9467cb8f819bf 100644 (file)
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,14 @@
 History
 -------
 
+1.5.2 (2020-09-21)
+++++++++++++++++++
+
+* Add formal support for Python 3.8
+* Remove formal support for Python 3.4
+* Switch from Travis to GitHub actions
+* Made tests pass flake8 for Python 2.7
+
 1.5.1 (2018-08-05)
 ++++++++++++++++++
 

diff --git a/README.rst b/README.rst
index 76d2ce35a39eb7d50dd00f3d1b649bc8a47ad28e..c5c241156b32ea43be950459166b1509cb156925 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -248,7 +248,7 @@ Support This Project
 This project is maintained by volunteers. Support their efforts by spreading the word about:
 
 Django Crash Course
-~~~~~~~~~~~~~~~~~~~~~~~~~
+++++++++++++++++++++++++++++++++++++
 
 .. image:: https://cdn.shopify.com/s/files/1/0304/6901/files/Django-Crash-Course-300x436.jpg
    :name: Django Crash Course: Covers Django 3.0 and Python 3.8

diff --git a/cached_property.py b/cached_property.py
index 3e530fc5f0320fcc6b3be4eb7e3ff31f8796c662..3135871bfb0d9cda0a4c4eac6cdf8c47d890a289 100644 (file)
--- a/cached_property.py
+++ b/cached_property.py
@@ -2,7 +2,7 @@
 
 __author__ = "Daniel Greenfeld"
 __email__ = "pydanny@gmail.com"
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 __license__ = "BSD"
 
 from functools import wraps

diff --git a/requirements.txt b/requirements.txt
index 1433eb3c0c55cde0d4df7ed606f4466f03a1c131..2be31922e28344b5709304b71616cd07033a70e0 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,4 @@
 coverage==4.4.2
 pytest==3.8.2
 pytest-cov==2.6.0
-freezegun==0.3.10
-twine==1.12.1
-wheel==0.32.0
\ No newline at end of file
+freezegun==0.3.10
\ No newline at end of file

diff --git a/setup.py b/setup.py
index af68a07a146478dbcc7f0079522ffd1724484eec..63d3c8deb27b7caa7ab60a1d51ea4aab3b08b6ca 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ try:
 except ImportError:
     from distutils.core import setup
 
-__version__ = "1.5.1"
+__version__ = "1.5.2"
 
 
 def read(fname):
@@ -23,6 +23,11 @@ readme = read("README.rst")
 history = read("HISTORY.rst").replace(".. :changelog:", "")
 
 if sys.argv[-1] == "publish":
+    try:
+        import wheel
+        import twine
+    except: # Yes, this is not how we usually do try/except
+        raise ImportError('Run "pip install wheel twine"')
     os.system("python setup.py sdist bdist_wheel")
     os.system("twine upload dist/*")
     os.system("git tag -a %s -m 'version %s'" % (__version__, __version__))
@@ -34,6 +39,7 @@ setup(
     version=__version__,
     description="A decorator for caching properties in classes.",
     long_description=readme + "\n\n" + history,
+    long_description_content_type="text/x-rst",
     author="Daniel Greenfeld",
     author_email="pydanny@gmail.com",
     url="https://github.com/pydanny/cached-property",
@@ -49,10 +55,10 @@ setup(
         "Natural Language :: English",
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3",     
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
     ],
 )

diff --git a/tox.ini b/tox.ini
index 9d7c8b310e99e996d0d66908d6d1df02ac85344d..3beb37b839fcad54e064d55621632aebff0d1fd6 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py35, py36, py37, py38
 
 [testenv]
 setenv =