Skip to content

Commit 6faa6d1

Browse files
authored
source-xero: Updating python dependencies (#38330)
1 parent c627ce8 commit 6faa6d1

File tree

7 files changed

+1112
-159
lines changed

7 files changed

+1112
-159
lines changed

airbyte-integrations/connectors/source-xero/Dockerfile

-38
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,91 @@
1-
# Xero Source
1+
# Xero source connector
2+
23

34
This is the repository for the Xero source connector, written in Python.
4-
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.io/integrations/sources/xero).
5+
For information about how to use this connector within Airbyte, see [the documentation](https://docs.airbyte.com/integrations/sources/xero).
56

67
## Local development
78

89
### Prerequisites
10+
* Python (~=3.9)
11+
* Poetry (~=1.7) - installation instructions [here](https://python-poetry.org/docs/#installation)
912

10-
**To iterate on this connector, make sure to complete this prerequisites section.**
11-
12-
#### Minimum Python version required `= 3.9.0`
13-
14-
#### Build & Activate Virtual Environment and install dependencies
15-
16-
From this connector directory, create a virtual environment:
17-
18-
```
19-
python -m venv .venv
20-
```
21-
22-
This will generate a virtualenv for this module in `.venv/`. Make sure this venv is active in your
23-
development environment of choice. To activate it from the terminal, run:
2413

14+
### Installing the connector
15+
From this connector directory, run:
16+
```bash
17+
poetry install --with dev
2518
```
26-
source .venv/bin/activate
27-
pip install -r requirements.txt
28-
pip install '.[tests]'
29-
```
30-
31-
If you are in an IDE, follow your IDE's instructions to activate the virtualenv.
32-
33-
Note that while we are installing dependencies from `requirements.txt`, you should only edit `setup.py` for your dependencies. `requirements.txt` is
34-
used for editable installs (`pip install -e`) to pull in Python dependencies from the monorepo and will call `setup.py`.
35-
If this is mumbo jumbo to you, don't worry about it, just put your deps in `setup.py` but install using `pip install -r requirements.txt` and everything
36-
should work as you expect.
3719

38-
#### Create credentials
3920

40-
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.io/integrations/sources/xero)
21+
### Create credentials
22+
**If you are a community contributor**, follow the instructions in the [documentation](https://docs.airbyte.com/integrations/sources/xero)
4123
to generate the necessary credentials. Then create a file `secrets/config.json` conforming to the `source_xero/spec.yaml` file.
4224
Note that any directory named `secrets` is gitignored across the entire Airbyte repo, so there is no danger of accidentally checking in sensitive information.
43-
See `integration_tests/sample_config.json` for a sample config file.
25+
See `sample_files/sample_config.json` for a sample config file.
4426

45-
**If you are an Airbyte core member**, copy the credentials in Lastpass under the secret name `source xero test creds`
46-
and place them into `secrets/config.json`.
4727

4828
### Locally running the connector
49-
5029
```
51-
python main.py spec
52-
python main.py check --config secrets/config.json
53-
python main.py discover --config secrets/config.json
54-
python main.py read --config secrets/config.json --catalog integration_tests/configured_catalog.json
30+
poetry run source-xero spec
31+
poetry run source-xero check --config secrets/config.json
32+
poetry run source-xero discover --config secrets/config.json
33+
poetry run source-xero read --config secrets/config.json --catalog sample_files/configured_catalog.json
5534
```
5635

57-
### Locally running the connector docker image
58-
59-
#### Build
60-
61-
**Via [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md) (recommended):**
36+
### Running unit tests
37+
To run unit tests locally, from the connector directory run:
38+
```
39+
poetry run pytest unit_tests
40+
```
6241

42+
### Building the docker image
43+
1. Install [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md)
44+
2. Run the following command to build the docker image:
6345
```bash
6446
airbyte-ci connectors --name=source-xero build
6547
```
6648

67-
An image will be built with the tag `airbyte/source-xero:dev`.
68-
69-
**Via `docker build`:**
70-
71-
```bash
72-
docker build -t airbyte/source-xero:dev .
73-
```
49+
An image will be available on your host with the tag `airbyte/source-xero:dev`.
7450

75-
#### Run
7651

52+
### Running as a docker container
7753
Then run any of the connector commands as follows:
78-
7954
```
8055
docker run --rm airbyte/source-xero:dev spec
8156
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-xero:dev check --config /secrets/config.json
8257
docker run --rm -v $(pwd)/secrets:/secrets airbyte/source-xero:dev discover --config /secrets/config.json
8358
docker run --rm -v $(pwd)/secrets:/secrets -v $(pwd)/integration_tests:/integration_tests airbyte/source-xero:dev read --config /secrets/config.json --catalog /integration_tests/configured_catalog.json
8459
```
8560

86-
## Testing
87-
61+
### Running our CI test suite
8862
You can run our full test suite locally using [`airbyte-ci`](https://github.com/airbytehq/airbyte/blob/master/airbyte-ci/connectors/pipelines/README.md):
89-
9063
```bash
9164
airbyte-ci connectors --name=source-xero test
9265
```
9366

9467
### Customizing acceptance Tests
95-
96-
Customize `acceptance-test-config.yml` file to configure tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
68+
Customize `acceptance-test-config.yml` file to configure acceptance tests. See [Connector Acceptance Tests](https://docs.airbyte.com/connector-development/testing-connectors/connector-acceptance-tests-reference) for more information.
9769
If your connector requires to create or destroy resources for use during acceptance tests create fixtures for it and place them inside integration_tests/acceptance.py.
9870

99-
## Dependency Management
100-
101-
All of your dependencies should go in `setup.py`, NOT `requirements.txt`. The requirements file is only used to connect internal Airbyte dependencies in the monorepo for local development.
102-
We split dependencies between two groups, dependencies that are:
103-
104-
- required for your connector to work need to go to `MAIN_REQUIREMENTS` list.
105-
- required for the testing need to go to `TEST_REQUIREMENTS` list
71+
### Dependency Management
72+
All of your dependencies should be managed via Poetry.
73+
To add a new dependency, run:
74+
```bash
75+
poetry add <package-name>
76+
```
10677

107-
### Publishing a new version of the connector
78+
Please commit the changes to `pyproject.toml` and `poetry.lock` files.
10879

80+
## Publishing a new version of the connector
10981
You've checked out the repo, implemented a million dollar feature, and you're ready to share your changes with the world. Now what?
110-
11182
1. Make sure your changes are passing our test suite: `airbyte-ci connectors --name=source-xero test`
112-
2. Bump the connector version in `metadata.yaml`: increment the `dockerImageTag` value. Please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors).
83+
2. Bump the connector version (please follow [semantic versioning for connectors](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#semantic-versioning-for-connectors)):
84+
- bump the `dockerImageTag` value in in `metadata.yaml`
85+
- bump the `version` value in `pyproject.toml`
11386
3. Make sure the `metadata.yaml` content is up to date.
114-
4. Make the connector documentation and its changelog is up to date (`docs/integrations/sources/xero.md`).
87+
4. Make sure the connector documentation and its changelog is up to date (`docs/integrations/sources/xero.md`).
11588
5. Create a Pull Request: use [our PR naming conventions](https://docs.airbyte.com/contributing-to-airbyte/resources/pull-requests-handbook/#pull-request-title-convention).
11689
6. Pat yourself on the back for being an awesome contributor.
11790
7. Someone from Airbyte will take a look at your PR and iterate with you to merge it into master.
91+
8. Once your PR is merged, the new version of the connector will be automatically published to Docker Hub and our connector registry.

airbyte-integrations/connectors/source-xero/metadata.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ data:
55
connectorSubtype: api
66
connectorType: source
77
definitionId: 6fd1e833-dd6e-45ec-a727-ab917c5be892
8-
dockerImageTag: 0.2.5
8+
dockerImageTag: 0.2.6
99
dockerRepository: airbyte/source-xero
1010
githubIssueLabel: source-xero
1111
icon: xero.svg
@@ -38,4 +38,6 @@ data:
3838
secretStore:
3939
type: GSM
4040
alias: airbyte-connector-testing-secret-store
41+
connectorBuildOptions:
42+
baseImage: docker.io/airbyte/python-connector-base:1.2.0@sha256:c22a9d97464b69d6ef01898edf3f8612dc11614f05a84984451dde195f337db9
4143
metadataSpecVersion: "1.0"

0 commit comments

Comments
 (0)