[PARO-779] Prep for v2.2.0 release (#64)

* MAINT CircleCI: drop py3.4, add py3.8, specify only py3.x minor versions

* MAINT drop versioneer; update setup.py

* DEP minimal versions in setup.py, exact ones in dev-req txt

* MAINT update MANIFEST.in

* MAINT update readme

* MAINT add twine check in CircleCI for PyPI compliance

* MAINT update changelog

* MAINT more setup.py updates

* MAINT add repo badges to readme

* FIX typo in readme

* MAINT make sure setuptools is available for pkg_resources

* MAINT setup.py needs to import setuptools for numpy internal

* MAINT drop python 3.5

Author: jacksonlee-civis

.circleci/config.yml

@@ -1,35 +1,42 @@
 version: 2
+
 workflows:
   version: 2
   test:
     jobs:
       - test-3.6
       - test-3.7
-      - test-3.5
-      - test-3.4
+      - test-3.8
+
 jobs:
-  test-3.6: &unit-tests
+  test-3.8: &unit-tests
     working_directory: ~/python-glmnet
     docker:
-      - image: circleci/python:3.6.6
+      - image: circleci/python:3.8
     steps:
       - checkout
       - restore_cache:
-          key: deps1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "dev-requirements.txt" }}
+          key: deps1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "dev-requirements.txt" }}
       - run:
           name: Install environment
           command: |
             python3 -m venv venv
             . venv/bin/activate
-            pip install -r requirements.txt
             pip install -r dev-requirements.txt
       - save_cache:
-          key: deps1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "requirements.txt" }}-{{ checksum "dev-requirements.txt" }}
+          key: deps1-{{ .Environment.CIRCLE_JOB }}-{{ checksum "dev-requirements.txt" }}
           paths:
             - "venv"
       - run:
           name: Install Fortran compiler
           command: sudo apt-get install -y gfortran
+      - run:
+          name: Build package under test and check for PyPI compliance via twine
+          command: |
+            . venv/bin/activate
+            pip install twine
+            python setup.py sdist
+            twine check dist/`ls dist/ | grep .tar.gz`
       - run:
           name: Install package under test
           command: |
@@ -41,15 +48,11 @@ jobs:
             . venv/bin/activate
             cd ~
             pytest -v python-glmnet/glmnet
-  test-3.4:
-    <<: *unit-tests
-    docker:
-      - image: circleci/python:3.4.9
-  test-3.5:
+  test-3.6:
     <<: *unit-tests
     docker:
-      - image: circleci/python:3.5.6
+      - image: circleci/python:3.6
   test-3.7:
     <<: *unit-tests
     docker:
-      - image: circleci/python:3.7.0
+      - image: circleci/python:3.7

CHANGELOG.md

@@ -4,13 +4,17 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 2.2.0 - 2020-06-29
 ### Changed
 * [#57](https://github.com/civisanalytics/python-glmnet/pull/57)
   Mark the Fortran code as linguist-vendored so that GitHub classifies
   this project as Python (#37).
 * [#62](https://github.com/civisanalytics/python-glmnet/pull/62)
   Update the cross-validation for users to be able to define groups of
   observations, which is equivalent with *foldid* of *cvglmnet* in *R*.
+* [#64](https://github.com/civisanalytics/python-glmnet/pull/64)
+   - Python version support: Add v3.8, and drop v3.4 + v3.5.
+   - Maintenance: Drop versioneer; update and pin dependencies for development.
 
 ## 2.1.1 - 2019-03-11
 ### Fixed

MANIFEST.in

@@ -1,8 +1,5 @@
-include requirements.txt
 include README.rst
 include LICENSE
 recursive-include LICENSES *
-include versioneer.py
-include glmnet/_version.py
 include glmnet/*.pyf
 exclude glmnet/*.c

README.rst

@@ -1,6 +1,24 @@
 Python GLMNET
 =============
 
+|CircleCI| |Conda| |PyPI| |PyVersions|
+
+.. |CircleCI| image:: https://circleci.com/gh/civisanalytics/python-glmnet.svg?style=svg
+    :target: https://circleci.com/gh/civisanalytics/python-glmnet
+    :alt: Build status
+
+.. |Conda| image:: https://anaconda.org/conda-forge/glmnet/badges/version.svg
+   :target: https://anaconda.org/conda-forge/glmnet
+   :alt: Latest version on conda forge
+
+.. |PyPI| image:: https://img.shields.io/pypi/v/glmnet.svg
+   :target: https://pypi.org/project/glmnet/
+   :alt: Latest version on PyPI
+
+.. |PyVersions| image:: https://img.shields.io/pypi/pyversions/glmnet.svg
+   :target: https://pypi.org/project/glmnet/
+   :alt: Supported python versions for python-glmnet
+
 This is a Python wrapper for the fortran library used in the R package
 `glmnet <http://web.stanford.edu/~hastie/glmnet/glmnet_alpha.html>`__.
 While the library includes linear, logistic, Cox, Poisson, and
@@ -17,7 +35,7 @@ Installation
 requirements
 ~~~~~~~~~~~~
 
-``python-glmnet`` requires Python version >= 3.4, ``scikit-learn``, ``numpy``,
+``python-glmnet`` requires Python version >= 3.6, ``scikit-learn``, ``numpy``,
 and ``scipy``. Installation from source or via ``pip`` requires a Fortran compiler.
 
 conda
@@ -39,9 +57,9 @@ pip
 source
 ~~~~~~
 
-``glmnet`` depends on numpy, scikit-learn and scipy. A working Fortran
-compiler is also required to build the package, for Mac users,
-``brew install gcc`` will take care of this requirement.
+``glmnet`` depends on numpy, scikit-learn and scipy.
+A working Fortran compiler is also required to build the package.
+For Mac users, ``brew install gcc`` will take care of this requirement.
 
 .. code:: bash
 

dev-requirements.txt

@@ -1,2 +1,5 @@
-pytest == 3.*
-nose >= 1.3
+# Pin exact dependency version numbers for local dev and CircleCI.
+numpy==1.19.0
+pytest==5.4.3
+scikit-learn==0.23.1
+scipy==1.5.0

glmnet/__init__.py

@@ -1,9 +1,8 @@
+import pkg_resources
+
 from .logistic import LogitNet
 from .linear import ElasticNet
-from ._version import get_versions
 
 __all__ = ['LogitNet', 'ElasticNet']
 
-
-__version__ = get_versions()['version']
-del get_versions
+__version__ = pkg_resources.get_distribution("glmnet").version