Merge pull request #314 from BCG-Gamma/dev/2.0.dev5

BUILD: release pytools 2.0.dev5

Author: j-ittner

.pre-commit-config.yaml

@@ -5,7 +5,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.1.0
     hooks:
       - id: black
         language_version: python3

RELEASE_NOTES.rst

@@ -114,6 +114,12 @@ Additions and enhancements to dendrogram and matrix visualizations.
 *pytools* 1.2
 -------------
 
+1.2.5
+~~~~~
+
+This is a maintenance release to catch up with *pytools* 1.1.10.
+
+
 1.2.4
 ~~~~~
 
@@ -163,6 +169,20 @@ This is a maintenance release to catch up with *pytools* 1.1.4.
 *pytools* 1.1
 -------------
 
+1.1.10
+~~~~~~
+
+This release addresses additional issues in the release process, focusing on the
+`make_base.py` script for Sphinx builds used across *gamma-pytools*, *sklearndf*, and
+*gamma-facet*.
+
+
+1.1.9
+~~~~~
+
+This is a bugfix release to restore the GitHub release process.
+
+
 1.1.8
 ~~~~~
 

azure-pipelines.yml

@@ -51,7 +51,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.8.*'
+              versionSpec: '3.8'
             displayName: 'use Python 3.8'
           - script: |
               python -m pip install isort==5.5.4
@@ -62,18 +62,18 @@ stages:
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.8.*'
+              versionSpec: '3.8'
             displayName: 'use Python 3.8'
           - script: |
-              python -m pip install black==20.8b1
+              python -m pip install black==22.1
               python -m black --check .
             displayName: 'Run black'
       - job:
         displayName: 'flake8'
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.8.*'
+              versionSpec: '3.8'
             displayName: 'use Python 3.8'
           - script: |
               python -m pip install flake8==3.9.0 flake8-comprehensions flake8-import-order
@@ -84,10 +84,10 @@ stages:
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.7.*'
-            displayName: 'use Python 3.7'
+              versionSpec: '3.8'
+            displayName: 'use Python 3.8'
           - script: |
-              python -m pip install mypy~=0.931 numpy>=1.22
+              python -m pip install mypy~=0.931 numpy~=1.22
               python -m mypy src
             displayName: 'Run mypy'
 
@@ -120,6 +120,8 @@ stages:
                 build_changed=0
                 echo "build config is unchanged";
                 fi
+                # set +x to prevent Azure from randomly appending a \' of the ## statement
+                set +x
                 echo "##vso[task.setvariable variable=conda_build_config_changed;isOutput=true]$build_changed"
 
 
@@ -140,8 +142,8 @@ stages:
       steps:
         - task: UsePythonVersion@0
           inputs:
-            versionSpec: '3.7.*'
-          displayName: 'use Python 3.7'
+            versionSpec: '3.8'
+          displayName: 'use Python 3.8'
 
         - checkout: self
 
@@ -180,8 +182,8 @@ stages:
 
   # conda env & tox build test
   # testing matrix of python & sklearn versions
-  # - for release branch: 3 build tests
-  # - otherwise: 1 build test
+  # - for release branch: 9 build tests
+  # - otherwise: 3 build tests
   - stage: conda_tox_build
     displayName: 'Conda/tox build & test'
     dependsOn: 'detect_build_config_changes'
@@ -190,7 +192,7 @@ stages:
 
     jobs:
     - job:
-      displayName: 'single'
+      displayName: 'essential'
       condition: >
         and(
         ne(variables.source_is_release_branch, 'True'),
@@ -203,12 +205,19 @@ stages:
           vmImage: 'ubuntu-latest'
       strategy:
         matrix:
+          # We run three tests to cover conda/tox and maximum/minimum.
+          # This comprises only one minimum dependencies test for tox,
+          # which is usually faster than conda.
           maximum_dependencies_conda:
-            FACET_V_PYTHON_BUILD: '=3.9.*'
+            FACET_V_PYTHON_BUILD: '=3.9'
             BUILD_SYSTEM: 'conda'
             PKG_DEPENDENCIES: 'max'
+          minimum_dependencies_tox:
+            FACET_V_PYTHON_BUILD: '=3.7'
+            BUILD_SYSTEM: 'tox'
+            PKG_DEPENDENCIES: 'min'
           maximum_dependencies_tox:
-            FACET_V_PYTHON_BUILD: '=3.9.*'
+            FACET_V_PYTHON_BUILD: '=3.9'
             BUILD_SYSTEM: 'tox'
             PKG_DEPENDENCIES: 'max'
 
@@ -274,27 +283,27 @@ stages:
       strategy:
         matrix:
           default_dependencies_conda:
-            FACET_V_PYTHON_BUILD: '=3.8.*'
+            FACET_V_PYTHON_BUILD: '=3.8'
             BUILD_SYSTEM: 'conda'
             PKG_DEPENDENCIES: 'default'
           minimum_dependencies_conda:
-            FACET_V_PYTHON_BUILD: '=3.7.*'
+            FACET_V_PYTHON_BUILD: '=3.7'
             BUILD_SYSTEM: 'conda'
             PKG_DEPENDENCIES: 'min'
           maximum_dependencies_conda:
-            FACET_V_PYTHON_BUILD: '=3.9.*'
+            FACET_V_PYTHON_BUILD: '=3.9'
             BUILD_SYSTEM: 'conda'
             PKG_DEPENDENCIES: 'max'
           default_dependencies_tox:
-            FACET_V_PYTHON_BUILD: '=3.8.*'
+            FACET_V_PYTHON_BUILD: '=3.8'
             BUILD_SYSTEM: 'tox'
             PKG_DEPENDENCIES: 'default'
           minimum_dependencies_tox:
-            FACET_V_PYTHON_BUILD: '=3.7.*'
+            FACET_V_PYTHON_BUILD: '=3.7'
             BUILD_SYSTEM: 'tox'
             PKG_DEPENDENCIES: 'min'
           maximum_dependencies_tox:
-            FACET_V_PYTHON_BUILD: '=3.9.*'
+            FACET_V_PYTHON_BUILD: '=3.9'
             BUILD_SYSTEM: 'tox'
             PKG_DEPENDENCIES: 'max'
 
@@ -398,7 +407,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.8.*'
+              versionSpec: '3.8'
             displayName: 'use Python 3.8'
 
           - checkout: pytools
@@ -463,7 +472,7 @@ stages:
         steps:
           - task: UsePythonVersion@0
             inputs:
-              versionSpec: '3.8.*'
+              versionSpec: '3.8'
             displayName: 'use Python 3.8'
 
           - checkout: pytools
@@ -476,14 +485,16 @@ stages:
                 set -eux
                 echo "Getting version"
                 pip install packaging~=20.9
-                cd $(System.DefaultWorkingDirectory)/$(project_root)/src
+                package_path=$(System.DefaultWorkingDirectory)/$(project_root)/src/$(project_name)
                 export PYTHONPATH=$(System.DefaultWorkingDirectory)/pytools/sphinx/base
-                version=$(python -c "import make_base; print(make_base.get_package_version())")
+                version=$(python -c "import make_util; print(make_util.get_package_version(package_path='$package_path'))")
                 echo "Current version: $version"
                 echo "Detecting pre-release ('dev' or 'rc' in version)"
                 prerelease=False
                 [[ $version == *dev* ]] && prerelease=True && echo "Development release identified"
                 [[ $version == *rc* ]] && prerelease=True && echo "Pre-release identified"
+                # set +x to prevent Azure from randomly appending a \' of the ## statement
+                set +x
                 echo "##vso[task.setvariable variable=current_version]$version"
                 echo "##vso[task.setvariable variable=is_prerelease]$prerelease"
             displayName: "Get package version"
@@ -504,6 +515,8 @@ stages:
               anaconda login --username "${CONDA_USERNAME}" --password "${CONDA_PASSWORD}"
               anaconda upload --user BCG_Gamma --force $(System.ArtifactsDirectory)/conda_default/conda/noarch/$(package_name)-*.tar.bz2
               anaconda logout
+              # set +x to prevent Azure from randomly appending a \' of the ## statement
+              set +x
               echo "##vso[task.setvariable variable=conda_published]True"
             displayName: 'Publish to Anaconda'
 
@@ -518,6 +531,8 @@ stages:
               pip install flit
               flit install -s
               flit publish
+              # set +x to prevent Azure from randomly appending a \' of the ## statement
+              set +x
               echo "##vso[task.setvariable variable=pypi_published]True"
             displayName: 'Publish to PyPi'
             condition: eq(variables['source_is_release_branch'], 'True')
@@ -584,7 +599,7 @@ stages:
       steps:
         - task: UsePythonVersion@0
           inputs:
-            versionSpec: '3.8.*'
+            versionSpec: '3.8'
           displayName: 'use Python 3.8'
 
         - task: InstallSSHKey@0

environment.yml

@@ -5,37 +5,37 @@ channels:
 dependencies:
   # run
   - joblib ~= 1.1
-  - matplotlib ~= 3.3
+  - matplotlib ~= 3.5
   - numpy ~= 1.22
   - pandas ~= 1.4
-  - python ~= 3.8
-  - scipy ~= 1.7
+  - python ~= 3.8.12
+  - scipy ~= 1.8
   - typing_inspect ~= 0.7
   # build/test
   - black ~= 22.1
   - conda-build ~= 3.21
   - conda-verify ~= 3.1
   - docutils ~= 0.17
-  - flit = 3
-  - isort ~= 5.5
+  - flit ~= 3.0
+  - isort ~= 5.10
   - jinja2 ~= 2.11
   - markupsafe < 2.1  # markupsafe 2.1 breaks support for jinja2
   - m2r ~= 0.2
   - mypy ~= 0.931
   - pluggy ~= 0.13
-  - pre-commit ~= 2.7
+  - pre-commit ~= 2.17
   - pydata-sphinx-theme ~= 0.7
-  - pytest ~= 5.2
-  - pytest-cov ~= 2.8
-  - pyyaml ~= 5.1
+  - pytest ~= 5.4
+  - pytest-cov ~= 2.12
+  - pyyaml ~= 5.4
   - sphinx ~= 4.2
   - sphinx-autodoc-typehints ~= 1.12
   - toml ~= 0.10
-  - tox ~= 3.20
+  - tox ~= 3.24
   - yaml ~= 0.2
   # notebooks
-  - jupyterlab ~= 3.1
-  - nbclassic ~= 0.2.8
+  - jupyterlab ~= 3.2
+  - nbclassic ~= 0.3
   - nbsphinx ~= 0.7.1
-  - openpyxl = 3
+  - openpyxl ~= 3.0
   - seaborn ~= 0.11