Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ssl #176

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Ssl #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
206f8af
[aiohttp] use ssl_fallback_aiohttp_client_session
GuillaumeDSM Apr 18, 2024
570070a
[Version] v2.9.11
GuillaumeDSM Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.9.11] - 2023-02-18
### Fixed
- SSL certificate issues

## [2.9.10] - 2023-02-13
### Added
- API: register_extra_tentacle_data
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OctoBot-Tentacles-Manager [2.9.10](https://github.com/Drakkar-Software/OctoBot-Tentacles-Manager/tree/master/CHANGELOG.md)
# OctoBot-Tentacles-Manager [2.9.11](https://github.com/Drakkar-Software/OctoBot-Tentacles-Manager/tree/master/CHANGELOG.md)
[![PyPI](https://img.shields.io/pypi/v/OctoBot-Tentacles-Manager.svg)](https://pypi.python.org/pypi/OctoBot-Tentacles-Manager/)
[![Downloads](https://pepy.tech/badge/OctoBot-Tentacles-Manager/month)](https://pepy.tech/project/OctoBot-Tentacles-Manager)
[![Github-Action-CI](https://github.com/Drakkar-Software/OctoBot-Tentacles-Manager/workflows/OctoBot-Tentacles-Manager-CI/badge.svg)](https://github.com/Drakkar-Software/OctoBot-Tentacles-Manager/actions)
Expand Down
2 changes: 1 addition & 1 deletion octobot_tentacles_manager/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# You should have received a copy of the GNU Lesser General Public
# License along with this library.

VERSION = "2.9.10"
VERSION = "2.9.11"
PROJECT_NAME = "OctoBot-Tentacles-Manager"
7 changes: 5 additions & 2 deletions octobot_tentacles_manager/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
import argparse
import asyncio

import aiohttp
import octobot_commons.logging as logging
import octobot_commons.aiohttp_util as aiohttp_util
import octobot_commons.constants as commons_constants
import sys

import octobot_tentacles_manager
Expand All @@ -42,7 +43,9 @@ async def _handle_package_manager_command(starting_args,
cythonize) -> int:
error_count = 0
LOGGER = logging.get_logger(f"{octobot_tentacles_manager.PROJECT_NAME}-CLI")
async with aiohttp.ClientSession() as aiohttp_session:
async with aiohttp_util.ssl_fallback_aiohttp_client_session(
commons_constants.KNOWN_POTENTIALLY_SSL_FAILED_REQUIRED_URL
) as aiohttp_session:
include_dev_mode = starting_args.include_dev_mode
include_tentacles_export = starting_args.include_tentacles_export
should_use_package_name_when_exporting = starting_args.export_with_package_name
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ setuptools
cython==0.29.32

# Drakkar-Software requirements
OctoBot-Commons>=1.9.39, <1.10
OctoBot-Commons>=1.9.44, <1.10

# async files management
aiofiles>=0.6.0, <0.7

# async http requests
aiohttp>=3.8.1
aiohttp>=3.9.5

# Templating requirements
jinja2>=3.0.3
Expand Down
Loading