Skip to content

Commit 866a90c

Browse files
committed
Merge branch 'release_0.4.0-beta.2' into dev
2 parents c20d0f0 + 1c3c2cd commit 866a90c

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/MajorcaDevs/mdbackup.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MajorcaDevs/mdbackup/context:python)
44
[![Total alerts](https://img.shields.io/lgtm/alerts/g/MajorcaDevs/mdbackup.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MajorcaDevs/mdbackup/alerts/)
5+
[![Build Status](https://jenkins.majorcadevs.com/buildStatus/icon?job=mdbackup2%2Fmaster&subject=master%20build)](https://jenkins.majorcadevs.com/job/mdbackup2/job/master/)
6+
[![Build Status](https://jenkins.majorcadevs.com/buildStatus/icon?job=mdbackup2%2Fdev&subject=dev%20build)](https://jenkins.majorcadevs.com/job/mdbackup2/job/dev/)
57

68
Small but customizable utility to create backups and store them in cloud storage providers.
79

@@ -12,9 +14,7 @@ Download from releases the latest `wheel` package and install it. It is recommen
1214
**What do yo need?**:
1315

1416
- An OS different from Windows (Windows is unsupported) :(
15-
- Python 3.6 or higher
16-
- `rsync` and `ssh` installed (on macOS they are in general installed by default, on Linux distros you may need to install them)
17-
- `bash` must be installed, used to run the scripts
17+
- Python 3.7 or higher
1818

1919
First select a folder where all the needed files will be stored. It is important not to move (or rename) this folder after installation.
2020

@@ -34,12 +34,12 @@ pip install --upgrade setuptools wheel
3434
pip install mdbackup*.whl
3535
```
3636

37-
Now you can run the utility (only if you have enabled the virtual env) with `mdbackup`. In this folder it is recommended to store the `config` and `steps` folders.
37+
Now you can run the utility (only if you have enabled the virtual env) with `mdbackup`. In this folder it is recommended to store the `config` folder.
3838

3939
> **Note:** to be able to use some of the cloud storage and secrets backends, you will be requested to install some packages. Go to the documentation to see what is needed.
4040
4141
## Documentation
4242

43-
Can be found at docs folder.
43+
Can be found at [mdbackup.majorcadevs.com](https://mdbackup.majorcadevs.com/) or at the docs folder.
4444

4545
To make the documentation, install the requirements in `docs/requirements.txt` and run `mkdocs build --config-file=mkdocs.yaml`.

mdbackup/actions/builtin/_os_utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
from pathlib import Path
44
from threading import Thread
55

6-
import xattr
6+
try:
7+
import xattr
8+
except ImportError:
9+
xattr = None
10+
711

812
# Portable way to access to these xattr function across linux, macOS, freebsd...
913
_python_has_xattr_lib = hasattr(os, 'listxattr') and hasattr(os, 'getxattr') and hasattr(os, 'setxattr')

setup.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1+
import sys
2+
13
import setuptools
24

35
with open("README.md", "r") as fh:
46
long_description = fh.read()
57

8+
extra_packages = []
9+
if not sys.platform.startswith('linux'):
10+
extra_packages.append('xattr')
11+
612
setuptools.setup(
713
name="mdbackup",
8-
version="0.4.0-beta.1",
14+
version="0.4.0-beta.2",
915
author="majorcadevs (melchor9000 & amgxv)",
1016
author_email="melchor9000@gmail.com",
1117
description="Small but customizable utility to create backups and store them in cloud storage providers",
@@ -33,7 +39,7 @@
3339
include_package_data=True,
3440
install_requires=[
3541
'pyyaml',
36-
'xattr',
3742
'jsonschema',
43+
*extra_packages,
3844
],
3945
)

0 commit comments

Comments
 (0)