Skip to content
Open
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
11 changes: 5 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@
# understand and accept it fully.

language: python
matrix:
jobs:
include:
- python: 3.5
env: TOXENV=py35
- python: 3.6
env: TOXENV=py36
- python: 3.7
env: TOXENV=py37
- python: 3.8
env: TOXENV=py38
- python: 3.9
env: TOXENV=py39
- os: linux
language: python
sudo: required
python: 3.7
env: TOXENV=regression

Expand All @@ -35,7 +34,7 @@ matrix:
fast_finish: true

# command to install dependencies
before-install:
before_install:
- if [ "$TOXENV" = "regression" ]; then sudo apt-get -qq update && sudo apt-get install -y clang autoconf cmake libtool; fi

install:
Expand All @@ -47,7 +46,7 @@ script:

deploy:
provider: pypi
user: "docwriter-deploy"
username: "docwriter-deploy"
distributions: "sdist bdist_wheel"
password:
secure: "tNCnC+AbuVfxzaKcyWODPXB0p+/QnYCe0BMdYOTgr44w4tTHLmV2xN7gAsDqEZyARUi9g/XlJdBNLn/nIgo4XRttk8zE0ago2bHpXNkuMwxoOWtENidlUm7a0jd82+lpS3x0T7afJhPyOL9LwnikUej+izvg9GfJM0rKFF4ND8daksOesOoyJD2W+B4Az2puNUrId7SO21K8ocZ9b3hRJTUbmmO2GSaZ4SUTtbnwGghVkzYZ7045Ut64Zzion+8vgpDz6nkbsZH89cjoR5upVGCsDrad4CA/kO/x1wbVAb118mYhWLg3/Nxls9x5QGDOYamdZyPzliNqaqzrHTJHEzvClR6cLMpzICcge969J9mz8g2uXI0RUWJso1MSVYBh31tBfMRKk8+WtLFm2cGq/nrCct7++35Hlpvd242YRxJyV062k4ay2PZdtX66HA1lDk5PCujLBpES9H8bTIc4KeX0naK8UWr5NnV7r2NKvogZouUvd03nD73cripnub/9Tbv2KkXoe55QVOuC51p+mECMzfPsTWXp4PhRfv3hQLHyR0IPOL//spq4gkT+10CYuMwii7tNm8ppuNc/2n+W9imYbg7SHdUUNeIqy1F+fOB1rfKNR5GcGj5tXrHN7qydsMZzl3BYQ8F02Ti79wibs8QlocCOwh4SwT4ZEKMFua0="
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Python >= 3.5 to run.
1. Ensure `docwriter` is installed using `pip`.

2. Clone the freetype2 repository from
[here](http://git.savannah.gnu.org/cgit/freetype/freetype2.git/).
[here](https://gitlab.freedesktop.org/freetype/freetype.git).

3. The FreeType build system can be used to generate the docs:

Expand All @@ -28,12 +28,12 @@ Python >= 3.5 to run.
4. Alternatively, step 1 and the make target can be replaced with `make refdoc-venv`. This installs
all requirements automatically in a separate virtual environment. More information on
`virtualenv` usage can be found
[here](http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/README).
[here](https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/docs/README).

## Development Usage
1. Clone this repository.
2. Clone the freetype2 repository from
[here](http://git.savannah.gnu.org/cgit/freetype/freetype2.git/).
[here](https://gitlab.freedesktop.org/freetype/freetype.git).
3. Run `pip install -r requirements.txt` in your environment (`virtualenv` recommended).
4. Copy the `include/` directory from `freetype2` to `docwriter`.
5. Run in the `docwriter` directory:
Expand Down Expand Up @@ -103,7 +103,7 @@ More information on running specific tox environments can be found
### Regression Tests

Regression tests require internet access, `git`, and other FreeType [build
dependencies](http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/README.git), and are
dependencies](https://gitlab.freedesktop.org/freetype/freetype/-/blob/master/README.git), and are
time-consuming. These tests are largely meant to run on Travis CI, but can also be run locally:

```bash
Expand Down
6 changes: 0 additions & 6 deletions docs/markdown/stylesheets/extra.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
/* Body and page */
.wy-nav-content {
max-width: 90%;
}
.md-grid {
max-width: 90%;
}
.md-sidebar--secondary {
margin-left: 90%;
}
p {
text-align: justify;
}
Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

# Direct project dependencies
mistune==0.8.4
mkdocs==1.1
mkdocs-material==4.6.3
PyYAML==5.3.1
mkdocs==1.1.2
mkdocs-material==7.0.6
PyYAML==5.4.1
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
install_requires = install_requires,
python_requires='>=3.5',
classifiers=[
'Development Status :: 4 - Beta',
'Development Status :: 5 - Production/Stable',
'Environment :: Console',
'Intended Audience :: Developers',
'Operating System :: OS Independent',
Expand Down
4 changes: 2 additions & 2 deletions tests/freetype.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ build_dir="freetype2.compile"

cd "$output_dir" # go to `tests/output'

# Clone the latest version of FreeType
git clone https://git.savannah.gnu.org/git/freetype/freetype2.git $freetype_dir
# Clone FreeType from master
git clone --depth=50 --branch=master https://gitlab.freedesktop.org/freetype/freetype.git $freetype_dir

cd "$freetype_dir"

Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py35, py36, py37, py38
py36, py37, py38, py39

[testenv]
deps =
Expand Down