Skip to content
Snippets Groups Projects
Commit 2353e246 authored by Maeva Pourpoint's avatar Maeva Pourpoint
Browse files

Merge branch 'versioning_scheme' into 'master'

Add new versioning scheme

See merge request passoft/data2passcal!7
parents 6cf85533 bf42a95c
No related branches found
No related tags found
1 merge request!7Add new versioning scheme
Pipeline #1451 passed with stage
in 3 minutes and 14 seconds
package: package:
name: data2passcal name: data2passcal
version: 2020.213 version: 2022.1.0.0
source: source:
path: ../ path: ../
......
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL""" __author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu' __email__ = 'software-support@passcal.nmt.edu'
__version__ = '2020.213' __version__ = '2022.1.0.0'
...@@ -34,7 +34,7 @@ try: ...@@ -34,7 +34,7 @@ try:
except ImportError: except ImportError:
from urllib2 import urlopen from urllib2 import urlopen
VERSION = '2020.213' VERSION = '2022.1.0.0'
# FTP related # FTP related
......
...@@ -48,6 +48,6 @@ setup( ...@@ -48,6 +48,6 @@ setup(
name='data2passcal', name='data2passcal',
packages=find_packages(include=['data2passcal']), packages=find_packages(include=['data2passcal']),
url='https://git.passcal.nmt.edu/passoft/data2passcal', url='https://git.passcal.nmt.edu/passoft/data2passcal',
version='2020.213', version='2022.1.0.0',
zip_safe=False, zip_safe=False,
) )
...@@ -16,7 +16,7 @@ if sys.version_info < (3, 3): ...@@ -16,7 +16,7 @@ if sys.version_info < (3, 3):
else: else:
from unittest.mock import patch from unittest.mock import patch
VERSION = '2020.213' VERSION = '2022.1.0.0'
SEND4REAL = os.environ.get('SEND4REAL', 'False') SEND4REAL = os.environ.get('SEND4REAL', 'False')
print("SEND4REAL=False by default. If one wants to test sending data to " print("SEND4REAL=False by default. If one wants to test sending data to "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment