diff --git a/.github/workflows/Java_dependency_update.yml b/.github/workflows/Java_dependency_update.yml index f5212bbb..27c6e098 100644 --- a/.github/workflows/Java_dependency_update.yml +++ b/.github/workflows/Java_dependency_update.yml @@ -20,11 +20,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Pycro-Manager dependencies branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: '' repository: micro-manager/pycro-manager - ref: dependencies fetch-depth: 0 # check out all branches so main can be merged token: ${{ secrets.GITHUB_TOKEN }} ref: dependency-update diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml index 74b123ff..7cd2d867 100644 --- a/.github/workflows/build_and_deploy.yml +++ b/.github/workflows/build_and_deploy.yml @@ -29,7 +29,7 @@ jobs: outputs: changed: ${{ steps.filter.outputs.changed }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter with: @@ -52,7 +52,7 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 8 uses: actions/setup-java@v4 @@ -102,7 +102,7 @@ jobs: - name: Checkout Micro-Manager branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 # env: # GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }} with: @@ -113,7 +113,7 @@ jobs: - name: Checkout pycro-manager # To get the update_mm_ivy.py script - uses: actions/checkout@v3 + uses: actions/checkout@v4 env: GITHUB_TOKEN: ${{ steps.get_workflow_token.outputs.token }} @@ -202,7 +202,7 @@ jobs: outputs: changed: ${{ steps.filter.outputs.changed }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dorny/paths-filter@v2 id: filter with: @@ -226,9 +226,9 @@ jobs: steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: '3.x' - name: Install dependencies diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 8bc18164..cc8a7d8b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -11,14 +11,14 @@ jobs: strategy: matrix: - python-version: ["3.9"] + python-version: ["3.10"] steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up JDK 8 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '8' distribution: 'temurin' @@ -29,7 +29,7 @@ jobs: mvn dependency:copy-dependencies --file java/pom.xml - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} architecture: 'x64' diff --git a/java/pom.xml b/java/pom.xml index 7c1ad3aa..9e527659 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.micro-manager.pycro-manager PycroManagerJava - 0.46.19 + 0.46.20 jar Pycro-Manager Java The Java components of Pycro-Manager @@ -55,7 +55,7 @@ org.micro-manager.acqengj AcqEngJ - 0.39.2 + 0.39.4 org.micro-manager.ndviewer @@ -65,7 +65,7 @@ org.micro-manager.ndtiffstorage NDTiffStorage - 2.18.4 + 2.19.2 diff --git a/setup.py b/setup.py index d605f23c..98628eb8 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ url="https://github.com/micro-manager/pycro-manager", packages=setuptools.find_packages(), install_requires=requirements, - python_requires=">=3.6", + python_requires=">=3.10", extras_require={ "dev": [ "pytest", @@ -35,11 +35,10 @@ ] }, classifiers=[ - "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", + "Programming Language :: Python :: 3.13", "Development Status :: 3 - Alpha", "License :: OSI Approved :: BSD License", "Operating System :: OS Independent",