Merge pull request #9 from dragonyanglong/setup_rever

ENH: support py3.7+

Author: dragonyanglong

.travis.yml

@@ -7,9 +7,10 @@ os:
 
 env:
   - MYUSEMC=true MYPYTHON_VERSION=2.7
-  - MYUSEMC=true MYPYTHON_VERSION=3.5
-  - MYUSEMC=true MYPYTHON_VERSION=3.6
   - MYUSEMC=true MYPYTHON_VERSION=3.7
+  - MYUSEMC=true MYPYTHON_VERSION=3.8
+  - MYUSEMC=true MYPYTHON_VERSION=3.9
+  - MYUSEMC=true MYPYTHON_VERSION=3.10
   - MYUSEMC=false
 
 matrix:

CHANGELOG.md

@@ -1,32 +1,22 @@
 # Release notes
 
-Notable differences from version 1.1.
+Notable differences from version 1.2.
 
-## Version 1.2.0 – 2019-08-08
+## Version 1.3.0 – 2022-11-30
 
 ### Added
 
-- Support for Python 3.7, 3.6, 3.5 in addition to 2.7.
-- Makefile targets `module` and `test`.
-- Support installation from a tagged git-archive tarball.
+- Support for Python 3.8, 3.9, 3.10.
 
 ### Changed
 
-- Build Anaconda package with Anaconda C++ compiler.
-- Allow language standard c++11.
-- Update to diffpy.structure 3.0.
-
 ### Deprecated
 
-- Variable `__gitsha__` in the `version` module which was renamed
-  to `__git_commit__`.
-
 ### Removed
 
-- Support for Python 2.6.
+- Remove the support for Python 3.5, 3.6.
 
 ### Fixed
 
-- Windows build with MSVC 9 and MSVC 14.
-- Invalid escape sequences in string values.
-- Open files within the `with` context so they get closed when done.
+-  Patch variable to avoid naming problems and Xcode collision on MacOS & Linux.
+-  Fix g++ w/ambiguous isnan on Linux.

README.rst

@@ -35,7 +35,7 @@ http://www.diffpy.org/doc/pdffit2.
 REQUIREMENTS
 ------------------------------------------------------------------------
 
-diffpy.pdffit2 requires Python 3.7, 3.6, 3.5 or 2.7 and
+diffpy.pdffit2 requires Python 3.7 or later or 2.7 and
 the following external software:
 
 * ``setuptools`` - software distribution tools for Python

rever.xsh

@@ -0,0 +1,14 @@
+$PROJECT = 'diffpy.pdffit2'
+$ACTIVITIES = [
+              'tag',  # Creates a tag for the new version number
+              'push_tag',  # Pushes the tag up to the $TAG_REMOTE
+              'pypi',  # Sends the package to pypi
+              'ghrelease'  # Creates a Github release entry for the new tag
+               ]
+$PUSH_TAG_REMOTE = '[email protected]:diffpy/diffpy.pdffit2.git'  # Repo to push tags to
+$GITHUB_ORG = 'diffpy'  # Github org for Github releases and conda-forge
+$GITHUB_REPO = 'diffpy.pdffit2'  # Github repo for Github releases  and conda-forge
+$GHRELEASE_PREPEND = """See [CHANGELOG.md](CHANGELOG.md) for detailed release notes.
+
+The release is also available at [PyPI](https://pypi.org/project/diffpy.pdffit2/) and [Conda](https://anaconda.org/conda-forge/diffpy.pdffit2).
+"""  # release message

setup.py

@@ -18,7 +18,7 @@
 
 # Use this version when git data are not available, like in git zip archive.
 # Update when tagging a new release.
-FALLBACK_VERSION = '1.2.0.post0'
+FALLBACK_VERSION = '1.3.0'
 
 # determine if we run with Python 3.
 PY3 = (sys.version_info[0] == 3)
@@ -33,7 +33,7 @@
 def gitinfo():
     from subprocess import Popen, PIPE
     kw = dict(stdout=PIPE, cwd=MYDIR, universal_newlines=True)
-    proc = Popen(['git', 'describe', '--match=v[[:digit:]]*'], **kw)
+    proc = Popen(['git', 'describe', '--tags', '--match=v[[:digit:]]*'], **kw)
     desc = proc.stdout.read()
     proc = Popen(['git', 'log', '-1', '--format=%H %ct %ci'], **kw)
     glog = proc.stdout.read()
@@ -221,9 +221,10 @@ def get_gsl_config():
         'Operating System :: POSIX',
         'Programming Language :: C++',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Scientific/Engineering :: Chemistry',
         'Topic :: Scientific/Engineering :: Physics',
     ],