Commit d0e324b5 authored by Philip James Elson's avatar Philip James Elson 🐍

Remove v0.x support for JPype.

parent 4a9b0561
......@@ -24,10 +24,12 @@ release_sdist:
.base_dev_test:
variables:
env_spec: INSERT_CONDA_REQUIREMENTS
POST_CONDA: ""
image: continuumio/miniconda3
script:
- conda create -n test_env --yes --quiet -c conda-forge pip $env_spec
- source activate test_env
- eval ${POST_CONDA}
- mkdir not-the-source-dir && cd not-the-source-dir
- pip install -e ..
......@@ -42,7 +44,8 @@ tests_dev_py36_jdk8_jp06:
extends:
.base_dev_test
variables:
env_spec: python=3.6 openjdk=8 JPype1=0.6
env_spec: python=3.6 openjdk=8
POST_CONDA: "python -m pip install jpype1==1.1.*"
.base_wheel_test:
......@@ -63,29 +66,6 @@ tests_dev_py36_jdk8_jp06:
- pip install "$(ls ../wheelhouse/*.whl)[test]"
- pytest --pyargs pyjapc
tests_whl_py36_jdk8_jp06:
extends:
.base_wheel_test
variables:
env_spec: python=3.6 openjdk=8 JPype1=0.6
tests_whl_py36_jdk11_jp06:
extends:
.base_wheel_test
variables:
env_spec: python=3.6 openjdk=11 JPype1=0.6
tests_whl_py36_jdk8_jp07:
extends:
.base_wheel_test
variables:
env_spec: python=3.6 openjdk=8 JPype1=0.7
tests_whl_py36_jdk11_jp07:
extends:
.base_wheel_test
variables:
env_spec: python=3.6 openjdk=11 JPype1=0.7
tests_whl_py38_jdk8_jp1p1:
extends:
......
......@@ -15,11 +15,9 @@ with (HERE / 'README.rst').open('rt') as fh:
LONG_DESCRIPTION = fh.read().strip()
BROKEN_JPYPE_VERSIONS="!=0.7.0,!=0.7.3,!=0.7.4,!=1.0.0,!=1.0.1,!=1.0.2"
REQUIREMENTS: dict = {
'core': [
f'jpype1 >1.0.2,{BROKEN_JPYPE_VERSIONS},<2.*; python_full_version >="3.8.4"',
f'jpype1 >0.6.0,{BROKEN_JPYPE_VERSIONS},<2.*; python_full_version < "3.8.4"',
'jpype1 ~=1.1',
'cmmnbuild-dep-manager~=2.6',
'numpy',
'pytz',
......@@ -51,7 +49,7 @@ setup(
url='https://gitlab.cern.ch/scripting-tools/pyjapc',
long_description=LONG_DESCRIPTION,
packages=find_packages(),
python_requires='>=3.6, <4',
python_requires='~=3.6',
classifiers=[
"Programming Language :: Python :: 3",
"Operating System :: POSIX :: Linux",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment