Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/Java_dependency_update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -52,7 +52,7 @@ jobs:

steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up JDK 8
uses: actions/setup-java@v4
Expand Down Expand Up @@ -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:
Expand All @@ -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 }}

Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.micro-manager.pycro-manager</groupId>
<artifactId>PycroManagerJava</artifactId>
<version>0.46.19</version>
<version>0.46.20</version>
<packaging>jar</packaging>
<name>Pycro-Manager Java</name>
<description>The Java components of Pycro-Manager</description>
Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>org.micro-manager.acqengj</groupId>
<artifactId>AcqEngJ</artifactId>
<version>0.39.2</version>
<version>0.39.4</version>
</dependency>
<dependency>
<groupId>org.micro-manager.ndviewer</groupId>
Expand All @@ -65,7 +65,7 @@
<dependency>
<groupId>org.micro-manager.ndtiffstorage</groupId>
<artifactId>NDTiffStorage</artifactId>
<version>2.18.4</version>
<version>2.19.2</version>
</dependency>
</dependencies>

Expand Down
7 changes: 3 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading