diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 1ffd1da0fd72a8e120b810f4038a1131d25cf70a..0000000000000000000000000000000000000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 84229f457bb049aca8293530623abac81690b239..f61ca3b8cad7c2ff89f3129f223dff5d827da74b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,3 +100,8 @@ ENV/
# mypy
.mypy_cache/
+
+#pycharm
+.idea/
+
+.DS_Store
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6524a3fd7cb85e8093c49e99c381fdbc7c0230c9
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,36 @@
+image: python
+
+# Change pip's cache directory to be inside the project directory since we can
+# only cache local items.
+variables:
+ PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache"
+
+# Pip's cache doesn't store the python packages
+# https://pip.pypa.io/en/stable/reference/pip_install/#caching
+#
+# If you want to also cache the installed packages, you have to install
+# them in a virtualenv and cache it as well.
+cache:
+ paths:
+ - .cache/pip
+
+stages:
+- test
+
+before_script:
+- pip install -e .[dev]
+
+
+python2:
+ image: python:2.7
+ tags:
+ - passoft
+ stage: test
+ script: tox -e py27
+
+python3:
+ image: python:3.6
+ tags:
+ - passoft
+ stage: test
+ script: tox -e py36
diff --git a/.github/ISSUE_TEMPLATE.md b/.gitlab/issue_templates/Bug.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE.md
rename to .gitlab/issue_templates/Bug.md
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 42d9ac9d61df19a7299acd54aaa3372b272a0105..394fe1bf76570a47879a7c3ebae67516ff070e27 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -32,7 +32,7 @@ wanted" is open to whoever wants to implement it.
Implement Features
~~~~~~~~~~~~~~~~~~
-Look through the GitHub issues for features. Anything tagged with "enhancement"
+Look through the GitLab issues for features. Anything tagged with "enhancement"
and "help wanted" is open to whoever wants to implement it.
Write Documentation
@@ -65,7 +65,7 @@ Ready to contribute? Here's how to set up `lopt` for local development.
3. Install your local copy::
- $ python setup.py develop
+ $ pip install -e .[dev]
4. Create a branch for local development::
@@ -88,10 +88,10 @@ Ready to contribute? Here's how to set up `lopt` for local development.
Pull Request Guidelines
-----------------------
-Before you submit a pull request, check that it meets these guidelines:
+Before you submit a merge request, check that it meets these guidelines:
-1. The pull request should include tests.
-2. If the pull request adds functionality, the docs should be updated. Put
+1. The merge request should include tests.
+2. If the merge request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 2.7
diff --git a/HISTORY.rst b/HISTORY.rst
index 18b5fa4ea231869181b2e8a89cfcba9e4513fd0b..5bf4e33d392779afa7b9911e223b05d5881b94a9 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,7 +2,7 @@
History
=======
-2018.137 (2018-05-16)
+Display time in PASSCAL time format2018.137 (2018-06-07)
------------------
* First release on new build system.
diff --git a/LICENSE b/LICENSE
index 0cc58d5825c1a4dc907a0aa6bd02d3d03a0ca0ad..58f70ce806f56b066ea1ade6f37e62837ade7238 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
- Display time in PASSCAL time format
+ Python Boilerplate contains all the boilerplate you need to create a Python package.
Copyright (C) 2018 IRIS PASSCAL
This program is free software: you can redistribute it and/or modify
diff --git a/README.rst b/README.rst
index 83a4fb8c50684339176b937e438ba128992d351b..22bc7c72d52bd0539aff100ad73d8f420607270b 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@ lopt
====
-Display time in PASSCAL time format
+Python Boilerplate contains all the boilerplate you need to create a Python package.
* Free software: GNU General Public License v3 (GPLv3)
@@ -18,7 +18,7 @@ Features
Credits
-------
-This package was created with Cookiecutter_ and the `audreyr/cookiecutter-pypackage`_ project template.
+This package was created with Cookiecutter_ and the `passoft/cookiecutter`_ project template.
.. _Cookiecutter: https://github.com/audreyr/cookiecutter
-.. _`audreyr/cookiecutter-pypackage`: https://github.com/audreyr/cookiecutter-pypackage
+.. _`passoft/cookiecutter`: https://git.passcal.nmt.edu/passoft/cookiecutter
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e430434b23844909f7729a5d16eaeb9ba8c02ad5
--- /dev/null
+++ b/conda.recipe/meta.yaml
@@ -0,0 +1,24 @@
+package:
+ name: lopt
+ version: Display time in PASSCAL time format2018.137
+
+source:
+ path: ..
+
+build:
+ # If the installation is complex, or different between Unix and Windows, use
+ # separate bld.bat and build.sh files instead of this key. Add the line
+ # "skip: True # [py<35]" (for example) to limit to Python 3.5 and newer, or
+ # "skip: True # [not win]" to limit to Windows.
+ script: python setup.py install --single-version-externally-managed --record=record.txt
+
+requirements:
+ build:
+ - python
+ - setuptools
+ run:
+ - python
+
+about:
+ home: https://git.passcal.nmt.edu/passoft/lopt
+ summary: Python Boilerplate contains all the boilerplate you need to create a Python package.
diff --git a/lopt/__init__.py b/lopt/__init__.py
index 374a890dc5c8897e92adc86e05fe949b78645913..d4b83bd98a42e25213682eeb2170b839cb032af4 100644
--- a/lopt/__init__.py
+++ b/lopt/__init__.py
@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu'
-__version__ = '2018.137'
+__version__ = 'Display time in PASSCAL time format2018.137'
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/requirements_dev.txt b/requirements_dev.txt
deleted file mode 100644
index a253cec2f07d3bb4b8610c047d2358dabfcd82af..0000000000000000000000000000000000000000
--- a/requirements_dev.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-pip==9.0.1
-bumpversion==0.5.3
-wheel==0.30.0
-watchdog==0.8.3
-flake8==3.5.0
-tox==2.9.1
-coverage==4.5.1
-Sphinx==1.7.1
-twine==1.10.0
-
-
diff --git a/setup.cfg b/setup.cfg
index 1336268a062df5cba87738c07f4481b88b2de810..e2d6dde04da4655485f8db7041a0ef1b6765dc0f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 2018.137
+current_version = Display time in PASSCAL time format2018.137
commit = True
tag = True
diff --git a/setup.py b/setup.py
index e1cfedd2dc09fc9fae47b0238610b88b30e16de6..6daceda9ea7eb1eacfec34b61e57cfb9c133953c 100644
--- a/setup.py
+++ b/setup.py
@@ -11,17 +11,12 @@ with open('README.rst') as readme_file:
with open('HISTORY.rst') as history_file:
history = history_file.read()
-requirements = []
-
-setup_requirements = []
-
-test_requirements = []
setup(
author="IRIS PASSCAL",
author_email='software-support@passcal.nmt.edu',
classifiers=[
- 'Development Status :: 5 - Production/Stablea',
+ 'Development Status :: 5 - Production/Stable',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
@@ -33,16 +28,28 @@ setup(
'lopt=lopt.lopt:main',
],
},
- install_requires=requirements,
+ install_requires=[],
+ setup_requires = [],
+ extras_require={
+ 'dev': [
+ 'pip',
+ 'bumpversion',
+ 'wheel',
+ 'watchdog',
+ 'flake8',
+ 'tox',
+ 'coverage',
+ 'Sphinx',
+ 'twine',
+ ]
+ },
license="GNU General Public License v3",
long_description=readme + '\n\n' + history,
include_package_data=True,
keywords='lopt',
name='lopt',
packages=find_packages(include=['lopt']),
- setup_requires=setup_requirements,
test_suite='tests',
- tests_require=test_requirements,
url='https://git.passcal.nmt.edu/passoft/lopt',
version='2018.137',
zip_safe=False,
diff --git a/tox.ini b/tox.ini
index b409fa219151d4bfd7711bf689d8b6fdb329b134..95cbed084c98500be79068fdcfd1df3e3e953db2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,10 @@
[tox]
-envlist = py27, flake8
+envlist = py27, py36 flake8
[travis]
python =
2.7: py27
+ 3.6: py36
[testenv:flake8]
basepython = python
@@ -13,6 +14,6 @@ commands = flake8 lopt
[testenv]
setenv =
PYTHONPATH = {toxinidir}
-python setup.py test
+commands=python setup.py test