Merge pull request #29 from Erotemic/dev/2.2.1

Dev/2.2.1
Erotemic · Aug 13, 2024 · 8a104f3 · 8a104f3
2 parents 1488566 + 1c59e4e
commit 8a104f3
Show file tree

Hide file tree

Showing 54 changed files with 317 additions and 947 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,10 +22,10 @@ jobs:
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
- - name: Set up Python 3.11 for linting
+ - name: Set up Python 3.12 for linting
  uses: actions/setup-python@v5.0.0
  with:
- python-version: '3.11'
+ python-version: '3.12'
  - name: Install dependencies
  run: |-
  python -m pip install --upgrade pip
@@ -44,10 +44,10 @@ jobs:
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
- - name: Set up Python 3.11
+ - name: Set up Python 3.12
  uses: actions/setup-python@v5.0.0
  with:
- python-version: '3.11'
+ python-version: '3.12'
  - name: Upgrade pip
  run: |-
  python -m pip install --upgrade pip
@@ -110,14 +110,14 @@ jobs:
  os:
  - ubuntu-latest
  python-version:
- - '3.11'
+ - '3.12'
  arch:
  - auto
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v3
+ uses: docker/setup-qemu-action@v3.0.0
  if: runner.os == 'Linux' && matrix.arch != 'auto'
  with:
  platforms: all
@@ -141,6 +141,7 @@ jobs:
  path: ./wheelhouse/utool*.whl
  test_purepy_wheels:
  name: ${{ matrix.python-version }} on ${{ matrix.os }}, arch=${{ matrix.arch }} with ${{ matrix.install-extras }}
+ if: "! startsWith(github.event.ref, 'refs/heads/release')"
  runs-on: ${{ matrix.os }}
  needs:
  - build_purepy_wheels
@@ -162,57 +163,65 @@ jobs:
  install-extras: tests-strict,runtime-strict
  os: windows-latest
  arch: auto
- - python-version: '3.11'
+ - python-version: '3.12'
  install-extras: tests-strict,runtime-strict,optional-strict
  os: ubuntu-latest
  arch: auto
- - python-version: '3.11'
+ - python-version: '3.12'
  install-extras: tests-strict,runtime-strict,optional-strict
  os: macOS-latest
  arch: auto
- - python-version: '3.11'
+ - python-version: '3.12'
  install-extras: tests-strict,runtime-strict,optional-strict
  os: windows-latest
  arch: auto
- - python-version: '3.11'
+ - python-version: '3.12'
  install-extras: tests
- os: windows-latest
+ os: macOS-latest
  arch: auto
- - python-version: '3.11'
+ - python-version: '3.12'
  install-extras: tests
  os: windows-latest
  arch: auto
  - python-version: '3.8'
  install-extras: tests,optional
- os: windows-latest
+ os: ubuntu-latest
  arch: auto
  - python-version: '3.9'
  install-extras: tests,optional
- os: windows-latest
+ os: ubuntu-latest
  arch: auto
  - python-version: '3.10'
  install-extras: tests,optional
- os: windows-latest
+ os: ubuntu-latest
  arch: auto
  - python-version: '3.11'
  install-extras: tests,optional
- os: windows-latest
+ os: ubuntu-latest
+ arch: auto
+ - python-version: '3.12'
+ install-extras: tests,optional
+ os: ubuntu-latest
  arch: auto
  - python-version: '3.8'
  install-extras: tests,optional
- os: windows-latest
+ os: macOS-latest
  arch: auto
  - python-version: '3.9'
  install-extras: tests,optional
- os: windows-latest
+ os: macOS-latest
  arch: auto
  - python-version: '3.10'
  install-extras: tests,optional
- os: windows-latest
+ os: macOS-latest
  arch: auto
  - python-version: '3.11'
  install-extras: tests,optional
- os: windows-latest
+ os: macOS-latest
+ arch: auto
+ - python-version: '3.12'
+ install-extras: tests,optional
+ os: macOS-latest
  arch: auto
  - python-version: '3.8'
  install-extras: tests,optional
@@ -230,14 +239,18 @@ jobs:
  install-extras: tests,optional
  os: windows-latest
  arch: auto
+ - python-version: '3.12'
+ install-extras: tests,optional
+ os: windows-latest
+ arch: auto
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
  - name: Enable MSVC 64bit
  uses: ilammy/msvc-dev-cmd@v1
  if: matrix.os == 'windows-latest'
  - name: Set up QEMU
- uses: docker/setup-qemu-action@v3
+ uses: docker/setup-qemu-action@v3.0.0
  if: runner.os == 'Linux' && matrix.arch != 'auto'
  with:
  platforms: all
@@ -323,9 +336,8 @@ jobs:
  runs-on: ubuntu-latest
  if: github.event_name == 'push' && ! startsWith(github.event.ref, 'refs/tags') && ! startsWith(github.event.ref, 'refs/heads/release')
  needs:
- - build_and_test_sdist
  - build_purepy_wheels
- - test_purepy_wheels
+ - build_and_test_sdist
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
@@ -398,9 +410,8 @@ jobs:
  runs-on: ubuntu-latest
  if: github.event_name == 'push' && (startsWith(github.event.ref, 'refs/tags') || startsWith(github.event.ref, 'refs/heads/release'))
  needs:
- - build_and_test_sdist
  - build_purepy_wheels
- - test_purepy_wheels
+ - build_and_test_sdist
  steps:
  - name: Checkout source
  uses: actions/checkout@v4.1.1
@@ -488,6 +499,12 @@ jobs:
  shell: bash
  run: ls -la wheelhouse
  - run: 'echo "Automatic Release Notes. TODO: improve" > ${{ github.workspace }}-CHANGELOG.txt'
+ - name: Tag Release Commit
+ if: (startsWith(github.event.ref, 'refs/heads/release'))
+ run: |-
+ export VERSION=$(python -c "import setup; print(setup.VERSION)")
+ git tag "v$VERSION"
+ git push origin "v$VERSION"
  - uses: softprops/action-gh-release@v1
  name: Create Release
  id: create_release
@@ -496,8 +513,9 @@ jobs:
  with:
  body_path: ${{ github.workspace }}-CHANGELOG.txt
  tag_name: ${{ github.ref }}
- release_name: Release ${{ github.ref }}
+ name: Release ${{ github.ref }}
  body: Automatic Release
+ generate_release_notes: true
  draft: true
  prerelease: false
  files: |-

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ We are currently working on porting this changelog to the specifications in
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
+### Version 2.2.1 - Unreleased
+
+### Changed
+* Replace imp usage with importlib.
+* Remove most cases of six.moves
+* Remove delorean dependency
+
 ### [Version 2.2.0] - Released 2024-04-13
 
 ### Changed:

diff --git a/appveyor.yml b/appveyor.yml
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -17,7 +17,7 @@
  # need to edit the conf.py
 
  cd ~/code/utool/docs
- sphinx-apidoc --private --separate -f -o ~/code/utool/docs/source/auto ~/code/utool/utool
+ sphinx-apidoc --private --separate --force --output-dir ~/code/utool/docs/source/auto ~/code/utool/utool
 
  # Note: the module should importable before running this
  # (e.g. install it in developer mode or munge the PYTHONPATH)

diff --git a/pyproject.toml b/pyproject.toml
@@ -14,7 +14,7 @@ ci_pypy_versions = []
 os = [ "linux", "osx", "win",]
 url = 'https://github.com/Erotemic/utool'
 min_python = 3.8
-max_python = 3.11
+max_python = 3.12
 version = "{mod_dpath}/__init__.py::__version__"
 author = "Jon Crall"
 author_email = "erotemic@gmail.com"

diff --git a/requirements/optional.txt b/requirements/optional.txt
@@ -14,7 +14,9 @@ pyperclip >= 1.5.7
 pyfiglet >= 0.7.2
 boto >= 2.49.0
 
-lru-dict>=1.1.8 ; python_version < '4.0' and python_version >= '3.10' # Python 3.10+
+lru-dict>=1.3.0 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
+lru-dict>=1.2.0 ; python_version < '3.12' and python_version >= '3.11' # Python 3.11
+lru-dict>=1.1.8 ; python_version < '3.11' and python_version >= '3.10' # Python 3.10
 lru-dict>=1.1.8 ; python_version < '3.10' and python_version >= '3.9' # Python 3.9
 lru-dict>=1.1.8 ; python_version < '3.9' and python_version >= '3.8' # Python 3.8
 lru-dict>=1.1.8 ; python_version < '3.8' and python_version >= '3.7' # Python 3.7

diff --git a/requirements/runtime.txt b/requirements/runtime.txt
@@ -1,57 +1,50 @@
 # python ~/local/tools/supported_python_versions_pip.py networkx
 
-six >= 1.10.0
+six>=1.16.0 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
+six>=1.10.0 ; python_version < '3.12' # Python 3.11-
+
 parse >= 1.6.6
 requests >= 2.27.1
 
 # 1.19.2 is the tensorflow minimum
 # xdev availpkg numpy
-numpy>=1.24.0 ; python_version < '4.0' and python_version >= '3.11' # Python 3.11+
+numpy>=1.26.0 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
+numpy>=1.23.2 ; python_version < '3.12' and python_version >= '3.11' # Python 3.11
 numpy>=1.21.6 ; python_version < '3.11' and python_version >= '3.10' # Python 3.10
 numpy>=1.19.3 ; python_version < '3.10' and python_version >= '3.9' # Python 3.9
-numpy>=1.19.2 ; python_version < '3.9' and python_version >= '3.8' # Python 3.8
+numpy>=1.21.0 ; python_version < '3.9' and python_version >= '3.8' and platform_system=="Darwin" # Python 3.8 (osx)
+numpy>=1.19.2 ; python_version < '3.9' and python_version >= '3.8' and platform_system!="Darwin" # Python 3.8 (non-osx)
 numpy>=1.14.5 ; python_version < '3.8' and python_version >= '3.7' # Python 3.7
 numpy>=1.12.0 ; python_version < '3.7' and python_version >= '3.6' # Python 3.6
-numpy>=1.11.1 ; python_version < '3.6' and python_version >= '3.5' # Python 3.5
-numpy>=1.11.1 ; python_version < '3.5' and python_version >= '3.4' # Python 3.4
-numpy>=1.11.1 ; python_version < '3.4' and python_version >= '2.7' # Python 2.7
 
 pyparsing >= 3.0.7
-delorean >= 1.0.0
 
 gitpython>=3.1.24 ; python_version >= '3.7' # Python 3.7+
 gitpython>=3.1.18 ; python_version < '3.7' and python_version >= '3.6' # Python 3.6
-gitpython>=3.0.7 ; python_version < '3.6' and python_version >= '3.4' # Python 3.4
-gitpython>=2.1.12 ; python_version < '3.4' and python_version >= '3.0' # Python 3.0
-gitpython>=2.1.4 ; python_version < '3.0' and python_version >= '2.7' # Python 2.7
-gitpython>=2.1.8 ; python_version < '2.7' and python_version >= '2.6' # Python 2.6
 
-ubelt>=1.0.0 ; python_version >= '3.6' # Python 3.6+
+ubelt>=1.3.4 ; python_version >= '3.6' # Python 3.6+
 ubelt>=0.8.1 ; python_version < '3.6' and python_version >= '2.7' # Python 2.7
 
-#pandas >= 1.4.1
+python_dateutil>=2.9.0 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
 
-pandas>=1.5.0 ; python_version < '4.0' and python_version >= '3.11' # Python 3.11+
+pandas>=2.2.0 ; python_version < '4.0' and python_version >= '3.12' # Python 3.12+
+pandas>=1.5.0 ; python_version < '3.12' and python_version >= '3.11' # Python 3.11
 pandas>=1.3.5 ; python_version < '3.11' and python_version >= '3.10' # Python 3.10
 pandas>=1.4.0 ; python_version < '3.10' and python_version >= '3.9' # Python 3.9
 pandas>=1.4.0 ; python_version < '3.9' and python_version >= '3.8' # Python 3.8
 pandas>=1.2.0 ; python_version < '3.8' and python_version >= '3.7.1' # Python 3.7.1
 pandas>=1.1.3 ; python_version < '3.7.1' and python_version >= '3.7' # Python 3.7
 pandas>=1.0.0 ; python_version < '3.7' and python_version >= '3.6.1' # Python 3.6.1
 pandas>=0.20.3 ; python_version < '3.6.1' and python_version >= '3.6' # Python 3.6
-pandas>=0.25.0 ; python_version < '3.6' and python_version >= '3.5.3' # Python 3.5.3
-pandas>=0.18.1 ; python_version < '3.5.3' and python_version >= '3.5' # Python 3.5
-pandas>=0.18.1 ; python_version < '3.5' and python_version >= '3.4' # Python 3.4
-pandas>=0.20.1 ; python_version < '3.4' and python_version >= '2.7' # Python 2.7
 
-networkx>=2.7 ; python_version >= '3.8' # Python 3.8+
+networkx>=2.8 ; python_version < '4.0' and python_version >= '3.11' # Python 3.11+
+networkx>=2.7 ; python_version < '3.11' and python_version >= '3.8' # Python 3.8-3.11
 networkx>=2.6.2 ; python_version < '3.8' and python_version >= '3.7' # Python 3.7
 networkx>=2.5 ; python_version < '3.7' and python_version >= '3.6' # Python 3.6
-networkx>=2.3 ; python_version < '3.6' and python_version >= '3.5' # Python 3.5
-networkx>=1.11 ; python_version < '3.5' and python_version >= '2.7' # Python 2.7
 
 
 lockfile >= 0.10.2 ; python_version<'3.0'
 futures >= 1.0.0 ; python_version<'3.0'
 
+
 timerit>=1.0.1