From c68ae9ca1e83f0cbf33abaf6ccde115fca2ecdfe Mon Sep 17 00:00:00 2001
From: Omid <ohosseini@passcal.nmt.edu>
Date: Thu, 20 Jul 2023 15:14:56 -0600
Subject: [PATCH] Remove python 3.7 support
---
.gitlab-ci.yml | 18 +-----------------
conda.recipe/meta.yaml | 6 +++---
refscrub/__init__.py | 2 +-
refscrub/refscrub.py | 2 +-
setup.py | 6 ++----
tox.ini | 2 +-
6 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad541ff..19f7c46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,7 +21,7 @@ before_script:
- pip install -e .[dev]
linting:
- image: python:3.6
+ image: python:3.8
tags:
- passoft
stage: test
@@ -29,22 +29,6 @@ linting:
- flake8 refscrub
- flake8 tests
-python3.6:
- image: python:3.6
- tags:
- - passoft
- stage: test
- script:
- - python -m unittest
-
-python3.7:
- image: python:3.7
- tags:
- - passoft
- stage: test
- script:
- - python -m unittest
-
python3.8:
image: python:3.8
tags:
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 8cafb6c..240046b 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,6 +1,6 @@
package:
name: refscrub
- version: 2022.1.0.0
+ version: 2023.2.0.0
source:
path: ../
@@ -11,10 +11,10 @@ build:
requirements:
build:
- - python >=3.6
+ - python >=3.8
- pip
run:
- - python >=3.6
+ - python >=3.8
test:
source_files:
diff --git a/refscrub/__init__.py b/refscrub/__init__.py
index b34f686..f923a4e 100644
--- a/refscrub/__init__.py
+++ b/refscrub/__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/refscrub/refscrub.py b/refscrub/refscrub.py
index 33e8075..c369edb 100644
--- a/refscrub/refscrub.py
+++ b/refscrub/refscrub.py
@@ -28,7 +28,7 @@ import struct
import sys
from os.path import basename, getsize, isfile
-PROG_VERSION = '2022.1.0.0'
+PROG_VERSION = '2023.2.0.0'
VERBOSE = False
EXTRACT = False
SUMMARY_FILE = 'scrubsum.txt'
diff --git a/setup.py b/setup.py
index 4e44cc9..aeef3ea 100644
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,6 @@ setup(
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
- 'Programming Language :: Python :: 3.6',
- 'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
description="Remove select packets from RT130 data",
@@ -44,7 +42,7 @@ setup(
keywords='refscrub',
name='refscrub',
packages=find_packages(include=['refscrub']),
- url='https://git.passcal.nmt.edu/passoft/refscrub',
- version='2022.1.0.0',
+ url='https://git.passcal.nmt.edu/software_public/passoft/refscrub',
+ version='2023.2.0.0',
zip_safe=False,
)
diff --git a/tox.ini b/tox.ini
index 9ff4187..f7228a2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py36, py37, py38, flake8
+envlist = py38, flake8
[testenv:flake8]
basepython = python
--
GitLab