diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d74e7c03214c69162c040c133e954dd3f759604c..768d0c306138049eff0a00c1ff93c603b6d8d310 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,17 +20,8 @@ stages: before_script: - pip install -e .[dev] -linting_python2: - image: python:2.7 - tags: - - passoft - stage: test - script: - - flake8 --ignore=E722,E712 data2passcal - - flake8 --ignore=E722,E712 tests - linting_python3: - image: python:3.6 + image: python:3.8 tags: - passoft stage: test @@ -38,47 +29,6 @@ linting_python3: - flake8 --ignore=E722,E712 data2passcal - flake8 --ignore=E722,E712 tests -python2.7: - image: python:2.7 - tags: - - passoft - stage: test - script: - - cd tests/ - - pwd - - ls - - python -m unittest test_data2passcal - -python3.5: - image: python:3.5 - tags: - - passoft - stage: test - script: - - pwd - - ls - - python -m unittest - -python3.6: - image: python:3.6 - tags: - - passoft - stage: test - script: - - pwd - - ls - - python -m unittest - -python3.7: - image: python:3.7 - tags: - - passoft - stage: test - script: - - pwd - - ls - - python -m unittest - python3.8: image: python:3.8 tags: diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index cc61bb60d09b271ba4bba0075ca67c1dea8d9068..b3995cd4407968d414433592280027ede2a8213a 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: data2passcal - version: 2022.1.0.0 + version: 2023.2.0.0 source: path: ../ @@ -11,10 +11,10 @@ build: requirements: build: - - python >=2.7 + - python >=3.8 - pip run: - - python >=2.7 + - python >=3.8 test: requires: diff --git a/data2passcal/__init__.py b/data2passcal/__init__.py index 9b4b7dd91e1a9cd45a8a75a2651a273b6d3bbd4c..204e7b0f2fbb2f111b1ce6da5bad76e65f80df79 100644 --- a/data2passcal/__init__.py +++ b/data2passcal/__init__.py @@ -4,4 +4,4 @@ __author__ = """IRIS PASSCAL""" __email__ = 'software-support@passcal.nmt.edu' -__version__ = '2022.1.0.0' +__version__ = '2023.2.0.0' diff --git a/data2passcal/data2passcal.py b/data2passcal/data2passcal.py index 4a3693d8f321dffc3579b2767b75b5c087b7c8b6..c2a5e043e4dc66373e44ed3719f884b57f9a90d0 100644 --- a/data2passcal/data2passcal.py +++ b/data2passcal/data2passcal.py @@ -34,7 +34,7 @@ try: except ImportError: from urllib2 import urlopen -VERSION = '2022.1.0.0' +VERSION = '2023.2.0.0' # FTP related diff --git a/setup.py b/setup.py index d5ae92eace05b68fdd905766d351012135fa0680..0618e0abab46673cd11d5b9c99e8b636d2d4bab5 100644 --- a/setup.py +++ b/setup.py @@ -20,10 +20,6 @@ setup( 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU General Public License v3 (GPLv3)', 'Natural Language :: English', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', ], description="Prepare SEED data for shipment to PASSCAL.", @@ -47,7 +43,7 @@ setup( keywords='data2passcal', name='data2passcal', packages=find_packages(include=['data2passcal']), - url='https://git.passcal.nmt.edu/passoft/data2passcal', - version='2022.1.0.0', + url='https://git.passcal.nmt.edu/software_public/passoft/data2passcal', + version='2023.2.0.0', zip_safe=False, ) diff --git a/tests/test_data2passcal.py b/tests/test_data2passcal.py index 5d9de13fb36534e81e2c80802c03794cc4121351..25ec58f183e3ddbc27bb83692707b98751c1de37 100644 --- a/tests/test_data2passcal.py +++ b/tests/test_data2passcal.py @@ -16,7 +16,7 @@ if sys.version_info < (3, 3): else: from unittest.mock import patch -VERSION = '2022.1.0.0' +VERSION = '2023.2.0.0' SEND4REAL = os.environ.get('SEND4REAL', 'False') print("SEND4REAL=False by default. If one wants to test sending data to " diff --git a/tox.ini b/tox.ini index 954a1f07c917bc9587afdaf4ecffe26723fe41ff..3a4724fe1c9b14f57342213fd175ce11949bb846 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37, py38, flake8 +envlist = py38, flake8 [testenv:flake8] basepython = python