Merge pull request #33 from astro-informatics/bump/2.2.0

version number was inconsistent -- bump to 2.2.0

Author: mdavezac

.github/workflows/conan.yml

@@ -37,7 +37,7 @@ jobs:
       - name: create package with fpic=${{matrix.fpic}} cfitsio=${{matrix.cfitsio}}
         shell: bash
         run: |
-          if [ "${{ github.ref }}" = "refs/tags/v1.3.0" ]; then
+          if [ "${{ github.ref }}" = "refs/tags/v2.2.0" ]; then
             channel="stable"
           else
             channel="testing"
@@ -55,4 +55,4 @@ jobs:
           CONAN_PASSWORD: ${{secrets.BINTRAY_TOKEN}}
           CONAN_LOGIN_USERNAME: astroinformaticsci
           CONAN_REMOTE_URL: https://api.bintray.com/conan/astro-informatics/astro-informatics
-        run: conan upload s2let/2.1.0 -c --all -r=astro-informatics
+        run: conan upload s2let/2.2.0 -c --all -r=astro-informatics

.github/workflows/python.yml

@@ -119,14 +119,14 @@ jobs:
             mv source-distribution/*.tar.gz  wheel-*/*.whl dist
 
       - name: Publish distribution 📦 to Test PyPI
-        if: ${{ github.ref != 'refs/tags/v2.1.0' }}
+        if: ${{ github.ref != 'refs/tags/v2.2.0' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.TEST_PYPI_TOKEN }}
           repository_url: https://test.pypi.org/legacy/
 
       - name: Publish distribution 📦 to PyPI
-        if: ${{ github.ref == 'refs/tags/v2.1.0' }}
+        if: ${{ github.ref == 'refs/tags/v2.2.0' }}
         uses: pypa/gh-action-pypi-publish@master
         with:
           password: ${{ secrets.PYPI_TOKEN }}

README.md

@@ -3,7 +3,7 @@
 [docs-img]: https://img.shields.io/badge/docs-stable-blue.svg
 [docs-url]: https://astro-informatics.github.io/s2let/
 [bintray-img]: https://img.shields.io/bintray/v/astro-informatics/astro-informatics/s2let:astro-informactics?label=C%20package
-[bintray-url]: https://bintray.com/astro-informatics/astro-informatics/s2let:astro-informatics/2.1.0:stable/link
+[bintray-url]: https://bintray.com/astro-informatics/astro-informatics/s2let:astro-informatics/2.2.0:stable/link
 [pypi-img]: https://badge.fury.io/py/pys2let.svg
 [pypi-url]: https://badge.fury.io/py/pys2let
 [codefactor-img]: https://www.codefactor.io/repository/github/astro-informatics/s2let/badge/main

conanfile.py

@@ -3,7 +3,7 @@
 
 class S2letConan(ConanFile):
     name = "s2let"
-    version = "2.1.0"
+    version = "2.2.0"
     license = "GPL-2.0"
     url = "https://github.com/astro-informatics/s2let"
     homepage = "https://github.com/astro-informatics/s2let"

docs/index.html

@@ -47,6 +47,8 @@ <h1 class="title">S2LET<span class="fade"></span></h1>
 <h2>News</h2>
 
 <ul>
+<li><strong>October 2020</strong><br />
+Public release of S2LET 2.2.0, revamped build system and publication to bintray and pypi.
 <li><strong>November 2016</strong><br />
 Public release of S2LET 2.1b1, fully supporting scale-discretised ridgelets and curvelets (in Matlab).
 <li><strong>October 2015</strong><br />

makefile

@@ -27,7 +27,7 @@ UNAME 	:= $(shell uname)
 
 # Compilers and options for C
 CC	= gcc
-OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.1b1\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
+OPT	= -Wall -g -fPIC -fopenmp -DS2LET_VERSION=\"2.2.0\" -DS2LET_BUILD=\"`git rev-parse HEAD`\"
 
 # Compilers and options for Fortran
 FCC	= gfortran

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0
+current_version = 2.2.0
 commit = False
 tag = False
 
@@ -22,12 +22,12 @@ tag = False
 [flake8]
 max-line-length = 88
 extend-ignore = E203, W503
-exclude =
-    .tox,
-    .git,
-    build,
-    __pycache__,
-    docs/,
+exclude = 
+	.tox,
+	.git,
+	build,
+	__pycache__,
+	docs/,
 
 [pycodestyle]
 count = False

setup.py

@@ -21,7 +21,7 @@
 
 setup(
     name="pys2let",
-    version="2.1.0",
+    version="2.2.0",
     author=["Boris Leistedt", "Martin Büttner", "Jennifer Chan", "Jason McEwen"],
     install_requires=["numpy"],
     extras_require={

src/doxygen.config

@@ -31,7 +31,7 @@ PROJECT_NAME           = S2LET
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.2.0
+PROJECT_NUMBER         = 2.2.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer