Skip to content
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
18 changes: 8 additions & 10 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,29 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13-dev']
python: ['3.10', '3.11', '3.12', '3.13', '3.14', '3.15-dev']
os: [ubuntu-latest, windows-latest, macos-latest]
tox_env: ["py,codecov"]
include:
- python: '3.12'
- python: '3.14'
os: ubuntu-latest
tox_env: 'check'
- python: '3.12'
tox_env: 'lint'
- python: '3.14'
os: ubuntu-latest
tox_env: 'docs'
- python: '3.12'
- python: '3.14'
os: ubuntu-latest
tox_env: 'build'
exclude:
# macos-14 AKA macos-latest has switched to being an ARM runner, only supporting newer versions of Python
# https://github.com/actions/setup-python/issues/825#issuecomment-2096792396
- python: '3.8'
os: macos-latest
- python: '3.9'
os: macos-latest
- python: '3.10'
os: macos-latest

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
submodules: recursive
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
Expand All @@ -65,6 +60,9 @@ jobs:
pip --version
tox --version
pip list --format=freeze
- name: Enable git long paths (Windows)
if: runner.os == 'Windows'
run: git config --global core.longpaths true
- name: test
run: |
mkdir -p ~/.ssh
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

68 changes: 0 additions & 68 deletions .travis.yml

This file was deleted.

1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
graft docs
graft examples
graft src
graft tests

Expand Down
31 changes: 9 additions & 22 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Overview

.. end-badges

Script to generate Dockerfile from .travis.yml file
Script to generate a development Dockerfile from the deployv image of a repository (based on its ``variables.sh`` file)

* Free software: BSD license

Expand Down Expand Up @@ -81,19 +81,19 @@ Example:
`travisfile2dockerfile --root-path=$HOME/t2d git@github.com:Vauxoo/forecast.git 8.0`

The output is:
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1`
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/2`

The first one is the build for env `TESTS=1`, the second one is for env with `LINT_CHECK=1`
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0`

To build image:
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/10-build.sh`
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/10-build.sh`

To create container:
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/1/20-run.sh --entrypoint=bash`
`${HOME}/t2d/script/git_github.com_Vauxoo_forecast.git/8.0/20-run.sh --entrypoint=bash`

To run the test (into of container):
`/entrypoint.sh`
The repository needs a ``variables.sh`` file in its root path (the one used by
the deployv images built from the CI). By default the docker image is built
from its values as ``DOCKER_IMAGE_REPO:MAIN_APP-VERSION-SHA_SHORT``; use
``--docker-image=quay.io/vauxoo/PROJECT:TAG`` to pick the image pushed by the
``build_docker`` pipeline instead.

Optional tools (``--build-env-args``)
=====================================
Expand Down Expand Up @@ -152,19 +152,6 @@ Dockerfile doesn't support a prompt to enter your password, so you need to remov
openssl rsa -in ${fname} -out ${fname}_without_pwd
cp ${fname}_without_pwd ${fname}

Download the big image
**********************

Travis2docker uses a default image with many packages pre-installed.

`docker pull vauxoo/odoo-80-image-shippable-auto`

Note: You can define a custom image to use with `--docker-image` parameter.

For example if you want use the original image of travis you can add the following parameters:

`--docker-image=quay.io/travisci/travis-python --docker-user=travis`

Install docker
**************

Expand Down
22 changes: 0 additions & 22 deletions examples/example_1.yml

This file was deleted.

30 changes: 0 additions & 30 deletions examples/example_2.yml

This file was deleted.

37 changes: 0 additions & 37 deletions examples/example_3.yml

This file was deleted.

41 changes: 0 additions & 41 deletions examples/example_4.yml

This file was deleted.

42 changes: 0 additions & 42 deletions examples/example_5.yml

This file was deleted.

5 changes: 1 addition & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
PyYAML==3.12 ; python_version < '3.7'
PyYAML==6.0.* ; python_version >= '3.7'
Jinja2==2.11.3; python_version < '3.7'
Jinja2==3.1.*; python_version >= '3.7'
Jinja2==3.1.*
3 changes: 0 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[bdist_wheel]
universal = 1

[flake8]
max-line-length = 140
exclude = tests/*,*/migrations/*,*/south_migrations/*
Expand Down
Loading
Loading