From 2f94dcb14b44282268c3b17db35db197f9dd155b Mon Sep 17 00:00:00 2001 From: Fernando Mez Date: Thu, 29 Aug 2019 01:10:46 -0300 Subject: [PATCH 1/4] Generate _version.py file with setuptools_scm --- .gitignore | 3 +++ setup.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 90131acf9..e4ee7a65d 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ _build .Python .eggs *.egg + +# Do not track since it's auto-generated. +pytest_django/_version.py diff --git a/setup.py b/setup.py index 101154392..ccc2e4426 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,11 @@ def read(fname): setup( name='pytest-django', - use_scm_version=True, + use_scm_version={ + 'write_to': 'pytest_django/_version.py', + 'version_scheme': 'post-release', + 'write_to_template': '__version__ = "{version}"', + }, description='A Django plugin for pytest.', author='Andreas Pelme', author_email='andreas@pelme.se', From c5c080a9907885a451ff30dacd20b8ad7c3d700b Mon Sep 17 00:00:00 2001 From: Fernando Mez Date: Thu, 29 Aug 2019 01:36:43 -0300 Subject: [PATCH 2/4] Add new-line at the end of _version.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ccc2e4426..4d6510311 100755 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ def read(fname): use_scm_version={ 'write_to': 'pytest_django/_version.py', 'version_scheme': 'post-release', - 'write_to_template': '__version__ = "{version}"', + 'write_to_template': '__version__ = "{version}"\n', }, description='A Django plugin for pytest.', author='Andreas Pelme', From 220a624002828cf2e40d354b267fe34371bbb136 Mon Sep 17 00:00:00 2001 From: Fernando Mez Date: Thu, 29 Aug 2019 21:16:08 -0300 Subject: [PATCH 3/4] Use setupmeta instead. --- .gitignore | 3 --- pytest_django/__init__.py | 1 + setup.py | 8 ++------ 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e4ee7a65d..90131acf9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,3 @@ _build .Python .eggs *.egg - -# Do not track since it's auto-generated. -pytest_django/_version.py diff --git a/pytest_django/__init__.py b/pytest_django/__init__.py index e69de29bb..bf5afe7f3 100644 --- a/pytest_django/__init__.py +++ b/pytest_django/__init__.py @@ -0,0 +1 @@ +__version__ = '3.5.1' diff --git a/setup.py b/setup.py index 4d6510311..4a488fc4b 100755 --- a/setup.py +++ b/setup.py @@ -18,12 +18,8 @@ def read(fname): setup( name='pytest-django', - use_scm_version={ - 'write_to': 'pytest_django/_version.py', - 'version_scheme': 'post-release', - 'write_to_template': '__version__ = "{version}"\n', - }, description='A Django plugin for pytest.', + versioning='post', author='Andreas Pelme', author_email='andreas@pelme.se', maintainer="Andreas Pelme", @@ -33,7 +29,7 @@ def read(fname): packages=['pytest_django'], long_description=read('README.rst'), python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*', - setup_requires=['setuptools_scm>=1.11.1'], + setup_requires=['setupmeta'], install_requires=[ 'pytest>=3.6', 'pathlib2;python_version<"3.4"', From e4338013c49c158aefee1525e5d559f70139350e Mon Sep 17 00:00:00 2001 From: Fernando Mez Date: Thu, 9 Jan 2020 21:25:53 -0300 Subject: [PATCH 4/4] Use devcommit as versioning --- pytest_django/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pytest_django/__init__.py b/pytest_django/__init__.py index bf5afe7f3..8c3336cca 100644 --- a/pytest_django/__init__.py +++ b/pytest_django/__init__.py @@ -1 +1 @@ -__version__ = '3.5.1' +__version__ = '3.7.0' diff --git a/setup.py b/setup.py index 4a488fc4b..87784fc49 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ def read(fname): setup( name='pytest-django', description='A Django plugin for pytest.', - versioning='post', + versioning='devcommit', author='Andreas Pelme', author_email='andreas@pelme.se', maintainer="Andreas Pelme",