Skip to content

Commit f97edbb

Browse files
authored
Re-enable integration tests, unify changelog style, resolve few TODOs (#114)
1 parent 7dffcff commit f97edbb

File tree

7 files changed

+26
-30
lines changed

7 files changed

+26
-30
lines changed

.flake8

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ filename =
44
./scripts/*.py,
55
./src/*.py,
66
./tests/*.py
7-
# Todo: remove "src/apify/consts.py: F401" once consts from apify-shared are not being reexported
87
per-file-ignores =
98
docs/*: D
109
scripts/*: D
1110
tests/*: D
12-
src/apify/consts.py: F401
1311

1412
# Google docstring convention + D204 & D401
1513
docstring-convention = all

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232
name: Run unit tests
3333
uses: ./.github/workflows/unit_tests.yaml
3434

35-
# integration_tests:
36-
# name: Run integration tests
37-
# uses: ./.github/workflows/integration_tests.yaml
38-
# secrets: inherit
35+
integration_tests:
36+
name: Run integration tests
37+
uses: ./.github/workflows/integration_tests.yaml
38+
secrets: inherit
3939

4040
check_docs:
4141
name: Check whether the documentation is up to date
4242
uses: ./.github/workflows/check_docs.yaml
4343

4444
publish_to_pypi:
4545
name: Publish to PyPI
46-
needs: [lint_and_type_checks, unit_tests, check_docs] # TODO: Add integration_tests back!
46+
needs: [lint_and_type_checks, unit_tests, check_docs, integration_tests]
4747
runs-on: ubuntu-latest
4848
permissions:
4949
contents: write

CHANGELOG.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
Changelog
22
=========
33

4-
[1.1.4](../../releases/tag/v1.1.4) - Unreleased
4+
[1.1.4](../../releases/tag/v1.1.4) - 2023-09-06
55
-----------------------------------------------
66

7-
### Fixes
7+
### Fixed
88

99
- resolved issue with querying request queue head multiple times in parallel
1010

1111
### Internal changes
1212

13-
- Fixed integration tests for Actor logger
14-
- Removed `pytest-randomly` Pytest plugin
15-
13+
- fixed integration tests for Actor logger
14+
- removed `pytest-randomly` Pytest plugin
15+
- unpinned `apify-client` and `apify-shared` to improve compatibility with their newer versions
1616

1717
[1.1.3](../../releases/tag/v1.1.3) - 2023-08-25
1818
-----------------------------------------------
1919

2020
### Internal changes
2121

22-
- Unify indentation in configuration files
23-
- Update the `Actor.reboot` method to use the new reboot endpoint
22+
- unified indentation in configuration files
23+
- update the `Actor.reboot` method to use the new reboot endpoint
2424

2525
[1.1.2](../../releases/tag/v1.1.2) - 2023-08-02
2626
-----------------------------------------------
2727

2828
### Internal changes
2929

30-
- Library `apify-shared` is used for importing general consts and utils
31-
- Code quality improvements suggested by `flake8-simplify`
32-
- Actor env vars are used in favor of some Apify env vars
33-
- `apify-client` and `apify-shared` have pinned versions to prevent their implicit updates from breaking SDK
30+
- started importing general constants and utilities from the `apify-shared` library
31+
- simplified code via `flake8-simplify`
32+
- started using environment variables with prefix `ACTOR_` instead of some with prefix `APIFY_`
33+
- pinned `apify-client` and `apify-shared` to prevent their implicit updates from breaking SDK
3434

3535
[1.1.1](../../releases/tag/v1.1.1) - 2023-05-23
3636
-----------------------------------------------

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ requires-python = ">=3.8"
2525
dependencies = [
2626
"aiofiles >= 22.1.0",
2727
"aioshutil >= 1.0",
28-
"apify-client == 1.4.0",
29-
"apify-shared == 1.0.2",
28+
"apify-client ~= 1.4.0",
29+
"apify-shared ~= 1.0.2",
3030
"colorama >= 0.4.6",
3131
"cryptography >= 39.0.0",
3232
"httpx >= 0.24.1",

src/apify/actor.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636

3737
# This metaclass is needed so you can do `async with Actor: ...` instead of `async with Actor() as a: ...`
3838
# and have automatic `Actor.init()` and `Actor.exit()`
39-
# TODO: decide if this mumbo jumbo is worth it or not, or if it maybe breaks something
4039

4140

4241
class _ActorContextManager(type):

src/apify/consts.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
from enum import Enum
44
from typing import Any
55

6-
from apify_shared.consts import BOOL_ENV_VARS as _BOOL_ENV_VARS
7-
from apify_shared.consts import DATETIME_ENV_VARS as _DATETIME_ENV_VARS
8-
from apify_shared.consts import FLOAT_ENV_VARS as _FLOAT_ENV_VARS
9-
from apify_shared.consts import INTEGER_ENV_VARS as _INTEGER_ENV_VARS
10-
from apify_shared.consts import STRING_ENV_VARS as _STRING_ENV_VARS
11-
from apify_shared.consts import ActorEventTypes as _ActorEventTypes
12-
from apify_shared.consts import ActorExitCodes as _ActorExitCodes
13-
from apify_shared.consts import ApifyEnvVars as _ApifyEnvVars
6+
from apify_shared.consts import BOOL_ENV_VARS as _BOOL_ENV_VARS # noqa: F401
7+
from apify_shared.consts import DATETIME_ENV_VARS as _DATETIME_ENV_VARS # noqa: F401
8+
from apify_shared.consts import FLOAT_ENV_VARS as _FLOAT_ENV_VARS # noqa: F401
9+
from apify_shared.consts import INTEGER_ENV_VARS as _INTEGER_ENV_VARS # noqa: F401
10+
from apify_shared.consts import STRING_ENV_VARS as _STRING_ENV_VARS # noqa: F401
11+
from apify_shared.consts import ActorEventTypes as _ActorEventTypes # noqa: F401
12+
from apify_shared.consts import ActorExitCodes as _ActorExitCodes # noqa: F401
13+
from apify_shared.consts import ApifyEnvVars as _ApifyEnvVars # noqa: F401
1414

1515
DEPRECATED_NAMES = [
1616
'BOOL_ENV_VARS',

tests/integration/test_request_queue.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from .conftest import ActorFactory
44

55

6-
# TODO: this test is flaky, and the actor often times out, figure out why and fix it
76
class TestRequestQueue:
87
async def test_simple(self, make_actor: ActorFactory) -> None:
98
async def main() -> None:

0 commit comments

Comments
 (0)