Skip to content

Commit

Permalink
Merge pull request #110 from jacebrowning/psutil-4
Browse files Browse the repository at this point in the history
Upgrade psutil to 4.4
  • Loading branch information
jacebrowning committed Apr 16, 2023
2 parents dc77961 + 84bae77 commit 5708223
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 52 deletions.
54 changes: 30 additions & 24 deletions CHANGELOG.md
@@ -1,101 +1,107 @@
# 3.0 (2023-04-15)
# Release Notes

## 3.0.1 (2023-04-16)

- Updated dependencies.

## 3.0 (2023-04-15)

- Dropped support for Python 3.7.
- Updated computer matching to prefer exact matches over partials.

# 2.0 (2022-08-16)
## 2.0 (2022-08-16)

- Dropped support for Python 3.6.

# 1.8 (2020-05-16)
## 1.8 (2020-05-16)

- Added a delay to the daemon to wait for files to finish synching.

# 1.7 (2020-02-01)
## 1.7 (2020-02-01)

- Updated search to find common macOS applications before local.

# 1.6.1 (2019-10-14)
## 1.6.1 (2019-10-14)

- Added support for "/System/Applications" in macOS Catalina.

# 1.6 (2019-05-20)
## 1.6 (2019-05-20)

- Ignored conflicting program name ("garcon.appex").

# 1.5 (2017-10-22)
## 1.5 (2017-10-22)

- Ignored conflicting program name ("slack helper.app").

# 1.4 (2017-04-18)
## 1.4 (2017-04-18)

- Added color to display the state of running applications.
- Dropped support for Python 3.3, 3.4, and 3.5.

# 1.3 (2017-03-13)
## 1.3 (2017-03-13)

- Ignored conflicting program name ("iTunes Helper.app").

# 1.2 (2017-02-13)
## 1.2 (2017-02-13)

- Restart Dropbox automatically.

# 1.1 (2017-01-07)
## 1.1 (2017-01-07)

- Updated `switch` to close all locally running applications.

# 1.0 (2016-11-01)
## 1.0 (2016-11-01)

- Initial stable release.

# 0.6.1 (2016-09-23)
## 0.6.1 (2016-09-23)

- Added a delay to ensure all applications close.
- Fixed cleanup of unused applications and computers.

# 0.6 (2016-07-02)
## 0.6 (2016-07-02)

- Added a `close` command to close all locally running applications.

# 0.5 (2016-05-16)
## 0.5 (2016-05-16)

- Added periodic checking to the daemon (regardless of file changes).

# 0.4.3 (2016-05-11)
## 0.4.3 (2016-05-11)

- Fixed `__init__` warnings with YORM v0.8.1.

# 0.4.2 (2016-03-30)
## 0.4.2 (2016-03-30)

- Updated to YORM v0.7.2.

# 0.4.1 (2016-02-23)
## 0.4.1 (2016-02-23)

- Updated to YORM v0.6.

# 0.4 (2015-12-30)
## 0.4 (2015-12-30)

- Added file watching to update program state faster.

# 0.3 (2015-11-14)
## 0.3 (2015-11-14)

- Added automatic daemon restart using `nohup`.
- Moved `queued` to setting `properties.single_instance`.
- Added `properties.auto_queue` to filter active applications.

# 0.2.1 (2015-09-05)
## 0.2.1 (2015-09-05)

- Fixed daemon warning to run using `nohup`

# 0.2 (2015-08-27)
## 0.2 (2015-08-27)

- Added `--daemon` option to run continuously.
- Added `edit` command to launch the settings file.

# 0.1.2 (2015-05-17)
## 0.1.2 (2015-05-17)

- Updated to YORM v0.4.

# 0.1.1 (2015-03-19)
## 0.1.1 (2015-03-19)

- Initial release.
12 changes: 10 additions & 2 deletions mine/__init__.py
@@ -1,7 +1,15 @@
"""Package for mine."""

from pkg_resources import get_distribution
from importlib.metadata import PackageNotFoundError, version

try:
__version__ = version("mine")
except PackageNotFoundError:
__version__ = "(local)"

del PackageNotFoundError
del version

CLI = "mine"
VERSION = "mine v{}".format(get_distribution("mine").version)
VERSION = f"mine v{__version__}"
DESCRIPTION = "Share application state across computers using Dropbox."
2 changes: 1 addition & 1 deletion mine/tests/test_services.py
Expand Up @@ -9,7 +9,7 @@
from mine.tests.conftest import FILES


@pytest.yield_fixture
@pytest.fixture
def tmp_dir(tmpdir):
cwd = os.getcwd()
tmpdir.chdir()
Expand Down
39 changes: 20 additions & 19 deletions poetry.lock

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

12 changes: 6 additions & 6 deletions pyproject.toml
@@ -1,7 +1,7 @@
[tool.poetry]

name = "mine"
version = "3.0"
version = "3.0.1"
description = "Share application state across computers using Dropbox."

license = "MIT"
Expand Down Expand Up @@ -38,11 +38,11 @@ classifiers = [

python = "^3.8"

YORM = "^1.4"
psutil = "^2.2"
YORM = "^1.6"
psutil = "^4.4"
crayons = "~0.1"
minilog = "^2.0"
universal-startfile = "*"
minilog = "^2.1"
universal-startfile = "^0.2"

[tool.poetry.dev-dependencies]

Expand All @@ -63,7 +63,7 @@ pytest = "^7.1"
pytest-describe = "^2.0"
pytest-expecter = "^3.0"
pytest-random = "*"
pytest-cov = "^3.0"
pytest-cov = "^4.0"
freezegun = "*"

# Reports
Expand Down

0 comments on commit 5708223

Please sign in to comment.