Skip to content

Commit

Permalink
Merge c2bf565 into f0ce8b9
Browse files Browse the repository at this point in the history
  • Loading branch information
revesansparole committed Mar 14, 2019
2 parents f0ce8b9 + c2bf565 commit aa0dd02
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 47 deletions.
2 changes: 1 addition & 1 deletion .pkglts/pkg_cfg.json
Expand Up @@ -124,6 +124,6 @@
"version": {
"major": 4,
"minor": 6,
"post": 0
"post": 1
}
}
10 changes: 5 additions & 5 deletions .pkglts/pkg_hash.json
Expand Up @@ -33,7 +33,7 @@
"doc": "o5MA/WIyttlY9ptvCAXvODKSSa3qZVhtAJigoXclKAnK0gViu3WN4c7DuCqhOJwZoqjXqbFVVj+098DvxX9F0w=="
},
"appveyor.yml": {
"appveyor": "gMJuEmNLwhwLK+fSMvZ9liCte9/PcxVkx7NJQnBZTCDjfduaaczExmUOUf3j1ZEdkrYG+hJC5Chz3LIqL8LUfA=="
"appveyor": "5/T0A4182n2Zha7QLgdW4PRGtORCAuPwTw7Fb/sm/DgSRrWuco2aqUpuCV9j9wlmGZ5CM/dnT1zw+Lxn1Iv7Lg=="
},
"appveyor_scripts.ps1": {
"appveyor": "HdiTMjGtis8VNyHfwqGBOjaDQZajmxcqAtNYMzKycmWHGjUpEEXIwvb1/ZCqiY9tDAh39PX+sf7tG4zTJ+0MXw=="
Expand All @@ -43,7 +43,7 @@
},
"conda/meta.yaml": {
"conda.about": "6/RoaDh45Wwcc0uAhKGnUH46mczqPBQq/PV0cSCbe+fhiDQPOooOK8u24GzswyAcXIEHoASc/XIe+WS/2zBl5A==",
"conda.package": "Qtf4zDJqnVtWEE+zC/Im3HaGZFuoGDgMQ+G8Fu2Oe3ILaj8gaYJKxGbYdrhUhowxoUrPFLWz7lEhIy/3i22SUw==",
"conda.package": "1rOL1wZ7qo0dj4c36MFrSiEEKJmPmilqLFhZLJi3vRmgFPCLFnU48iwxRSHdmUqsk72hxdLPHQfbLTRuEdpdNg==",
"conda.req_build": "STnNeGQNdKNtp0ZDkfZ9RqPnmFYfv1p31EavfN1V6ogusq9KBD+sFzDaFK8r9xu+pqXupiyeBc1T/MIqJWYXJg==",
"conda.req_run": "IFJIX6NLBagkPhLDSOvcHHj/XiggVhFfvIRKy/vGjLnBm8TsaqXFdb8wX1l/l4GJaGjfNUA3+MOT+tGumt8uPw==",
"conda.src": "Lzbp176AVU0YantZQxB4LsR2jbxpZ/OlkvY2V4aWAEuzKEarh872uc1eRvsIYf/FsbxvcmUI84AezWlA72nI6A=="
Expand All @@ -63,7 +63,7 @@
"doc/_static/nonempty.txt": {},
"doc/authors.rst": {},
"doc/conf.py": {
"sphinx": "7DpxFo8ON3/j6SJ11AKi7Gil1jozWX5fMu0fjNKxa0tc64pXl8jLNiHZGs+7f4lWrEAj1YkOyCd4LdhbDudmWQ=="
"sphinx": "Xa4ToGyN/IWuXtFleaXLcLNNon1j1Wtkv9pkBs5GMCh2OsG+jyPqH7DzdREXSt2uqgcccJLl3WErc1gambLn2g=="
},
"doc/contributing.rst": {},
"doc/history.rst": {},
Expand Down Expand Up @@ -98,7 +98,7 @@
},
"setup.py": {
"pysetup.call": "t30iIuCMd/sWxStR2XNYb8bCBgwanhKt8YYn2VKACyAqL5cKFRUWpVRIpAR+uxXUZ9PYYy2csMmECcONnRZE8w==",
"pysetup.kwds": "3iVOFCp6jkawaniEpfKcdvik2XDSvYdRfOXJEA/R93s4fY10XtmtgsBlFsJNAtH/vR1vXednDmmiZUpv8yVBTw=="
"pysetup.kwds": "nUVr6R2oDDGws3W1COQFL8b4Kg0hRFb/jq8VAbeiSYw1rDqwzDp+Dl8CntCLqAH3P+TggEHD+nUbnH3H+/S5aQ=="
},
"src/pkglts/__init__.py": {
"base": "+GVGxVjJGifAp8dAR9V2W3aVPe7/D53bN7r0O5VxO9OUqG4vnGTZvnORu1objjjIwm86DgemQd7ax/IJpRa8Wg=="
Expand All @@ -107,7 +107,7 @@
"data": "wwgLuV/OqHWjWbssvDHa4LNg+7C+tuNiKHOxkO+9UAl9opI/HfPyJAq2fPhUeTmVvb/E6MkqDJIli9m8n5/V0Q=="
},
"src/pkglts/version.py": {
"version": "g+d3FedzxKeremXck5ZoauRBz+WOyl7kCzEoaeeUc9Rx42bhWJn91C4x6mLHaZgy9GR82+9+jBVI+0zybryGxQ=="
"version": "ZPhlzlhWL6+wUrL5DDgrenpFDk/PMAYE85DByAgWhLsthZIgsGddPO18HE/AKs1zHV7KbEmAOyj192wgdAqO7A=="
},
"src/pkglts_data/__init__.py": {},
"test/__init__.py": {},
Expand Down
26 changes: 8 additions & 18 deletions appveyor.yml
Expand Up @@ -9,35 +9,25 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C"

matrix:
- PYTHON: "C:\\Python36_64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
CONDA_PY: "36"
CONDA_NPY: "113"
- CONDA: "C:\\Miniconda3-x64\\Scripts"

install:
# this installs Miniconda
- curl https://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe -o miniconda.exe
- miniconda.exe /AddToPath=1 /InstallationType=JustMe /RegisterPython=0 /S /D=%HOMEDRIVE%\Miniconda
- del miniconda.exe
- "set PATH=%HOMEDRIVE%\\Miniconda;%HOMEDRIVE%\\Miniconda\\Scripts;%PATH%"
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- "%CONDA%\\conda config --set always_yes yes --set changeps1 no"
# useful for debugging any issues with conda
- conda info -a
- "%CONDA%\\conda info -a"
# create environment
- conda create -n ci python
- activate ci
- "%CONDA%\\conda create -n ci python"
- "%CONDA%\\activate ci"

build: false

build_script:
# install dependencies
- conda install -c conda-forge coverage coveralls flake8 jinja2 pytest pytest-cov pytest-mock requests semver sphinx sphinx_rtd_theme tox twine unidecode
- "%CONDA%\\conda install -c conda-forge coverage coveralls flake8 jinja2 pytest pytest-cov pytest-mock requests semver sphinx sphinx_rtd_theme tox twine unidecode"


# install package
- python setup.py install
- pip install .
# test
- pytest
- pytest --cov=pkglts
# #}
2 changes: 1 addition & 1 deletion conda/meta.yaml
@@ -1,7 +1,7 @@
# {# pkglts, conda.package
package:
name: pkglts
version: "4.6.0"
version: "4.6.1"
# #}

# {# pkglts, conda.src
Expand Down
4 changes: 2 additions & 2 deletions doc/conf.py
Expand Up @@ -95,9 +95,9 @@
#

# The short X.Y version.
version = "4.6.0"
version = "4.6.1"
# The full version, including alpha/beta/rc tags.
release = "4.6.0"
release = "4.6.1"


# The language for content autogenerated by Sphinx. Refer to documentation
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -34,7 +34,7 @@

setup_kwds = dict(
name='pkglts',
version="4.6.0",
version="4.6.1",
description=short_descr,
long_description=readme + '\n\n' + history,
author="revesansparole",
Expand Down
26 changes: 8 additions & 18 deletions src/pkglts/option/appveyor/resource/appveyor.yml
Expand Up @@ -9,39 +9,29 @@ environment:
CMD_IN_ENV: "cmd /E:ON /V:ON /C"

matrix:
- PYTHON: "C:\\Python36_64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"
CONDA_PY: "36"
CONDA_NPY: "113"
- CONDA: "C:\\Miniconda3-x64\\Scripts"

install:
# this installs Miniconda
- curl https://repo.continuum.io/miniconda/Miniconda3-latest-Windows-x86_64.exe -o miniconda.exe
- miniconda.exe /AddToPath=1 /InstallationType=JustMe /RegisterPython=0 /S /D=%HOMEDRIVE%\Miniconda
- del miniconda.exe
- "set PATH=%HOMEDRIVE%\\Miniconda;%HOMEDRIVE%\\Miniconda\\Scripts;%PATH%"
- conda config --set always_yes yes --set changeps1 no
- conda update -q conda
- "%CONDA%\\conda config --set always_yes yes --set changeps1 no"
# useful for debugging any issues with conda
- conda info -a
- "%CONDA%\\conda info -a"
# create environment
- conda create -n ci python
- activate ci
- "%CONDA%\\conda create -n ci python"
- "%CONDA%\\activate ci"

build: false

build_script:
# install dependencies
{% if pysetup.conda_reqs(['install', 'test', 'doc', 'dvlpt']) != "" -%}
- {{ pysetup.conda_reqs(['install', 'test', 'doc', 'dvlpt']) }}
- "%CONDA%\\{{ pysetup.conda_reqs(['install', 'test', 'doc', 'dvlpt']) }}"
{%- endif %}
{% if pysetup.pip_reqs(['install', 'test', 'doc', 'dvlpt']) != "" -%}
- {{ pysetup.pip_reqs(['install', 'test', 'doc', 'dvlpt']) }}
{%- endif %}

# install package
- python setup.py install
- pip install .
# test
- pytest
- pytest --cov={{ base.pkg_full_name }}
# #}
2 changes: 1 addition & 1 deletion src/pkglts/version.py
Expand Up @@ -10,7 +10,7 @@
MINOR = 6
"""(int) Version minor component."""

POST = 0
POST = 1
"""(int) Version post or bugfix component."""

__version__ = ".".join([str(s) for s in (MAJOR, MINOR, POST)])
Expand Down

0 comments on commit aa0dd02

Please sign in to comment.