Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kivy/pyjnius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f9179a91440d203d07f5af137ec339d0c56112c
Choose a base ref
..
head repository: kivy/pyjnius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7b81fda69844d049ff0cd7090cac1dfe08df1d62
Choose a head ref
Showing with 12 additions and 11 deletions.
  1. +8 −8 .github/workflows/create.yml
  2. +3 −2 .github/workflows/push.yml
  3. +1 −1 docs/requirements.txt
16 changes: 8 additions & 8 deletions .github/workflows/create.yml
View file
Original file line number Diff line number Diff line change
@@ -34,18 +34,18 @@ jobs:
steps:

- name: Checkout pyjnius
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python (Ubuntu x86_64, macOS Intel, Windows x86_64)
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Setup java
# There's no need to setup java on ubuntu-latest, as build is done into a manylinux
# containerized environment. (CIBW_BEFORE_ALL_LINUX) takes care of it.
if: ${{ matrix.os != 'ubuntu-latest' }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
@@ -79,10 +79,10 @@ jobs:
runs-on: 'ubuntu-latest'
steps:
- name: Checkout pyjnius
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

@@ -125,20 +125,20 @@ jobs:
steps:

- name: Checkout pyjnius
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/download-artifact@v2
with:
name: dist
path: dist

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

- name: Setup java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
5 changes: 3 additions & 2 deletions .github/workflows/push.yml
View file
Original file line number Diff line number Diff line change
@@ -65,12 +65,13 @@ jobs:
- uses: actions/checkout@master

- name: Setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
architecture: ${{ matrix.architecture == 'aarch64' && 'arm64' || matrix.architecture }}

- name: Setup java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
2 changes: 1 addition & 1 deletion docs/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Sphinx~=7.3.7
Sphinx~=7.4.0
furo==2024.5.6