Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into test_build_before_push
Browse files Browse the repository at this point in the history
# Conflicts:
#	adabot/circuitpython_bundle.py
  • Loading branch information
FoamyGuy committed Oct 5, 2024
2 parents 1b16665 + e62110a commit eb36053
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- name: Set up Python 3.9
- name: Set up Python 3
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3
- name: Versions
run: |
python3 --version
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,11 @@ jobs:
# Its necessary to do this here, since 'schedule' events cannot (currently)
# be limited (they run on all forks' default branches).
if: startswith(github.repository, 'adafruit/')
services:
redis:
image: redis
ports:
- 6379/tcp
options: --entrypoint redis-server
steps:
- name: Set up Python 3.9
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3
- name: Versions
run: |
python3 --version
Expand All @@ -50,6 +44,5 @@ jobs:
ADABOT_GITHUB_USER: ${{ secrets.ADABOT_GITHUB_USER }}
ADABOT_GITHUB_ACCESS_TOKEN: ${{ secrets.ADABOT_GITHUB_ACCESS_TOKEN }}
RTD_TOKEN: ${{ secrets.RTD_TOKEN }}
REDIS_PORT: ${{ job.services.redis.ports[6379] }}
run: |
python3 -u -m pytest
4 changes: 2 additions & 2 deletions adabot/arduino_libraries.py
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,8 @@ def main(verbosity=1, output_file=None): # pylint: disable=missing-function-doc
run_arduino_lib_checks()
except:
_, exc_val, exc_tb = sys.exc_info()
logger.error("Exception Occurred!", quiet=True)
logger.error(("-" * 60), quiet=True)
logger.error("Exception Occurred!")
logger.error(("-" * 60))
logger.error("Traceback (most recent call last):")
trace = traceback.format_tb(exc_tb)
for line in trace:
Expand Down
4 changes: 3 additions & 1 deletion adabot/github_requests.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ def request(method, url, **kwargs):
_fix_url(url), timeout=TIMEOUT, **_fix_kwargs(kwargs)
)
from_cache = getattr(response, "from_cache", False)
remaining = int(response.headers.get("X-RateLimit-Remaining", 0))
# If rate limit remaining is missing, then assume we're fine. Use a million to signify this
# case. GitHub will be in the single thousands.
remaining = int(response.headers.get("X-RateLimit-Remaining", 1000000))
logging.debug(
"GET %s %s status=%s",
url,
Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ packaging==22.0
pylint==3.2.6
pytest
pyyaml>=5.4.1
redis==4.5.4
requests==2.32.0
sh==1.12.14
requests-cache==0.5.2
Expand Down

0 comments on commit eb36053

Please sign in to comment.