diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index d904bbb2..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,114 +0,0 @@ -platform: - -x64 - -matrix: - fast_finish: true - -environment: - CMD_IN_ENV: "cmd /E:ON /V:ON /C .\\ci-helpers\\appveyor\\windows_sdk.cmd" - PYTHON_ARCH: "64" - - matrix: - - PYTHON_VERSION: "2.7" - JAVA_VERSION: "8" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - PYTHON_VERSION: "3.6" - JAVA_VERSION: "8" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "3.7" - JAVA_VERSION: "8" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "2.7" - JAVA_VERSION: "9" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - PYTHON_VERSION: "3.6" - JAVA_VERSION: "9" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "3.7" - JAVA_VERSION: "9" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "2.7" - JAVA_VERSION: "10" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - PYTHON_VERSION: "3.6" - JAVA_VERSION: "10" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "3.7" - JAVA_VERSION: "10" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "2.7" - JAVA_VERSION: "11" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - - PYTHON_VERSION: "3.6" - JAVA_VERSION: "11" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - - PYTHON_VERSION: "3.7" - JAVA_VERSION: "11" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - -install: - # Set platform variables - - if "%PYTHON_ARCH%" == "64" set "ARCH_LABEL=-x64" - - if "%PYTHON_ARCH%" == "32" set "PROGRAM_ARCH_LABEL= (x86)" - - echo ARCH_LABEL %ARCH_LABEL% - - echo PROGRAM_ARCH_LABEL %PROGRAM_ARCH_LABEL% - - # Use Miniconda already installed on Appveyor - - set "BASE_PYTHON_VERSION=37" - - set "CONDA_ROOT=C:\Miniconda%BASE_PYTHON_VERSION%%ARCH_LABEL%" - - set "PATH=%CONDA_ROOT%;%CONDA_ROOT%\Scripts;%CONDA_ROOT%\Library\bin;%PATH%" - - set PATH - - echo CONDA_PREFIX %CONDA_PREFIX% - - conda config --set always_yes yes - - # Update conda - - conda config --add channels conda-forge - - conda install -y conda --no-pin - - "%CONDA_ROOT%\\Scripts\\activate" - - echo CONDA_PREFIX %CONDA_PREFIX% - - conda info -a - - # Set the correct compiler version (only for runtime) - # Not sure this is needed. - - set "COMPILER_VERSION=14" - - if "%PYTHON_VERSION%" == "2.7" set "COMPILER_VERSION=9" - - # Create project specific environment with specified Python version - - conda create -y -n pyjnius_env python=%PYTHON_VERSION% openjdk=%JAVA_VERSION% vc=%COMPILER_VERSION% ant cython pip six>=1.7.0 setuptools nose - - if errorlevel 1 exit 1 - -# Skip .NET project specific build phase. -build: false - -test_script: - # Activate Conda environment - - "%CONDA_ROOT%\\Scripts\\activate pyjnius_env" - - echo CONDA_PREFIX %CONDA_PREFIX% - - echo PATH %PATH% - - # Print some info - - echo PYTHON_VERSION %PYTHON_VERSION% - - echo JAVA_VERSION %JAVA_VERSION% - - echo JAVA_HOME %JAVA_HOME% - - echo JDK_HOME %JDK_HOME% - - python -c "import sys; print(sys.version)" - - python -c "import sys; print(sys.executable)" - - python -c "import sys; print(sys.prefix)" - - python --version - - # Build pyjnius - - ant all - - if errorlevel 1 exit 1 - - pip install --no-deps -v -e . - - if errorlevel 1 exit 1 - - # Java needs to be added to PATH - - set "PATH=%JAVA_HOME%\jre\bin\server;%JAVA_HOME%\bin\server;%JAVA_HOME%\bin;%PATH%" - - # Run tests - - python -c "import jnius" - - python -c "from jnius import autoclass;print(autoclass('java.lang.System').getProperty('java.version'))" - - if errorlevel 1 exit 1 - - set "CLASSPATH=%cd%\build\test-classes;..\build\classes;%CLASSPATH%" - - cd tests/ && nosetests -v - - if errorlevel 1 exit 1 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 00000000..384eb8be --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,74 @@ +on: push +name: on push +jobs: + Tests: + name: base + strategy: + matrix: + python: [ '2.7', '3.5', '3.6', '3.7'] + java: [ '8', '9', '10', '11' ] + os: ['ubuntu-latest'] # , 'windows-latest'] + + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@master + + - name: Setup python + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python }} + + - name: Setup java + uses: actions/setup-java@v1 + with: + java-version: ${{ matrix.java }} + architecture: x64 // (x64 or x86) - defaults to x64 + + - name: install + run: pip install .[dev,ci] + + - name: test + run: | + cd tests + CLASSPATH=../build/test-classes:../build/classes PYTHONPATH=..:$PYTHONPATH nosetests -v + +# - name: coveralls +# run: python -m coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + +# TestsPyPy: +# name: test pypy +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@master +# - name: Setup python +# uses: actions/setup-python@v1 +# with: +# python-version: pypy3 +# - name: prepare +# run: pip install -U setuptools wheel +# - name: install +# run: pip install .[dev,ci] +# - name: test +# run: python -m pytest --reruns 5 tests/ --cov oscpy/ --cov-branch +# - name: coveralls +# run: python -m coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + +# TestsMacOs: +# name: test OSX +# runs-on: macOs-latest +# steps: +# - uses: actions/checkout@master +# - name: prepare +# run: pip install -U setuptools wheel +# - name: install +# run: pip install .[dev,ci] +# - name: test +# run: python -m pytest --reruns 5 tests/ --cov oscpy/ --cov-branch +# - name: coveralls +# run: python -m coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bcec367c..00000000 --- a/.travis.yml +++ /dev/null @@ -1,55 +0,0 @@ -language: generic - -os: - - linux - - osx - -env: - - PYTHON_VERSION="2.7" JAVA_VERSION="8" - - PYTHON_VERSION="3.6" JAVA_VERSION="8" RUN="sdist" - - PYTHON_VERSION="3.7" JAVA_VERSION="8" - - PYTHON_VERSION="2.7" JAVA_VERSION="9" - - PYTHON_VERSION="3.6" JAVA_VERSION="9" - - PYTHON_VERSION="3.7" JAVA_VERSION="9" - - PYTHON_VERSION="2.7" JAVA_VERSION="10" - - PYTHON_VERSION="3.6" JAVA_VERSION="10" - - PYTHON_VERSION="3.7" JAVA_VERSION="10" - - PYTHON_VERSION="2.7" JAVA_VERSION="11" - - PYTHON_VERSION="3.6" JAVA_VERSION="11" - - PYTHON_VERSION="3.7" JAVA_VERSION="11" - -matrix: - fast_finish: true - -install: - - - if [ "$TRAVIS_OS_NAME" = linux ]; then - sudo apt-get update; - MINICONDAVERSION="Linux"; - else - MINICONDAVERSION="MacOSX"; - fi; - - wget https://repo.continuum.io/miniconda/Miniconda3-latest-$MINICONDAVERSION-x86_64.sh -O miniconda.sh - - bash miniconda.sh -b -p $HOME/miniconda - - echo ". $HOME/miniconda/etc/profile.d/conda.sh" >> $HOME/.bashrc - - source $HOME/.bashrc - - hash -r - - conda config --set always_yes yes --set changeps1 no - - conda config --add channels conda-forge - - conda update -q conda - - conda info -a - - conda create -n jnius_env python=$PYTHON_VERSION - - conda activate jnius_env - - conda install openjdk=$JAVA_VERSION cython nose ant pip setuptools six - -script: - - conda activate jnius_env - - if [ "$RUN" = "sdist" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then - if [ "$PYJNIUS_DEPLOY" == "1" ]; then - conda install twine; - python setup_sdist.py sdist; - python -m twine upload dist/*; - fi; - else - make && make tests; - fi; diff --git a/setup.py b/setup.py index 8850bb1b..4645a6f3 100644 --- a/setup.py +++ b/setup.py @@ -285,5 +285,9 @@ def compile_native_invocation_handler(*possible_homes): extra_link_args=EXTRA_LINK_ARGS ) ], + extras_require={ + 'dev': ['nose', 'wheel', 'pytest-cov', 'pycodestyle'], + 'ci': ['coveralls', 'pytest-rerunfailures'], + }, **SETUP_KWARGS )