Skip to content

Commit 60562fa

Browse files
committed
Merge branch 'main' into versioning
2 parents 22315e5 + 18ed02f commit 60562fa

File tree

4 files changed

+43
-4
lines changed

4 files changed

+43
-4
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# This workflow will upload a Python Package using Twine when a release is created
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-python#publishing-to-package-registries
3+
4+
# This workflow uses actions that are not certified by GitHub.
5+
# They are provided by a third-party and are governed by
6+
# separate terms of service, privacy policy, and support
7+
# documentation.
8+
9+
name: Upload Python Package
10+
11+
on:
12+
release:
13+
types: [published]
14+
15+
permissions:
16+
contents: read
17+
18+
jobs:
19+
deploy:
20+
21+
runs-on: ubuntu-latest
22+
23+
steps:
24+
- uses: actions/checkout@v3
25+
- name: Set up Python
26+
uses: actions/setup-python@v3
27+
with:
28+
python-version: '3.x'
29+
- name: Install dependencies
30+
run: |
31+
python -m pip install --upgrade pip
32+
pip install build
33+
- name: Build package
34+
run: python -m build
35+
- name: Publish package
36+
uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
37+
with:
38+
user: __token__
39+
password: ${{ secrets.PYPI_API_TOKEN }}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ programmatically in your scripts:
130130

131131
```python
132132
>>> client = MarbleClient()
133-
>>> session = requests.Session
133+
>>> session = requests.Session()
134134
>>> client.this_session(session)
135135
>>> session.cookies.get_dict()
136136
{...} # session cookiejar now includes cookies
137137
```
138138

139-
You can also use the `this_session` method to create a new `requests.Sesssion` object:
139+
You can also use the `this_session` method to create a new `requests.Session` object:
140140

141141
```python
142142
>>> client = MarbleClient()

marble_client/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def this_node(self) -> MarbleNode:
8585
raise UnknownNodeError(f"No node found in the registry with the url {host_url}")
8686

8787
@check_jupyterlab
88-
def this_session(self, session: Optional[requests.Session]) -> requests.Session:
88+
def this_session(self, session: Optional[requests.Session] = None) -> requests.Session:
8989
"""
9090
Add the login session cookies of the user who is currently logged in to the session object.
9191
If a session object is not passed as an argument to this function, create a new session

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ license = {file = "LICENSE"}
1616
name = "marble_client"
1717
readme = "README.md"
1818
requires-python = ">=3.9"
19-
version = "1.1.0"
19+
version = "1.1.1"
2020

2121
[project.urls]
2222
# Homepage will change to Marble homepage when that goes live

0 commit comments

Comments
 (0)