From 7e4269c70672d0c29d731a53dcf3295a792dcf4a Mon Sep 17 00:00:00 2001 From: Bradley Odell Date: Thu, 12 Oct 2023 21:28:52 -0700 Subject: [PATCH] Pre-release maintenance (#65) --- .github/workflows/build.yml | 4 ++-- .github/workflows/pre-commit.yml | 4 +--- .github/workflows/setup.yml | 8 ++++---- .github/workflows/wheel.yml | 4 ++-- .pre-commit-config.yaml | 8 +++----- LICENSE.txt => LICENSE | 0 MANIFEST.in | 2 +- README.md | 5 +++++ setup.py | 4 ++-- 9 files changed, 20 insertions(+), 19 deletions(-) rename LICENSE.txt => LICENSE (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f1b7df..abf7a10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,10 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, ubuntu-22.04, windows-latest, macos-latest ] - python: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] + python: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Setup Python ${{ matrix.python }} diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 5f26361..53324fd 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -14,9 +14,7 @@ jobs: pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 + - uses: actions/checkout@v4 - name: Setup Python uses: actions/setup-python@v4 with: diff --git a/.github/workflows/setup.yml b/.github/workflows/setup.yml index 81ca249..a799029 100644 --- a/.github/workflows/setup.yml +++ b/.github/workflows/setup.yml @@ -19,10 +19,10 @@ jobs: strategy: fail-fast: false matrix: -# Disable MacOS testing because it's being dumb -# os: [ ubuntu-20.04, ubuntu-22.04, windows-latest, macos-latest ] + # Disable MacOS testing because it's being dumb + # os: [ ubuntu-20.04, ubuntu-22.04, windows-latest, macos-latest ] os: [ ubuntu-20.04, ubuntu-22.04, windows-latest ] - python: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] + python: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] runs-on: ${{ matrix.os }} steps: - name: Install MSBuild @@ -30,7 +30,7 @@ jobs: uses: microsoft/setup-msbuild@v1.1 with: msbuild-architecture: x64 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Setup Python ${{ matrix.python }} diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml index e9c580c..9078380 100644 --- a/.github/workflows/wheel.yml +++ b/.github/workflows/wheel.yml @@ -21,10 +21,10 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04, ubuntu-22.04, windows-latest, macos-latest ] - python: [ "3.7", "3.8", "3.9", "3.10", "3.11" ] + python: [ "3.8", "3.9", "3.10", "3.11", "3.12" ] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: true - name: Setup Python ${{ matrix.python }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dc86980..4d2783f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,9 +1,7 @@ -default_language_version: - python: python3.8 exclude: ^eigency/eigen repos: - repo: https://github.com/psf/black - rev: 23.1.0 + rev: 23.9.1 hooks: - id: black args: [--line-length, "120"] @@ -19,14 +17,14 @@ repos: name: isort (pyi) types: [pyi] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v4.5.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files - repo: https://github.com/pycqa/flake8 - rev: 6.0.0 + rev: 6.1.0 hooks: - id: flake8 - repo: https://github.com/PyCQA/bandit diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/MANIFEST.in b/MANIFEST.in index 2ce8d01..f2e7266 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,7 +7,7 @@ exclude .gitignore exclude .isort.cfg exclude .pre-commit-config.yaml exclude CONTRIBUTING.md -include LICENSE.txt +include LICENSE exclude MANIFEST.in include pyproject.toml include README.md diff --git a/README.md b/README.md index 9ac6834..78faf5d 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,11 @@ data back and forth, and will thus avoid making unnecessary copies whenever possible. Only in cases where copies are explicitly requested by your C++ code will they be made. +## Versioning + +Eigency uses a 4-number version (`N.N.N.N`) where the first 3 parts correspond to the embedded Eigen library version. +The last part is a revision number of Eigency itself. + ## Installing Eigency is packaged as a source distribution (`sdist`) and available on PyPi. diff --git a/setup.py b/setup.py index 106c2ee..c20ff2f 100644 --- a/setup.py +++ b/setup.py @@ -74,11 +74,11 @@ "License :: OSI Approved :: MIT License", "Programming Language :: C++", "Programming Language :: Cython", - "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", ], license="MIT", author="Wouter Boomsma", @@ -97,6 +97,6 @@ include_package_data=True, package_data={__package_name__: ["*.h", "*.pxd", "*.pyx", join(__eigen_lib_dir__, "*")] + eigen_data_files}, exclude_package_data={__package_name__: [join(__eigen_lib_dir__, "CMakeLists.txt")]}, - python_requires=">=3.7", + python_requires=">=3.8", install_requires=["numpy"], )