Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unpin urllib3 (remove upper bound) to allow 2.x version to be used #265

Open
wants to merge 2 commits into
base: mainline
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 3 additions & 0 deletions .github/workflows/open-source-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ jobs:

- name: Run Py-Marqo Tests
run: |
# show all warnings to capture deprecation warnings when running tests
export PYTHONWARNINGS="default"

python -m pip install --upgrade pip
# Required for Python 3.12 and above
pip install setuptools
Expand Down
7 changes: 7 additions & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
-r requirements.txt
pillow
numpy
pytest
dataclasses
requests_mock
tenacity
13 changes: 2 additions & 11 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
# marqo client:
urllib3<2.0.0, >=1.26.0
urllib3>=1.26.0
requests
packaging

# testing
pillow
numpy
pytest
dataclasses
pydantic>=2.0.0
requests_mock
tenacity
packaging
4 changes: 1 addition & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@
install_requires=[
# client:
"requests",
"urllib3<2.0.0, >=1.26.0",
"urllib3>=1.26.0",
"pydantic>=2.0.0",
"typing-extensions>=4.5.0",
Copy link
Collaborator Author

@papa99do papa99do Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this dep is only introduced to use @deprecated annotation. Since we do not need this dep now, I removed this restraint.

"packaging"
],
tests_require=[
"pytest",
Copy link
Collaborator Author

@papa99do papa99do Nov 22, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pytest is installed by tox. Since we use tox to run tests, this section in setup.py is not used any more.

"tox"
],
name="marqo",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to upgrade the version here to publish it to Pypi?

Expand Down
5 changes: 1 addition & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ passenv =
whitelist_externals =
python
deps =
-r requirements.txt
pytest
pillow
numpy
-r requirements-dev.txt
commands =
pytest {posargs}

Expand Down
Loading