make correction

.github/workflows/run-tests.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.5', '3.6', '3.7']
+        python-version: ['3.5', '3.6', '3.7', '3.8']
 
     steps:
       - uses: actions/checkout@v2

CHANGELOG.rst

@@ -5,13 +5,19 @@ Notable changes are logged here by release. This project uses `Semantic
 Versioning <http://semver.org/>`__. The changelog format is inspired by
 `keep-a-changelog <https://github.com/olivierlacan/keep-a-changelog>`__.
 
-`Unreleased <https://github.com/smtg-ucl/galore/compare/0.6.2...HEAD>`__
+`Unreleased <https://github.com/smtg-ucl/galore/compare/0.7.0...HEAD>`__
 -------------------------------------------------------------------------
+
+`[0.7.0] <https://github.com/smtg-ucl/galore/compare/0.6.2...0.7.0>`__ - 2021-07-06
+-----------------------------------------------------------------------------------
 - Continuous integration has been migrated from Travis to Github Actions
 - Minimum Python version has been increased to 3.5.
+
   - Python 3.4 was not available through Github actions. It is not wise to
     support a platform we cannot test.
 
+- BUGFIX: missing import affecting process_pdos
+
 `[0.6.2] <https://github.com/smtg-ucl/galore/compare/0.6.1...0.6.2>`__ - 2021-05-24
 -----------------------------------------------------------------------------------
 - Updated setup.py to add a [vasp] extra; this handles Pymatgen

CITATION.cff

@@ -14,7 +14,7 @@ authors:
 doi: 10.5281/zenodo.1491826
 repository-code: https://github.com/smtg-ucl/galore
 title: Galore
-version: 0.6.2
+version: 0.7.0
 date-released: 2021-05-24
 programming-languages:
   - python

docs/source/conf.py

@@ -61,9 +61,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6'
+version = '0.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.2'
+release = '0.7.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

galore/__init__.py

@@ -21,16 +21,24 @@
 
 from __future__ import print_function
 
-import os.path
 from collections import OrderedDict
 from collections.abc import Sequence
 import logging
+<<<<<<< HEAD
 
 import galore.formats
+=======
+>>>>>>> 222f3f05787d36b754356ceb13dba854939c2d16
 from math import sqrt, log
+import os.path
+
 import numpy as np
 from scipy.interpolate import interp1d
 
+<<<<<<< HEAD
+=======
+import galore.formats
+>>>>>>> 222f3f05787d36b754356ceb13dba854939c2d16
 from galore.cross_sections import get_cross_sections, cross_sections_info
 
 

setup.py

@@ -18,7 +18,7 @@ def unit_tests():
 
     setup(
         name='galore',
-        version='0.6.2',
+        version='0.7.0',
         description='Broadening and weighting for simulated spectra',
         long_description="""
     Apply Gaussian and Lorentzian broadening to data from ab initio