Commit 2d5f8a89 authored by Derick Hess's avatar Derick Hess
Browse files

Merge branch 'lopt_update' into 'master'

updated from newest cookiecutter

See merge request !1
parents 8ad3fad4 ccbdfbec
Pipeline #164 passed with stage
in 1 minute and 54 seconds
File deleted
......@@ -100,3 +100,8 @@ ENV/
# mypy
.mypy_cache/
#pycharm
.idea/
.DS_Store
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
......@@ -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
......
......@@ -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.
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
......
......@@ -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
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.
......@@ -4,4 +4,4 @@
__author__ = """IRIS PASSCAL"""
__email__ = 'software-support@passcal.nmt.edu'
__version__ = '2018.137'
__version__ = 'Display time in PASSCAL time format2018.137'
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
[bumpversion]
current_version = 2018.137
current_version = Display time in PASSCAL time format2018.137
commit = True
tag = True
......
......@@ -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,
......
[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
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