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
13 changes: 6 additions & 7 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
if: ${{ needs.check-java-version.outputs.changed == 'true' }}


name: Deploy PycroManagerJava.jar to Sonatype OSS
name: Deploy PycroManagerJava.jar to Maven central
runs-on: ubuntu-latest

steps:
Expand All @@ -65,18 +65,17 @@ jobs:
with: # running setup-java again overwrites the settings.xml
java-version: 8
distribution: 'zulu'

server-id: ossrh
server-username: OSSRH_USERNAME
server-password: OSSRH_PASSWORD
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Publish to Apache Maven Central
run: mvn deploy --file java/pom.xml -Dgpg.passphrase=${{ secrets.MAVEN_GPG_PASSPHRASE }}
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
OSSRH_USERNAME: ${{ secrets.MAVEN_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}


Expand Down
36 changes: 17 additions & 19 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<developer>
<id>nicost</id>
<name>Nico Stuurman</name>
<organization>UCSF/HHMI</organization>
<organization>UCSF</organization>
</developer>
</developers>

Expand Down Expand Up @@ -55,7 +55,7 @@
<dependency>
<groupId>org.micro-manager.acqengj</groupId>
<artifactId>AcqEngJ</artifactId>
<version>0.39.0</version>
<version>0.39.2</version>
</dependency>
<dependency>
<groupId>org.micro-manager.ndviewer</groupId>
Expand Down Expand Up @@ -111,29 +111,27 @@
<goal>sign</goal>
</goals>

<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
<configuration>
<gpgArguments>
<arg>--pinentry-mode</arg>
<arg>loopback</arg>
</gpgArguments>
</configuration>

</execution>
</executions>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.13</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
<stagingProgressTimeoutMinutes>20</stagingProgressTimeoutMinutes>
</configuration>

<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<waitUntil>published</waitUntil>
</configuration>
</plugin>

</plugins>
Expand All @@ -148,4 +146,4 @@
</repository>
</distributionManagement>

</project>
</project>
10 changes: 7 additions & 3 deletions pycromanager/test/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,17 @@ def install_mm():
if is_port_in_use(4827):
print('Using Micro-manager running on port 4827 for testing')
yield
elif find_existing_mm_install():
try:
path = find_existing_mm_install()
print('Micro-Manager is already installed, skipping installation')
yield find_existing_mm_install()
else:
yield path
except FileNotFoundError:
print("No Micro-Manager installation found, installing now")
# Download an install latest nightly build
mm_install_dir = download_and_install_mm(destination='auto')

print('Micro-Manager installed in ' + mm_install_dir)

#### Replace with newer versions of Java libraries ####
# find pycro-manager/java path
if os.path.isdir('java'):
Expand Down
Loading