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

replace pyModeS with rs1090, replace impala with trino #422

Merged
merged 3 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 1 addition & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,13 @@ repos:
additional_dependencies:
- types-pkg-resources
- types-requests
- types-paramiko
- types-flask
- types-waitress
- altair
- cartopy
- impunity
- pitot
- pyModeS
- pyopensky
- pytest
- rs1090
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
hooks:
Expand Down
17 changes: 1 addition & 16 deletions docs/troubleshooting/network.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ How to troubleshoot network issues?
- **I can't access resources from the Internet as I am behind a proxy**

All network accesses are made with the `requests
<https://requests.readthedocs.io/>`_ library (or the `paramiko
<http://www.paramiko.org/>`_ library for the Impala shell). Usually, if your
<https://requests.readthedocs.io/>`_ library. Usually, if your
environment variables are properly set, you should not encounter any particular
proxy issue. However, there are always situations where it may help to manually
force the proxy settings in the configuration file.
Expand All @@ -14,13 +13,6 @@ How to troubleshoot network issues?
it is located with the ``traffic config -l`` command (in the shell) or in the
``traffic.config_file`` variable.

- The ``http.proxy`` options refers to usually HTTP and REST API calls;
- The ``ssh.proxycommand`` option is used to proxy the SSH connection through
a specific ssh tunnel or through a http proxy (with ``connect.exe`` or
``nc -X connect``). According to your configuration, you may prefer to do
the settings in your ``.ssh/config`` file.


.. parsed-literal::
## This sections contains all the specific options necessary to fit your
## network configuration (including proxy and ProxyCommand settings)
Expand All @@ -31,10 +23,3 @@ How to troubleshoot network issues?
# https.proxy = http://proxy.company:8080
# http.proxy = socks5h://localhost:1234
# https.proxy = socks5h://localhost:1234

## input here the ProxyCommand you need to login to the Impala Shell
## WARNING:
## Do not use %h and %p wildcards.
## Write data.opensky-network.org and 2230 explicitly instead
# ssh.proxycommand = ssh -W data.opensky-network.org:2230 proxy_ip:proxy_port
# ssh.proxycommand = connect.exe -H proxy_ip:proxy_port data.opensky-network.org 2230
1,258 changes: 544 additions & 714 deletions poetry.lock

Large diffs are not rendered by default.

24 changes: 8 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ classifiers = [
"Topic :: Software Development :: Libraries",
"License :: OSI Approved :: MIT License",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Typing :: Typed",
]
include = [
Expand Down Expand Up @@ -59,37 +59,32 @@ cartes = ">=0.7.4"
# cartes = { path = "../cartes", develop = true }
pyopensky = ">=2.0"
# pyopensky = { path = "../pyopensky", develop = true }
httpx = "^0.26.0"
httpx = ">=0.26.0"
requests = ">=2.27" # TODO when we remove requests, remove the types- too
ipywidgets = ">=7.6"
ipyleaflet = ">=0.17"
pyModeS = ">=2.17"
# pyModeS = { path = "../pyModeS", extras = ["rtlsdr"], develop = true }
rs1090 = ">=0.2.0"
# rs1090 = { path = "../rs1090/python", develop = true }
openap = ">=1.1"
metar = ">=1.8"
click = ">=8.1"
typing-extensions = ">=4.2"
pyarrow = ">=11.0.0"
# shapely = "!=2.0.3"
# onnxruntime is usually late to release, although available on conda-forge
onnxruntime = { version = ">=1.12", python = "<3.13" }
# waiting for scikit-fuzzy release for python 3.12
scikit-fuzzy = { git = "https://github.com/scikit-fuzzy/scikit-fuzzy.git", rev = "d7551b6", python = ">=3.12" }
# -- Optional dependencies --
xarray = { version = ">=0.18.2", optional = true }
libarchive = { version = ">=0.4.7,<1.0.0", optional = true }
scikit-learn = { version = ">=1.0", optional = true }
textual = { version = ">=0.28", optional = true }
Flask = { version = ">=2.1.1", optional = true }
Flask-Cors = { version = ">=3.0.10", optional = true }
waitress = { version = ">=2.1.1", optional = true }
pyspark = { version = ">=3.3.0", optional = true }
pyrtlsdr = { version = ">=0.2.93", optional = true }
pyb2b = { version = ">=0.1", optional = true }
# pyb2b = { path = "../pyb2b", develop = true }

[tool.poetry.extras]
full = ["xarray", "libarchive", "scikit-learn", "textual", "pyspark"]
web = ["Flask", "Flask-Cors", "waitress", "textual", "pyb2b"]
rtlsdr = ["pyrtlsdr"]
full = ["xarray", "libarchive", "scikit-learn", "textual", "pyspark", "pyb2b"]

[tool.poetry.group.dev.dependencies]
pre-commit = ">=2.13.0"
Expand All @@ -104,12 +99,9 @@ pytest-cov = ">=4.0"
pytest-timeout = ">=2.1"
codecov = ">=2.1.11"
ipykernel = ">=6.25.0"
# pandas-stubs = { version = ">=2.1.4", python = ">=3.9" }
# pandas-stubs = { version = ">=2.1.4" }
types-pkg-resources = ">=0.1.3"
types-requests = ">=2.25.0"
types-paramiko = ">=3.3.0.0"
types-flask = ">=1.1.6"
types-waitress = ">=2.0.8"
requests = { extras = ["socks"], version = ">=2.27" }


Expand Down
Loading
Loading