Skip to content

Commit 5794fef

Browse files
authored
Merge pull request #40 from apiad/develop
v0.6.4
2 parents 52e2a35 + cc87976 commit 5794fef

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

README.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,15 @@ Staying away from `eval` and `exec` should keep you safe in most scenarios, but
244244

245245
## History
246246

247+
### v0.6.4
248+
249+
* New development environment completely based on Docker.
250+
* Added compatibility with Python 3.7 and 3.8.
251+
247252
### v0.6.3
248253

249-
* Add `Show.append` to append existing `show` instances or direct paths.
250-
* Fix error with absolute path for the Markdown demo.
254+
* Added `Show.append` to append existing `show` instances or direct paths.
255+
* Fixed error with absolute path for the Markdown demo.
251256
* Append Markdown demo to the Python demo.
252257

253258
### v0.6.2
@@ -342,6 +347,24 @@ Staying away from `eval` and `exec` should keep you safe in most scenarios, but
342347

343348
## Collaboration
344349

350+
This project uses a novel methodology for development, in which you only need [Docker installed](https://docs.docker.com/install/).
351+
Fork the project, clone, and you'll find a `dockerfile` and `docker-compose.yml` files in the project root.
352+
We provided [packaged testing environments](https://github.com/apiad/auditorium/packages) (in the form of Docker images) for all the Python versions we target.
353+
There is also a `makefile` with all the necessary commands.
354+
355+
The workflow is something like this:
356+
* Fork, clone, and make some changes.
357+
* Run `make` to run the local, fast tests. The first time this will download the corresponding image.
358+
* Fix errors (if any) and watch the testing coverage. Make sure to at least cover the newly added features.
359+
* Run `make test-full` to run the local but long tests. This will download all the remaining images for each Python environment.
360+
* If all worked, push and pull-request.
361+
362+
If you need to tinker with the dev environment, `make shell` will open a shell inside the latest Python environment where you can run and test commands.
363+
364+
This project uses [poetry](https://python-poetry.org/) for package management. If you need to install new dependencies, run `make shell` and then `poetry add ...` inside the dockerized environment. Finally, don't forget to `poetry lock` and commit the changes to `pyproject.toml` and `poetry.lock` files.
365+
366+
## License
367+
345368
License is MIT, so you know the drill: fork, develop, add tests, pull request, rinse and repeat.
346369

347370
> MIT License

makefile

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@ test-fast:
99
shell:
1010
PYTHON_VERSION=${BASE_VERSION} docker-compose run auditorium-tester bash
1111

12+
lock:
13+
PYTHON_VERSION=${BASE_VERSION} docker-compose run auditorium-tester poetry lock
14+
1215
build:
13-
PYTHON_VERSION=${BASE_VERSION} docker-compose run auditorium-tester make dev-build
16+
PYTHON_VERSION=${BASE_VERSION} docker-compose run auditorium-tester poetry build
1417

1518
clean:
1619
git clean -fxd
@@ -36,9 +39,6 @@ dev-ensure:
3639
# Check if you are inside a development environment
3740
echo ${BUILD_ENVIRONMENT} | grep "development" >> /dev/null
3841

39-
dev-build: dev-ensure
40-
poetry build
41-
4242
dev-install: dev-ensure
4343
pip install poetry
4444
poetry config virtualenvs.create false

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "auditorium"
3-
version = "0.6.3"
3+
version = "0.6.4"
44
description = "A Python-powered slideshow maker with steroids."
55
authors = ["Alejandro Piad <[email protected]>"]
66
license = "MIT"

0 commit comments

Comments
 (0)