From 537c25a8ef9e693db689eaecac228a53e1971c47 Mon Sep 17 00:00:00 2001 From: Ocre42 Date: Thu, 16 Aug 2018 09:54:53 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Bump=20version:=200.3.0=20=E2=86=92=200.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/source/conf.py | 4 ++-- setup.cfg | 9 +++++---- setup.py | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 8b6f02fc..b22bb646 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -65,9 +65,9 @@ # built documents. # # The short X.Y version. -version = '0.3.0' +version = '0.4.0' # The full version, including alpha/beta/rc tags. -release = '0.3.0' +release = '0.4.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.cfg b/setup.cfg index 0c95e407..4b3f7de3 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [bumpversion] commit = True -current_version = 0.3.0 +current_version = 0.4.0 [bumpversion:file:setup.py] @@ -18,7 +18,8 @@ add_select = D212,D404 convention = pep257 [tool:pytest] -markers = - fixed_to_202: mark that a test only uses v2.02 data, and could possibly be updated in the future to either be version-agnostic or test a wider range of versions - latest_version(version=None): mark a test as needing review when a new version of the IATI Standard is added. This will generally require adding a new input to the parameter list, and then updating the mark to reflect the change. +markers = + fixed_to_202: mark that a test only uses v2.02 data, and could possibly be updated in the future to either be version-agnostic or test a wider range of versions + latest_version(version=None): mark a test as needing review when a new version of the IATI Standard is added. This will generally require adding a new input to the parameter list, and then updating the mark to reflect the change. testpaths = iati + diff --git a/setup.py b/setup.py index 2139ad20..0fc98fea 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name = 'pyIATI', - version = '0.3.0', + version = '0.4.0', description = 'Python library representing the IATI Schemas, Codelists and Rulesets', author = 'IATI Technical Team and other authors', author_email = 'code@iatistandard.org', From b5c5769d21eacd2689ab2d16cb893e0aeb684c4b Mon Sep 17 00:00:00 2001 From: Ocre42 Date: Thu, 16 Aug 2018 09:57:24 +0100 Subject: [PATCH 2/2] Bumping version, RELEASING.md typo fix --- RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index 45f0455f..60239d9e 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -29,7 +29,7 @@ Steps to follow to release a new version of pyIATI. 3. Run the tests to check that the package is safe for release, [how to run the tests](https://github.com/IATI/pyIATI#tests). 4. If the tests passed: Publish to PyPi 1. Install tools required for deployment: `apt-get install python3-setuptools; pip install twine` - 2. Check that you have a the iati login credentials for the PyPi test and production instances in a `~/.pypirc` file. A template file is below. [See here](https://docs.python.org/3.6/distutils/packageindex.html#pypirc) for an explanation of the file. + 2. Check that you have the iati login credentials for the PyPi test and production instances in a `~/.pypirc` file. A template file is below. [See here](https://docs.python.org/3.6/distutils/packageindex.html#pypirc) for an explanation of the file. 3. From within the folder extracted from the zip file: 1. Ensure you have at least version 1.8 of twine: `twine --version` 1. If you have an older version of twine (eg. when using Ubuntu 16.04 LTS), obtain a more recent version