Merge pull request #224 from pyupio/pre-release-0.15.0

Pre Release 0.15.0

.travis.yml

@@ -1,31 +1,28 @@
-# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
+branches:
+  only:
+    - master
+    - "/^\\d+\\.\\d+(\\.\\d+)?(-\\S*)?$/"
+
 deploy:
-  user: JayFK
+  user: rafaelpivato
   provider: pypi
   password:
-    secure: !!binary |
-      cHdpNkRWQkhJWDM2RjQ4SzJCcys2OTh6ZTBEUGprS2haOFdqbjBiRUl1L3lhQUp0RlNiMFRHT281
-      WjdQUWtDMWxoMjhlNTZ1bFExRGhmaWwzTFBnQ3hjbEpTZlJMYWlWZHVKR1paaUhWTFgxY3NmWmM1
-      aWRiaVEvdkNrV2Zpa3l2QlRlWStPM3VNdGcySzFXU3FnMjFaTUY1K0Z2U2Q4cVBHNjEwVFZFQlBO
-      MXdCQW03WkpVYU5VdnpxTmwyR2QrbUtDZU5HQ2thc1JMK3gyMWxzQzcvS1JqMkVsVm5RMHFEbmxP
-      b0NZZlo5YkJGNVdoa25NMkZmTm9XMHF4Z2JjZ2pFclBHcUJRbk9COWh1ckZhOW1LQzArMk9aWjYz
-      ckZNc3VLV3Z2K0Rpd3M0VjVtUHBZY2pmWlBoUDdKNStxUEdPNkNCVnRGenlmcU4zMjJVZVRMK3d3
-      YjIrVW5GZVkyV0k4NTl3Yzlteit3VmJsaU9IMVh5R1NpM29IVmJmNFZKc1hQbmU4WG5TdnhrNEdO
-      OXZmM0FVZW9GN2NmWnpQNGRxZkp4dE8zSUdmWXhLNWtOTDI1Q2tYSWpFZjhIQXNvenYzTzRTWDNJ
-      VWZIdkpaUVVBTjJERmdZV285c3h6MUVsTnB0R1ZRQ3BVRHpnZEkvbWZHUEIycFYwbWY3cHRsVzJp
-      UVo0WkxQZkV0U1ZaVi9SaCt4N2JweU9nWit4N2JNRlFYeDRVQnVYcjNROXgxbVp5d1hTUy9ySlJ1
-      WmZIUUZKS0FHaStaY0cwVHdUeGcyRmtaK1A0YXAzcmNXSlhwOEhmeGZudFFHNmFsZTczeEhaRkFF
-      cjRMYkp0UnBqSW1SQURpTXlZK0N2OVJ2Nkl5M05ZcmFMTWdnY28vN1prSHdMRE91dHNZcmxrQzg9
+    secure: VC5ADulLBrSYqvgY8fy7d28j0VbX6goSJpHdHg3MJH1jTo4K1KEIHe79lrY34RbWt9meNw1KVi4q32tf4B85nb/P6/5qcJVIQGI4O3JBAG2fg61jclgAeQKESg4Klbx8nb538JAUiR8YibsqJ634IUyxmtJDRhLeHmhPAyU+nax0mPS1Gtat9y1RIGVG6lwMKQrhe5WGVAbxnITJAYPWMatZEbsRrQIOyfi7oNxrSdN3VMU3ISjHGvoHlSD96IM+OI5bHds+bdg7wyjKg+CN4hPezp4+EitgGm8ubJ6qdRS7+Dc171bhGfwZMBRJPCqLtnRin9lwIDOS9eoONiNoZLghTx0KqMcrgSPT1mRVHrH+neEmFUjVuzHzrWz5/A9IU6iQj+7QKhJuQsKLAD79PNfFNmkqysLolOk6kNSGmaCQ9B4U8aZDUcxrAxg0iaZ3s/vAmUNoxvEnKO0pE9oLnoZHvtp2rtjIBINai7pITuPjcjgUmmICMFgawUNDBLefJmkBhPe4w66CXUnnzjIcdvMahvKK+5/bzNjOvB+FdulSmgS+wDds0rMb19mZvo7/WstEVlmxQ3AGeXT/jYMVPTA4dC1w9Ps8ZojT+RXgQ7/+wkVaRl8+pVVvxadF5B46LTghqI1WiQAJNszkf5VPSyCXcaSTCaBj03xlTuIBzIc=
   distributions: sdist bdist_wheel
-  true:
-    condition: $TOXENV == py27
+  on:
     repo: pyupio/changelogs
     tags: true
-env:
-- TOXENV=py35
-- TOXENV=py34
-- TOXENV=py27
-install: pip install -U tox
+    python: "3.6"
+
 language: python
-python: 3.5
-script: tox -e ${TOXENV}
+python:
+  - "3.6"
+  - "3.7"
+  - "3.8"
+install:
+  - pip install tox-travis
+  - pip install codecov
+script:
+  - tox
+after_success:
+  - codecov

CONTRIBUTING.rst

@@ -101,9 +101,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
-   https://travis-ci.org/jayfk/changelogs/pull_requests
-   and make sure that the tests pass for all supported Python versions.
+3. The pull request should work for all recent Python versions.
 
 Tips
 ----

HISTORY.rst

@@ -2,8 +2,12 @@
 History
 =======
 
-UNRELEASED
-------------------
+0.15.0-dev (UNRELEASED)
+-----------------------
+* Removed support for Python 2.7, 3.4 and 3.5
+* Getting proper changelogs for beautifulsoup4 PyPi package again
+* Getting proper changelogs for synapse PyPi package again
+* Stopped using bumpversion
 
 0.14.0 (2018-01-9)
 -------------------

changelogs/__init__.py

@@ -13,9 +13,9 @@
     DEBUG = False
 """
 
-__author__ = """Jannis Gebauer"""
-__email__ = 'jay@pyup.io'
-__version__ = '0.14.0'
+__author__ = """pyup.io"""
+__email__ = 'support@pyup.io'
+__version__ = '0.15.0-dev'
 
 
 url_re = re.compile(r"(https?://[^\s<>\"'\x7f-\xff]+)", re.IGNORECASE)

changelogs/custom/pypi/beautifulsoup4.py

@@ -6,7 +6,7 @@
 
 def get_urls(releases, **kwargs):
     # changelog is on launchpad.
-    r = requests.get('https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/NEWS.txt')
+    r = requests.get('https://bazaar.launchpad.net/~leonardr/beautifulsoup/bs4/view/head:/CHANGELOG')
     root = etree.HTML(r.text)
     link = root.xpath("//a[contains(text(),'download file')]/@href")[0]
     return ["https://bazaar.launchpad.net" + link], set()

changelogs/custom/pypi/synapse.py

@@ -2,5 +2,9 @@
 def get_urls(releases, **kwargs):
     # Pypi has a old bugtracker_url which points to a separate repo which causes invalid
     # changelogs to be generated by this tool.
-    ret = {'https://raw.githubusercontent.com/vertexproject/synapse/master/CHANGELOG.md'}
+    ret = {
+        'https://raw.githubusercontent.com/vertexproject/synapse/master/CHANGELOG.rst',
+        'https://raw.githubusercontent.com/vertexproject/synapse/01x/CHANGELOG.rst',
+        'https://raw.githubusercontent.com/vertexproject/synapse/00x/CHANGELOG.md',
+    }
     return ret, set()

setup.cfg

@@ -1,19 +1,5 @@
-[bumpversion]
-current_version = 0.5.0
-commit = True
-tag = True
-
-[bumpversion:file:setup.py]
-search = version='{current_version}'
-replace = version='{new_version}'
-
-[bumpversion:file:changelogs/__init__.py]
-search = __version__ = '{current_version}'
-replace = __version__ = '{new_version}'
-
 [bdist_wheel]
 universal = 1
 
 [flake8]
 exclude = docs
-

setup.py

@@ -25,13 +25,17 @@
     'betamax-serializers'
 ]
 
+extras_requirements = {
+    'test': test_requirements,
+}
+
 setup(
     name='changelogs',
-    version='0.14.0',
+    version='0.15.0-dev',
     description="A changelog finder and parser.",
     long_description=readme + '\n\n' + history,
-    author="Jannis Gebauer",
-    author_email='jay@pyup.io',
+    author="pyup.io",
+    author_email='support@pyup.io',
     url='https://github.com/pyupio/changelogs',
     packages=[
         'changelogs',
@@ -53,14 +57,12 @@
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
-        "Programming Language :: Python :: 2",
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
     ],
     test_suite='tests',
-    tests_require=test_requirements
+    tests_require=test_requirements,
+    extras_require=extras_requirements,
 )

tox.ini

@@ -1,22 +1,16 @@
 [tox]
-envlist = py27, py36, flake8
+envlist = py36, py37, py38, flake8
 
 [testenv:flake8]
 basepython=python
 deps=flake8
 commands=flake8 changelogs
 
 [testenv]
-setenv =
-    PYTHONPATH = {toxinidir}:{toxinidir}/changelogs
 deps =
-    -r{toxinidir}/requirements_dev.txt
+    pytest-cov
+    pytest
+extras =
+    test
 commands =
-    pip install -U pip
-    py.test --basetemp={envtmpdir}
-
-
-; If you want to make tox run the tests with the same versions, create a
-; requirements.txt with the pinned versions and uncomment the following lines:
-; deps =
-;     -r{toxinidir}/requirements.txt
+    pytest --cov=changelogs/