Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jmyrberg committed Dec 14, 2020
1 parent 5c14439 commit 90784b3
Show file tree
Hide file tree
Showing 7 changed files with 153 additions and 12 deletions.
143 changes: 143 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,143 @@
# Project-specific
*.code-workspace
.noseids
.vscode/*
data/*
results/*
*.csv
*.xlsx
*.env.*
!*.env.example
.DS_Store
notebooks/*
docs/source/_build/*

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
tag_name: "$RELEASE_VERSION"
cleanup: false
prerelease: true
token:
secure:
api_key:
secure: "7Sexba0rztR+MLSmQu6ed5Abqmy3IiOf6qzetnRtAnk4FUwUtX7TWCI/3UhsCyETTxqgCHTScRaiP5L3+AT0YwFNfz60mquNppOoWRmAWqmq4uyyXHBy9ILUzaafh5bIYhzDKO3uAB3gxznmODrHZLYkGY2ehSvRXpf/paXxkfTtP7jEPALiaJ0Rjs7LnZOnYLM2+vYufqw5nmrZA1Y6S6B6m9GYCLhhv4p9pfPVJd0adnznlAxv64dGsY05DwBdHfO9sJeHbnh4zp741WyvUwhyWB8mR0mfKz9zyVkrY4zLte928Gsmr96WgCyUX1pl1nEUH8jPW8UiYzHcUiVq1gIsRJExA0ofNrfAsoJ0abHwcdwqmtC2LZHQcrAH6bB/BiqDldPPAqO6XjjjGu0N5vlQCHwVpkiH7+PkC/JXhgSYGUDsGWZlfIlDotVVFZv05X7zDcjxnl5VXNseK5k8IWyfjYf128yWh/BeghQ6yS2OVGxQq9kUoQGVFVzRF6mXldsUpm5YtTiyRc57SWxd6SGQ61I6ZjOu5ak5owzG8O9UzXXTK7EQBWUha9uYH0B6bCqJ1eKxym00/iZocPS2S9tMZOE8SDoyYhvJrQgSqE2gq1+THWfh1uW0YTLTi97CnedNK3UhhbKvDb/OrW9y6IgrkXaY8AjGx19PmnMjUMI="
file:
- dist/*.tar.gz
file_glob: true
on:
branch: master
repo: jmyrberg/mknapsack
repo: jmyrberg/aakr
after_success:
- git push --tags
- stage: deploy
Expand All @@ -43,11 +43,11 @@ jobs:
python: '3.8'
deploy:
provider: pypi
username: jmyrberg
username: __token__
distributions: sdist
cleanup: false
password:
secure:
secure: "JOVvbI3UOFT+mfMPoz9qB+mhfmQsV91hiTJzWDZj5/FgtetnpFwp3sP8OPivPH+gZ05VoOM0bJVCUPg4jS9cXieIqTIPavUzXnYFuAB0NR4PC/lJ8xYkitGp0X0ioC5grPFaO2FXGfDUPmjp9INODknW9ktYjQCb/g3c3k9QfaVBSGfJVpKNFIyCsW73Bsa4cZAMyEA5Moo5AbPsQKWy+KPU+QEognVtjilHf9qT0umyZO95dO5EMqO/kuXasfndkTyOpxYlL+XJ96QaB+Jb3whVAY1RFncvybyW6btebEyowk6F+QqX+K6ZaCfjt9CUEWPWbd4SFiasIRvrpvnXT4LKKje7LA2AsHZTuyvnKVyj38gpP+zFrpBdvAkj1N+RaqlVzHWYVBy+YSHZ4wVrGP6rlG6RXzoZHEromAZHZ8fn/HKV0OW1fevOJ0gfnW5u8KPCZQ99KL7WnNReLMyPwu3I7f8r2A3xv3HMHk4m7RqHMxykWLDWG2Wj6w2lhorkEK/kxsxxYQa6tOaxNOUArgj+4JI9alaRP60c3EbIoAmtL77TTwM9L+lK+6BW71FxaqmTnQBxG7Xktp1DrxeOU/CQbkLryyVHumcUAPg01ZeVJO2mOLAE9YsbgATNVmDKjlB1BNKd1aysqidYHOajVYIpIiVf1jKU7s0XauJeZjs="
on:
branch: master
repo: jmyrberg/aakr
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.1dev0
0.0.1dev1
3 changes: 1 addition & 2 deletions aakr/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from ._aakr import AAKR
from ._version import __version__

__all__ = ['AAKR', '__version__']
__all__ = ['AAKR']
2 changes: 1 addition & 1 deletion aakr/_aakr.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import numpy as np

from sklearn.base import BaseEstimator, TransformerMixin
from sklearn.metrics.pairwise import pairwise_distances, pairwise_kernels
from sklearn.metrics.pairwise import pairwise_distances
from sklearn.utils.validation import check_array, check_is_fitted


Expand Down
2 changes: 0 additions & 2 deletions aakr/_version.py

This file was deleted.

3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
pytest>=5.4.2
pytest>=5.4.2
twine==3.2.0

0 comments on commit 90784b3

Please sign in to comment.