Merge pull request #79 from MJedr/gh-action-fix

release 0.7.6
inveniosoftware-contrib · Oct 1, 2021 · bff82bd · bff82bd
2 parents 8f4a8c2 + 000f957
commit bff82bd
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 57 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -3,6 +3,8 @@ name: Build and release
 on:
   push:
     branches: [master]
+    tags:
+      - "*"
   pull_request:
     branches: [master]
 

diff --git a/json_merger/version.py b/json_merger/version.py
@@ -30,6 +30,4 @@
 
 from __future__ import absolute_import, print_function
 
-from autosemver.packaging import get_current_version
-
-__version__ = get_current_version(project_name="json-merger")
+__version__ = "0.7.6"
diff --git a/setup.py b/setup.py
@@ -24,91 +24,90 @@
 
 """Python module that is able to merge json record objects."""
 
+import os
 import sys
 
 from setuptools import find_packages, setup
 
-readme = open("README.rst").read()
-history = open("CHANGES.rst").read()
-
-
-url = "https://github.com/inveniosoftware-contrib/json-merger"
-
+readme = open('README.rst').read()
+history = open('CHANGES.rst').read()
 
 tests_require = [
-    "check-manifest>=0.25",
-    "coverage>=4.0",
-    "isort>=4.2.2",
-    "pydocstyle>=1.0.0",
-    "pytest-cache>=1.0",
-    "pytest-cov>=1.8.0",
-    "pytest>=4.6.11",
-    "flake8>=3.9.0",
+    'check-manifest>=0.25',
+    'coverage>=4.0',
+    'isort>=4.2.2',
+    'pydocstyle>=1.0.0',
+    'pytest-cache>=1.0',
+    'pytest-cov>=1.8.0',
+    'pytest>=4.6.11',
+    'flake8>=3.9.0',
 ]
 
 contrib_require = [
-    "editdistance>=0.3.1",
-    "munkres<=1.0.12",
-    "Unidecode==0.4.19" if sys.version_info < (3, 6) else "Unidecode>=0.4.19",
+    'editdistance>=0.3.1',
+    'munkres<=1.0.12',
+    'Unidecode==0.4.19' if sys.version_info < (3, 6) else 'Unidecode>=0.4.19'
 ]
 
 tests_require += contrib_require
 
 extras_require = {
-    "contrib": contrib_require,
-    "docs": [
-        "Sphinx>=1.4.2",
+    'contrib': contrib_require,
+    'docs': [
+        'Sphinx>=1.4.2',
     ],
-    "tests": tests_require,
+    'tests': tests_require
 }
 
-extras_require["all"] = []
+extras_require['all'] = []
 for reqs in extras_require.values():
-    extras_require["all"].extend(reqs)
+    extras_require['all'].extend(reqs)
 
 install_requires = [
-    "autosemver==0.5.5",
-    "dictdiffer==0.8.1" if sys.version_info < (3, 6) else "dictdiffer>=0.6.0",
-    "six>=1.10.0",
-    "pyrsistent>=0.11.13",
-]
-
-setup_requires = [
-    "autosemver==0.5.5",
+    'dictdiffer==0.8.1' if sys.version_info < (3, 6) else 'dictdiffer>=0.6.0',
+    'six>=1.10.0',
+    'pyrsistent>=0.11.13'
 ]
 
 packages = find_packages()
 
+
+# Get the version string. Cannot be done with import!
+g = {}
+with open(os.path.join('json_merger', 'version.py'), 'rt') as fp:
+    exec(fp.read(), g)
+    version = g['__version__']
+
 setup(
-    name="json-merger",
-    autosemver=True,
+    name='json-merger',
+    version=version,
     description=__doc__,
-    long_description=readme + "\n\n" + history,
-    keywords="JSON patch merge conflict",
-    license="GPLv2",
-    author="CERN",
-    author_email="admin@inspirehep.net",
-    url=url,
+    long_description=readme + '\n\n' + history,
+    keywords='JSON patch merge conflict',
+    license='GPLv2',
+    author='CERN',
+    author_email='admin@inspirehep.net',
+    url='https://github.com/inveniosoftware-contrib/json-merger',
     packages=packages,
     zip_safe=False,
     include_package_data=True,
-    platforms="any",
-    entry_points={},
-    setup_requires=setup_requires,
+    platforms='any',
+    entry_points={
+    },
     extras_require=extras_require,
     install_requires=install_requires,
     classifiers=[
-        "Environment :: Web Environment",
-        "Intended Audience :: Developers",
-        "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
-        "Development Status :: 4 - Beta",
+        'Environment :: Web Environment',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: GNU General Public License v2 (GPLv2)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+        'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+        'Topic :: Software Development :: Libraries :: Python Modules',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.6',
+        'Development Status :: 4 - Beta',
     ],
 )