Skip to content

Commit cb8dc3f

Browse files
committed
Merge branch 'master' into patch-7
2 parents cc74ee5 + c909760 commit cb8dc3f

39 files changed

+267
-248
lines changed

.codecov.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
coverage:
2+
status:
3+
project: off
4+
patch: off

.github/workflows/main.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,46 @@ jobs:
1818
- macos-latest
1919
- windows-latest
2020
architecture: [x64, x86]
21-
python-version: ['3.7', '3.8']
22-
julia-version: ['1.0', '1.3', '~1.5.0-rc1', 'nightly']
21+
python-version:
22+
- '3.9'
23+
- '3.10'
24+
julia-version:
25+
- '1.0'
26+
- '1.6'
27+
- '1.7'
28+
- '1.8'
2329
exclude:
2430
- os: ubuntu-latest
2531
architecture: x86
2632
- os: macos-latest
2733
architecture: x86
2834
- os: macos-latest
29-
julia-version: '1.3'
35+
julia-version: '1.6'
3036
- os: windows-latest
31-
julia-version: '1.3'
37+
julia-version: '1.6'
3238
- os: macos-latest
3339
julia-version: 'nightly'
3440
- os: windows-latest
3541
julia-version: 'nightly'
42+
include:
43+
# Python 3.8 for testing `test_compiled_modules_no`:
44+
- os: ubuntu-latest
45+
architecture: x64
46+
python-version: '3.8'
47+
julia-version: '1'
48+
- os: macos-latest
49+
architecture: x64
50+
python-version: '3.8'
51+
julia-version: '1'
52+
- os: windows-latest
53+
architecture: x64
54+
python-version: '3.8'
55+
julia-version: '1'
3656
fail-fast: false
37-
name: Test ${{ matrix.os }} ${{ matrix.architecture }}
38-
Python ${{ matrix.python-version }}
39-
Julia ${{ matrix.julia-version }}
57+
name: Test
58+
py${{ matrix.python-version }}
59+
jl${{ matrix.julia-version }}
60+
${{ matrix.os }} ${{ matrix.architecture }}
4061
steps:
4162
- uses: actions/checkout@v1
4263
- name: Setup python
@@ -57,7 +78,7 @@ jobs:
5778
- name: Install PyCall
5879
run: python ci/install_pycall.py
5980
- name: Run test
60-
run: python -m tox -- --cov=julia
81+
run: python -m tox -- --verbose --cov=julia
6182
env:
6283
CI: 'true' # run tests marked by @only_in_ci
6384
TOXENV: py
@@ -82,6 +103,6 @@ jobs:
82103
- name: Setup python
83104
uses: actions/setup-python@v1
84105
with:
85-
python-version: '3.8'
106+
python-version: '3.10'
86107
- run: python -m pip install --upgrade tox
87108
- run: python -m tox -e ${{ matrix.toxenv }}

.github/workflows/publish.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-20.04
1414
steps:
1515
- uses: actions/checkout@v2
16-
- name: Set up Python 3.8
16+
- name: Set up Python 3.9
1717
uses: actions/setup-python@v1
1818
with:
19-
python-version: 3.8
19+
python-version: 3.9
2020
- name: Install setuptools and wheel
2121
run: |
2222
python -m pip install --user setuptools wheel
@@ -29,7 +29,7 @@ jobs:
2929
if: >-
3030
(github.ref == 'refs/heads/release/test') ||
3131
(github.ref == 'refs/heads/release/main')
32-
uses: pypa/gh-action-pypi-publish@bce3b74dbf8cc32833ffba9d15f83425c1a736e0 # v1.3.1
32+
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29 # v1.4.2
3333
with:
3434
password: ${{ secrets.test_pypi_password }}
3535
repository_url: https://test.pypi.org/legacy/
@@ -40,14 +40,14 @@ jobs:
4040
runs-on: ubuntu-20.04
4141
steps:
4242
- uses: actions/checkout@v2
43-
- name: Set up Python 3.8
43+
- name: Set up Python 3.9
4444
uses: actions/setup-python@v1
4545
with:
46-
python-version: 3.8
46+
python-version: 3.9
4747
- name: Set up Julia
4848
uses: julia-actions/setup-julia@v1
4949
with:
50-
version: ^1.5.0-rc1
50+
version: '1.6'
5151
- name: Install tox
5252
run: python -m pip install --user tox
5353
- run: cd ci/test-upload && python -m tox
@@ -57,19 +57,19 @@ jobs:
5757
runs-on: ubuntu-20.04
5858
strategy:
5959
matrix: # using `matrix` to define a constant
60-
package: ['julia==0.5.5.dev']
60+
package: ['julia==0.5.8.dev']
6161
steps:
62-
- name: Set up Python 3.8
62+
- name: Set up Python 3.9
6363
uses: actions/setup-python@v1
6464
with:
65-
python-version: 3.8
65+
python-version: 3.9
6666
- name: Download from TestPyPI
6767
run: |
6868
pip download --dest dist --no-deps --index-url https://test.pypi.org/simple/ ${{ matrix.package }}
6969
pip download --dest dist --no-deps --index-url https://test.pypi.org/simple/ ${{ matrix.package }} --no-binary :all:
7070
- run: ls -lh dist
7171
- name: Publish distribution 📦 to PyPI
7272
if: github.ref == 'refs/heads/release/main'
73-
uses: pypa/gh-action-pypi-publish@bce3b74dbf8cc32833ffba9d15f83425c1a736e0 # v1.3.1
73+
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29 # v1.4.2
7474
with:
7575
password: ${{ secrets.pypi_password }}

.github/workflows/testtests.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Test tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags: '*'
8+
pull_request:
9+
workflow_dispatch:
10+
11+
jobs:
12+
test__using_default_setup:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Setup python
17+
uses: actions/setup-python@v1
18+
- run: python -m pip install --upgrade tox
19+
- run: python -m tox -- --no-julia -k test__using_default_setup
20+
env:
21+
PYJULIA_TEST_RUNTIME: dummy

.mergify.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 43 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@ PyJulia
33

44
[![Stable documentation](https://img.shields.io/badge/docs-stable-blue.svg)](https://pyjulia.readthedocs.io/en/stable/)
55
[![Latest documentation](https://img.shields.io/badge/docs-latest-blue.svg)](https://pyjulia.readthedocs.io/en/latest/)
6-
[![Build Status](https://travis-ci.org/JuliaPy/pyjulia.svg?branch=master)](https://travis-ci.org/JuliaPy/pyjulia)
7-
[![Build status](https://ci.appveyor.com/api/projects/status/github/JuliaPy/pyjulia?svg=true)](https://ci.appveyor.com/project/Keno/pyjulia)
86
[![Main workflow](https://github.com/JuliaPy/pyjulia/workflows/Main%20workflow/badge.svg)](https://github.com/JuliaPy/pyjulia/actions?query=workflow%3A%22Main+workflow%22)
7+
[![DOI](https://zenodo.org/badge/14576985.svg)](https://zenodo.org/badge/latestdoi/14576985)
98

109
Experimenting with developing a better interface to [Julia language](https://julialang.org/) that works with [Python](https://www.python.org/) 2 & 3 and Julia v1.0+.
1110

appveyor.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

ci/appveyor/win32/python2.7.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

ci/appveyor/win32/python3.5.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)