Skip to content

Commit

Permalink
Merge pull request #22 from DazEdword/feat/script-cleanup-deps-upgrade
Browse files Browse the repository at this point in the history
Feat/script cleanup deps upgrade
  • Loading branch information
DazEdword authored Jul 31, 2024
2 parents 905d78f + cab5235 commit db03eea
Show file tree
Hide file tree
Showing 20 changed files with 997 additions and 649 deletions.
3 changes: 1 addition & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[bumpversion]
current_version = 0.5.3
current_version = 0.6.0
commit = True
tag = True

[bumpversion:file:setup.py]

1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.12.3
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

20 changes: 20 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.PHONY: permissions
permissions:
find . -type f -iname "*.sh" -exec chmod +x {} \;
find docker/scripts/ -type f -exec chmod +x {} \;

.PHONY: test/unit
test/unit:
docker-compose build tests
docker-compose run --rm tests docker/scripts/tests

.PHONY: test/scripts
test/scripts:
docker-compose build tests
docker-compose run --rm tests docker/scripts/scripts-tests

.PHONY: test/integration
test/integration:
docker-compose build tests
docker-compose run --rm tests docker/scripts/integration-tests

2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ python-dotenv = "*"
python-synology = "*"

[requires]
python_version = "3.6"
python_version = "3.12.3"

[pipenv]
allow_prereleases = true
1,555 changes: 968 additions & 587 deletions Pipfile.lock

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
[![Build Status](https://travis-ci.org/DazEdword/synology-toolset.svg?branch=master)](https://travis-ci.org/DazEdword/synology-toolset.svg)
[![Coverage Status](https://coveralls.io/repos/github/DazEdword/synology-toolset/badge.svg?branch=master)](https://coveralls.io/github/DazEdword/synology-toolset?branch=master)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)


Expand Down Expand Up @@ -155,9 +153,7 @@ git clone git@github.com:DazEdword/synology-toolset.git
3- Ensure all scripts are executable.

```
cd </path/to/project/root>
find . -type f -iname "*.sh" -exec chmod +x {} \;
find docker/scripts/ -type f -exec chmod +x {} \;
make permissions
```

### Running tests
Expand All @@ -166,17 +162,17 @@ Several Docker scripts have been set up to unambiguously run a subset of tests,

```bash
# Unit tests
./tests.docker
make test/unit
```

```bash
# Scripts tests (bash unit tests)
./tests-scripts.docker
make test/scripts
```

```bash
# Integration tests
./integration-tests.docker
make test/integration
```

Alternatively, a virtual environment could be created and all dependencies installed via scripts, allowing for richer test runs as covered in [pytest's documentation](https://docs.pytest.org/en/latest/).
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.6
FROM python:3.12

ENV PYTHONPATH="$PYTHONPATH:/app"

Expand Down
Empty file modified docker/scripts/deploy
100644 → 100755
Empty file.
Empty file modified docker/scripts/install
100644 → 100755
Empty file.
Empty file modified docker/scripts/linting
100644 → 100755
Empty file.
Empty file modified docker/scripts/scripts-tests
100644 → 100755
Empty file.
Empty file modified docker/scripts/travis-tests
100644 → 100755
Empty file.
8 changes: 0 additions & 8 deletions integration-tests.docker

This file was deleted.

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="synotools",
version="0.5.3",
version="0.6.0",
author="Ed Garabito",
author_email="eduardo@gottabegarabi.com",
description="A Python API wrapper and toolset to interact with Synology NAS devices.",
Expand Down
Empty file modified synotools/scripts/deluge-download.sh
100644 → 100755
Empty file.
Empty file modified synotools/scripts/vpn-check-connection.sh
100644 → 100755
Empty file.
Empty file modified synotools/scripts/vpn-connect.sh
100644 → 100755
Empty file.
7 changes: 0 additions & 7 deletions tests-scripts.docker

This file was deleted.

7 changes: 0 additions & 7 deletions tests.docker

This file was deleted.

0 comments on commit db03eea

Please sign in to comment.