Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
barseghyanartur committed Jun 18, 2023
2 parents 40ad6f0 + 11a7d8c commit a66a560
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
"filename": "src/faker_file/tests/test_sftp_storage.py",
"hashed_secret": "a4b48a81cdab1e1a5dd37907d6c85ca1c61ddc7c",
"is_verified": true,
"line_number": 272
"line_number": 252
}
],
"src/faker_file/tests/test_storages.py": [
Expand All @@ -176,5 +176,5 @@
}
]
},
"generated_at": "2023-06-16T21:12:08Z"
"generated_at": "2023-06-17T20:04:53Z"
}
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ are used for versioning (schema follows below):
0.3.4 to 0.4).
- All backwards incompatible changes are mentioned in this document.

0.15.5
------
2023-06-18

- Minor fixes and documentation improvements.

0.15.4
------
2023-06-15
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from setuptools import find_packages, setup

version = "0.15.4"
version = "0.15.5"

try:
readme = open(os.path.join(os.path.dirname(__file__), "README.rst")).read()
Expand Down
2 changes: 1 addition & 1 deletion src/faker_file/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__title__ = "faker_file"
__version__ = "0.15.4"
__version__ = "0.15.5"
__author__ = "Artur Barseghyan <artur.barseghyan@gmail.com>"
__copyright__ = "2022-2023 Artur Barseghyan"
__license__ = "MIT"
20 changes: 0 additions & 20 deletions src/faker_file/tests/test_sftp_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,26 +44,6 @@ class TestSFTPStorageTestCase(unittest.TestCase):
sftp_pass: str = SFTP_PASS
sftp_root_path: str = SFTP_ROOT_PATH

# @classmethod
# def setUpClass(cls):
# os.makedirs(
# os.path.join(tempfile.gettempdir(), "upload", "sub"),
# exist_ok=True,
# )
# # Start the server in a separate thread
# cls.server_manager = SFTPServerManager()
# cls.server_thread = threading.Thread(target=cls.server_manager.start)
# # Daemonize the thread, so it exits when the main thread exits
# cls.server_thread.daemon = True
# cls.server_thread.start()
# time.sleep(2)
#
# @classmethod
# def tearDownClass(cls):
# # Stop the server when tests are done
# cls.server_manager.stop()
# cls.server_thread.join() # Wait for the server thread to finish

@staticmethod
def is_port_in_use(host: str, port: int) -> bool:
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
Expand Down

0 comments on commit a66a560

Please sign in to comment.