Skip to content

Commit

Permalink
Merge branch 'issue-15'
Browse files Browse the repository at this point in the history
Closes #15
  • Loading branch information
bneijt committed Nov 23, 2019
2 parents fd669d3 + f571e25 commit 72d87b4
Show file tree
Hide file tree
Showing 14 changed files with 691 additions and 183 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
/virtualenv
/doc/autotrash.1
*.pyc
/.idea
.eggs
*.egg-info
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ language: python

python:
- "3.5"
- "3.7"

install:
- pip install .
- pipenv update --dev

script:
- nosetests
- pytest
- autotrash --help

3 changes: 3 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[packages]
autotrash = {path = ".",editable = true,extras = ["testing"]}
twine = "*"
317 changes: 317 additions & 0 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Add the program with the "+ Add" button.

This will make sure that your trash is cleaned up every time you log in.

Homepage: http://www.logfish.net/pr/autotrash/
Homepage: https://github.com/bneijt/autotrash

Autotrash is now in the stable repo for Fedora 20 and is going to be synced out on the mirrors also for Fedora 21.
Epel7 package is still in the testing repo but should go stable within few days.
Expand Down
11 changes: 0 additions & 11 deletions bootstrap.sh

This file was deleted.

Loading

0 comments on commit 72d87b4

Please sign in to comment.