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.

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

Modernize giftless #125

Merged
merged 20 commits into from
Dec 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [ "3.7", "3.8", "3.9", "3.10" ]
python-version: [ "3.10", "3.11", "3.12" ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install Python 3
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Set up the test environment
Expand All @@ -27,6 +27,6 @@ jobs:
run: |
make test PYTEST_EXTRA_ARGS="--cov=giftless"
coverage xml
- uses: paambaati/codeclimate-action@v2.7.4
- uses: paambaati/codeclimate-action@v5
env:
CC_TEST_REPORTER_ID: cca5a6743728de037cb47d4a845e35c682b4469c0f9c52851f4f3824dd471f87
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
/.coverage
/.make-cache
/.tox
/.DS_Store
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### --- Build Depdendencies ---

FROM python:3.7 as builder
FROM python:3.10 as builder
MAINTAINER "Shahar Evron <shahar.evron@datopian.com>"

# Build wheels for uWSGI and all requirements
Expand All @@ -11,15 +11,15 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
RUN pip install -U pip
RUN mkdir /wheels

ARG UWSGI_VERSION=2.0.18
ARG UWSGI_VERSION=2.0.23
RUN pip wheel -w /wheels uwsgi==$UWSGI_VERSION

COPY requirements.txt /
RUN pip wheel -w /wheels -r /requirements.txt

### --- Build Final Image ---

FROM python:3.7-slim
FROM python:3.10-slim

RUN DEBIAN_FRONTEND=noninteractive apt-get update \
&& apt-get install -y libpcre3 libxml2 tini \
Expand Down
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ docs-html:
.PHONY: test docker release dist distclean requirements docs-html

requirements.txt: requirements.in
@if [ "$(PYVER)" != "37" ]; then \
echo "Run pip-compile under Python 3.7. See requirements.in"; exit 1; \
fi
$(PIP_COMPILE) --no-emit-index-url -o requirements.txt requirements.in

dev-requirements.txt: dev-requirements.in requirements.txt
Expand Down
3 changes: 2 additions & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
0.5.0
0.6.0

7 changes: 6 additions & 1 deletion dev-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,24 @@

pip-tools
tox
flake8
pytest
pytest-flake8
pytest-isort
pytest-mypy
pytest-env
pytest-cov
pytest-vcr

pytz
types-pytz
types-jwt
types-python-dateutil
types-PyYAML

boto3-stubs
botocore-stubs
google-auth-stubs

# Documentation Requirements
recommonmark
furo
Expand Down
Loading